From d63b07db3444e8acecee80bc7a212d9595acdda6 Mon Sep 17 00:00:00 2001
From: Jaremy Creechley <creechley@gmail.com>
Date: Mon, 26 Jun 2023 17:40:06 -0700
Subject: [PATCH] building?

---
 tests/dht/test_providermngr.nim | 16 ++++++++--------
 tests/dht/test_providers.nim    | 12 ++++++------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/tests/dht/test_providermngr.nim b/tests/dht/test_providermngr.nim
index be58c81..b734f4c 100644
--- a/tests/dht/test_providermngr.nim
+++ b/tests/dht/test_providermngr.nim
@@ -5,7 +5,7 @@ import pkg/asynctest
 
 import pkg/chronos
 import pkg/datastore
-import pkg/libp2p
+import pkg/libp2p except setup
 
 import libp2pdht/dht
 import libp2pdht/private/eth/p2p/discoveryv5/spr
@@ -23,7 +23,7 @@ suite "Test Providers Manager simple":
     provider = privKey.toSignedPeerRecord()
     nodeId = NodeId.example(rng)
 
-  teardownAllAsync:
+  teardownAll:
     (await ds.close()).tryGet()
 
   test "Should add provider":
@@ -71,7 +71,7 @@ suite "Test Providers Manager multiple":
     ds: SQLiteDatastore
     manager: ProvidersManager
 
-  setupAsync:
+  setup:
     ds = SQLiteDatastore.new(Memory).tryGet()
     manager = ProvidersManager.new(ds, disableCache = true)
 
@@ -79,7 +79,7 @@ suite "Test Providers Manager multiple":
       for p in providers:
         (await manager.add(id, p)).tryGet
 
-  teardownAsync:
+  teardown:
     (await ds.close()).tryGet()
     ds = nil
     manager = nil
@@ -129,7 +129,7 @@ suite "Test providers with cache":
     ds: SQLiteDatastore
     manager: ProvidersManager
 
-  setupAsync:
+  setup:
     ds = SQLiteDatastore.new(Memory).tryGet()
     manager = ProvidersManager.new(ds)
 
@@ -137,7 +137,7 @@ suite "Test providers with cache":
       for p in providers:
         (await manager.add(id, p)).tryGet
 
-  teardownAsync:
+  teardown:
     (await ds.close()).tryGet()
     ds = nil
     manager = nil
@@ -197,7 +197,7 @@ suite "Test Provider Maintenance":
     ds: SQLiteDatastore
     manager: ProvidersManager
 
-  setupAllAsync:
+  setupAll:
     ds = SQLiteDatastore.new(Memory).tryGet()
     manager = ProvidersManager.new(ds, disableCache = true)
 
@@ -205,7 +205,7 @@ suite "Test Provider Maintenance":
       for p in providers:
         (await manager.add(id, p, ttl = 1.millis)).tryGet
 
-  teardownAllAsync:
+  teardownAll:
     (await ds.close()).tryGet()
     ds = nil
     manager = nil
diff --git a/tests/dht/test_providers.nim b/tests/dht/test_providers.nim
index 8d79e55..fecb9b9 100644
--- a/tests/dht/test_providers.nim
+++ b/tests/dht/test_providers.nim
@@ -77,7 +77,7 @@ suite "Providers Tests: node alone":
     signedPeerRec0: SignedPeerRecord
     peerRec0: PeerRecord
 
-  setupAllAsync:
+  setupAll:
     rng = newRng()
     nodes = await bootstrapNetwork(nodecount=1)
     targetId = NodeId.example(rng)
@@ -85,7 +85,7 @@ suite "Providers Tests: node alone":
     signedPeerRec0 = privKey0.toSignedPeerRecord
     peerRec0 = signedPeerRec0.data
 
-  teardownAllAsync:
+  teardownAll:
     for (n, _) in nodes:
       await n.closeWait()
     await sleepAsync(chronos.seconds(3))
@@ -137,7 +137,7 @@ suite "Providers Tests: two nodes":
     signedPeerRec0: SignedPeerRecord
     peerRec0: PeerRecord
 
-  setupAllAsync:
+  setupAll:
     rng = newRng()
     nodes = await bootstrapNetwork(nodecount=3)
     targetId = NodeId.example(rng)
@@ -145,7 +145,7 @@ suite "Providers Tests: two nodes":
     signedPeerRec0 = privKey0.toSignedPeerRecord
     peerRec0 = signedPeerRec0.data
 
-  teardownAllAsync:
+  teardownAll:
     for (n, _) in nodes:
       await n.closeWait()
     await sleepAsync(chronos.seconds(3))
@@ -186,7 +186,7 @@ suite "Providers Tests: 20 nodes":
     signedPeerRec0: SignedPeerRecord
     peerRec0: PeerRecord
 
-  setupAllAsync:
+  setupAll:
     rng = newRng()
     nodes = await bootstrapNetwork(nodecount=20)
     targetId = NodeId.example(rng)
@@ -196,7 +196,7 @@ suite "Providers Tests: 20 nodes":
 
     await sleepAsync(chronos.seconds(15))
 
-  teardownAllAsync:
+  teardownAll:
     for (n, _) in nodes: # if last test is enabled, we need nodes[1..^1] here
       await n.closeWait()