From 55a43b2d899b9962852f80996028d1f7fc9a05ec Mon Sep 17 00:00:00 2001
From: Eric Mastro <eric.mastro@gmail.com>
Date: Fri, 25 Feb 2022 12:27:43 +1100
Subject: [PATCH] chore: bump asynctest, use all/each test harness nouns

Using `setupAll`/`setupEach` and `teardownAll`/`teardownEach` for test harnesses.
---
 libp2pdht.nimble                        |  2 +-
 tests/dht/test_providers.nim            | 12 ++++++------
 tests/p2p/test_discoveryv5.nim          |  2 +-
 tests/p2p/test_discoveryv5_encoding.nim |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/libp2pdht.nimble b/libp2pdht.nimble
index fff176f..51c721c 100644
--- a/libp2pdht.nimble
+++ b/libp2pdht.nimble
@@ -20,5 +20,5 @@ requires "nim >= 1.2.0",
          "secp256k1 >= 0.5.2 & < 0.6.0",
          "stew#head",
          "stint",
-         "asynctest#88ae00ea288c93b23d0111da4868127a1426f39d" # >= 0.3.0 & < 0.4.0"
+         "asynctest#ae29b86f62923f53e7ccae760126f79bc721c6c6" # >= 0.3.0 & < 0.4.0"
         #  "testutils >= 0.4.2 & < 0.5.0"
diff --git a/tests/dht/test_providers.nim b/tests/dht/test_providers.nim
index 0e561d6..12df0b6 100644
--- a/tests/dht/test_providers.nim
+++ b/tests/dht/test_providers.nim
@@ -82,13 +82,13 @@ suite "Providers Tests: node alone":
     nodes: seq[ProvidersProtocol]
     targetId: NodeId
 
-  before:
+  setupAll:
     debug "RUNNING BEFORE TESTS"
     rng = keys.newRng()
     nodes = bootstrapNetwork(nodecount=1)
     targetId = toNodeId(keys.PrivateKey.random(rng[]).toPublicKey)
 
-  after:
+  teardownAll:
     debug "RUNNING AFTER TESTS"
     for n in nodes:
       await n.discovery.closeWait()
@@ -133,12 +133,12 @@ suite "Providers Tests: two nodes":
     nodes: seq[ProvidersProtocol]
     targetId: NodeId
 
-  before:
+  setupAll:
     rng = keys.newRng()
     nodes = bootstrapNetwork(nodecount=2)
     targetId = toNodeId(keys.PrivateKey.random(rng[]).toPublicKey)
 
-  after:
+  teardownAll:
     for n in nodes:
       await n.discovery.closeWait()
     await sleepAsync(chronos.seconds(3))
@@ -173,14 +173,14 @@ suite "Providers Tests: 20 nodes":
     nodes: seq[ProvidersProtocol]
     targetId: NodeId
 
-  before:
+  setupAll:
     rng = keys.newRng()
     nodes = bootstrapNetwork(nodecount=20)
     targetId = toNodeId(keys.PrivateKey.random(rng[]).toPublicKey)
 
     await sleepAsync(chronos.seconds(15))
 
-  after:
+  teardownAll:
     for n in nodes[1..^1]:
       await n.discovery.closeWait()
 
diff --git a/tests/p2p/test_discoveryv5.nim b/tests/p2p/test_discoveryv5.nim
index 277630d..a98eb13 100644
--- a/tests/p2p/test_discoveryv5.nim
+++ b/tests/p2p/test_discoveryv5.nim
@@ -12,7 +12,7 @@ import
 suite "Discovery v5 Tests":
   var rng: ref HmacDrbgContext
 
-  setup:
+  setupEach:
     rng = newRng()
 
   test "GetNode":
diff --git a/tests/p2p/test_discoveryv5_encoding.nim b/tests/p2p/test_discoveryv5_encoding.nim
index 126d61e..8e16be1 100644
--- a/tests/p2p/test_discoveryv5_encoding.nim
+++ b/tests/p2p/test_discoveryv5_encoding.nim
@@ -256,7 +256,7 @@ suite "Discovery v5.1 Packet Encodings Test Vectors":
     nodeA, nodeB: Node
     privKeyA, privKeyB: PrivateKey
 
-  setup:
+  setupEach:
     privKeyA = PrivateKey.fromHex(nodeAKey)[] # sender -> encode
     privKeyB = PrivateKey.fromHex(nodeBKey)[] # receive -> decode
 
@@ -486,7 +486,7 @@ suite "Discovery v5.1 Additional Encode/Decode":
     nodeA, nodeB: Node
     privKeyA, privKeyB: PrivateKey
 
-  setup:
+  setupEach:
     privKeyA = PrivateKey.random(rng[]) # sender -> encode
     privKeyB = PrivateKey.random(rng[]) # receiver -> decode