replace all unittest usage with unittest2

- test_graphql
- test_rpc
- test_hexstrings

fixes #691

tests/asynctest.nim

@@ -0,0 +1,32 @@
+## nim-ws
+## Copyright (c) 2021 Status Research & Development GmbH
+## Licensed under either of
+##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
+##  * MIT license ([LICENSE-MIT](LICENSE-MIT))
+## at your option.
+## This file may not be copied, modified, or distributed except according to
+## those terms.
+
+import unittest2
+export unittest2 except suite, test
+
+template suite*(name, body) =
+  suite name:
+
+    template setup(setupBody) {.used.} =
+      setup:
+        let asyncproc = proc {.async.} = setupBody
+        waitFor asyncproc()
+
+    template teardown(teardownBody) {.used.} =
+      teardown:
+        let asyncproc = proc {.async.} = teardownBody
+        waitFor asyncproc()
+
+    let suiteproc = proc = body # Avoids GcUnsafe2 warnings with chronos
+    suiteproc()
+
+template test*(name, body) =
+  test name:
+    let asyncproc = proc {.async.} = body
+    waitFor asyncproc()

tests/rpcclient/test_hexstrings.nim

@@ -7,7 +7,7 @@
 
 # Separated from main tests for brevity
 
-import unittest, ../../nimbus/rpc/hexstrings, json
+import unittest2, ../../nimbus/rpc/hexstrings, json
 
 proc doHexStrTests* =
   suite "[RPC] Hex quantity":

tests/test_graphql.nim

@@ -8,8 +8,8 @@
 # those terms.
 
 import
-  std/[os, json, unittest],
-  stew/byteutils,
+  std/[os, json],
+  stew/byteutils, unittest2,
   eth/[p2p, common, trie/db, rlp, trie],
   eth/p2p/rlpx_protocols/eth_protocol,
   graphql, ../nimbus/graphql/ethapi, graphql/test_common,

tests/test_rpc.nim

@@ -6,7 +6,7 @@
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
 import
-  unittest, json, strformat, strutils, options, tables, os,
+  asynctest, json, strformat, strutils, options, tables, os,
   nimcrypto, stew/byteutils, times,
   json_rpc/[rpcserver, rpcclient], eth/common as eth_common,
   eth/[rlp, keys], eth/trie/db, eth/p2p/rlpx_protocols/eth_protocol,
@@ -114,8 +114,7 @@ proc setupEnv(chain: BaseChainDB, signer, ks2: EthAddress, conf: NimbusConfigura
     blockHash: header.hash
     )
 
-
-proc doTests {.async.} =
+suite "Remote Procedure Calls":
   # TODO: Include other transports such as Http
   var
     ethNode = setupEthNode(eth)
@@ -154,10 +153,9 @@ proc doTests {.async.} =
 
   # Begin tests
   rpcServer.start()
-  await client.connect("localhost", Port(RPC_PORT))
+  waitFor client.connect("localhost", Port(RPC_PORT))
 
   # TODO: add more tests here
-  suite "Remote Procedure Calls":
   test "web3_clientVersion":
     let res = await client.web3_clientVersion()
     check res == NimbusIdent
@@ -401,5 +399,3 @@ proc doTests {.async.} =
 
   rpcServer.stop()
   rpcServer.close()
-
-waitFor doTests()