Nimble file cleanup and group discv5 tests to compile once (#340)

doc/discv5.md

@@ -74,7 +74,7 @@ nim-eth dependencies) tests, one can run following command:
 # Install required modules
 nimble install
 # Run only discovery v5 related test suite
-nimble tests_discv5
+nimble tests_discv5_full
 ```
 
 ## dcli

eth.nimble

@@ -27,32 +27,17 @@ proc runTest(path: string, release: bool = true, chronosStrict = true) =
     " -d:chronicles_log_level=ERROR --verbosity:0 --hints:off " & path
   rmFile path
 
-proc runKeyfileTests() =
+task test_keyfile, "Run keyfile tests":
   runTest("tests/keyfile/all_tests")
 
-task test_keyfile, "run keyfile tests":
+task test_keys, "Run keys tests":
-  runKeyfileTests()
-
-proc runKeysTests() =
   runTest("tests/keys/all_tests")
 
-task test_keys, "run keys tests":
+task test_discv5, "Run discovery v5 tests":
-  runKeysTests()
+  runTest("tests/p2p/all_discv5_tests")
 
-proc runDiscv5Tests() =
+task test_p2p, "Run p2p tests":
-  for filename in [
+  test_discv5_task()
-      "test_enr",
-      "test_hkdf",
-      "test_lru",
-      "test_ip_vote",
-      "test_discoveryv5",
-      "test_discoveryv5_encoding",
-      "test_routing_table"
-    ]:
-    runTest("tests/p2p/" & filename)
-
-proc runP2pTests() =
-  runDiscv5Tests()
 
   for filename in [
       "les/test_flow_control",
@@ -69,10 +54,7 @@ proc runP2pTests() =
     ]:
     runTest("tests/p2p/" & filename, chronosStrict = false)
 
-task test_p2p, "run p2p tests":
+task test_rlp, "Run rlp tests":
-  runP2pTests()
-
-proc runRlpTests() =
   # workaround for github action CI
   # mysterious crash on windows-2019 64bit mode
   # cannot reproduce locally on windows-2019
@@ -83,35 +65,26 @@ proc runRlpTests() =
 
   runTest("tests/rlp/all_tests", releaseMode)
 
-task test_rlp, "run rlp tests":
+task test_trie, "Run trie tests":
-  runRlpTests()
-
-proc runTrieTests() =
   runTest("tests/trie/all_tests")
 
-task test_trie, "run trie tests":
+task test_db, "Run db tests":
-  runTrieTests()
-
-proc runDbTests() =
   runTest("tests/db/all_tests")
 
-task test_db, "run db tests":
+task test, "Run all tests":
-  runDbTests()
-
-task test, "run all tests":
   for filename in [
       "test_bloom",
     ]:
     runTest("tests/" & filename)
 
-  runKeyfileTests()
+  test_keyfile_task()
-  runKeysTests()
+  test_keys_task()
-  runP2pTests()
+  test_rlp_task()
-  runRlpTests()
+  test_p2p_task()
-  runTrieTests()
+  test_trie_task()
-  runDbTests()
+  test_db_task()
 
-task test_discv5, "run tests of discovery v5 and its dependencies":
+task test_discv5_full, "Run discovery v5 and its dependencies tests":
-  runKeysTests()
+  test_keys_task()
-  runRlpTests()
+  test_rlp_task()
-  runDiscv5Tests()
+  test_discv5_task()

tests/p2p/all_discv5_tests.nim

@@ -0,0 +1,8 @@
+import
+  test_enr,
+  test_hkdf,
+  test_lru,
+  test_ip_vote,
+  test_routing_table,
+  test_discoveryv5_encoding,
+  test_discoveryv5

tests/p2p/test_discoveryv5.nim

@@ -1,3 +1,5 @@
+{.used.}
+
 import
   std/tables,
   chronos, chronicles, stint, testutils/unittests,

tests/p2p/test_discoveryv5_encoding.nim

@@ -1,7 +1,9 @@
+{.used.}
+
 import
   std/[unittest, options, sequtils, tables],
   stint, stew/byteutils, stew/shims/net,
-  eth/[rlp, keys],
+  eth/keys,
   eth/p2p/discoveryv5/[messages, encoding, enr, node, sessions]
 
 let rng = newRng()

tests/p2p/test_enr.nim

@@ -1,3 +1,5 @@
+{.used.}
+
 import
   std/[unittest, options, sequtils],
   nimcrypto/utils, stew/shims/net,

tests/p2p/test_hkdf.nim

@@ -1,3 +1,5 @@
+{.used.}
+
 import
   std/unittest,
   nimcrypto, stew/byteutils,

tests/p2p/test_ip_vote.nim

@@ -1,3 +1,5 @@
+{.used.}
+
 import
   std/unittest,
   eth/keys, stew/shims/net,

tests/p2p/test_lru.nim

@@ -1,3 +1,5 @@
+{.used.}
+
 import
   std/[unittest, options],
   eth/p2p/discoveryv5/lru

tests/p2p/test_routing_table.nim

@@ -1,3 +1,5 @@
+{.used.}
+
 import
   std/unittest,
   bearssl, eth/keys, eth/p2p/discoveryv5/[routing_table, node, enr],