status-im/nim-libp2p-dht
2
0
Fork 0
mirror of https://github.com/status-im/nim-libp2p-dht.git synced 2025-02-23 09:38:12 +00:00
Code Issues Projects Releases Wiki Activity

fix tests: make bootstrap nodes async

Browse Source
This commit is contained in:
Csaba Kiraly 2022-03-16 21:32:21 +01:00
parent d785aa4642
commit 4d7e773c42
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/dht/test_providers.nim
View File

@ -28,9 +28,9 @@ import
proc bootstrapNodes( proc bootstrapNodes(
nodecount: int, nodecount: int,
bootnodes: openArray[SignedPeerRecord], bootnodes: seq[SignedPeerRecord],
rng = keys.newRng() rng = keys.newRng()
) : seq[(discv5_protocol.Protocol, keys.PrivateKey)] = ) : Future[seq[(discv5_protocol.Protocol, keys.PrivateKey)]] {.async.} =
for i in 0..<nodecount: for i in 0..<nodecount:
let privKey = keys.PrivateKey.random(rng[]) let privKey = keys.PrivateKey.random(rng[])
@ -44,7 +44,7 @@ proc bootstrapNodes(
proc bootstrapNetwork( proc bootstrapNetwork(
nodecount: int, nodecount: int,
rng = keys.newRng() rng = keys.newRng()
) : seq[(discv5_protocol.Protocol, keys.PrivateKey)] = ) : Future[seq[(discv5_protocol.Protocol, keys.PrivateKey)]] {.async.} =
let let
bootNodeKey = keys.PrivateKey.fromHex( bootNodeKey = keys.PrivateKey.fromHex(
@ -54,7 +54,7 @@ proc bootstrapNetwork(
#waitFor bootNode.bootstrap() # immediate, since no bootnodes are defined above #waitFor bootNode.bootstrap() # immediate, since no bootnodes are defined above
var res = bootstrapNodes(nodecount - 1, var res = await bootstrapNodes(nodecount - 1,
@[bootnode.localNode.record], @[bootnode.localNode.record],
rng) rng)
res.insert((bootNode, bootNodeKey), 0) res.insert((bootNode, bootNodeKey), 0)
@ -80,7 +80,7 @@ suite "Providers Tests: node alone":
setupAll: setupAll:
rng = keys.newRng() rng = keys.newRng()
nodes = bootstrapNetwork(nodecount=1) nodes = await bootstrapNetwork(nodecount=1)
targetId = toNodeId(keys.PrivateKey.random(rng[]).toPublicKey) targetId = toNodeId(keys.PrivateKey.random(rng[]).toPublicKey)
(node0, privKey_keys0) = nodes[0] (node0, privKey_keys0) = nodes[0]
privKey0 = privKey_keys0.pkToPk.get privKey0 = privKey_keys0.pkToPk.get
@ -142,7 +142,7 @@ suite "Providers Tests: two nodes":
setupAll: setupAll:
rng = keys.newRng() rng = keys.newRng()
nodes = bootstrapNetwork(nodecount=2) nodes = await bootstrapNetwork(nodecount=3)
targetId = toNodeId(keys.PrivateKey.random(rng[]).toPublicKey) targetId = toNodeId(keys.PrivateKey.random(rng[]).toPublicKey)
(node0, privKey_keys0) = nodes[0] (node0, privKey_keys0) = nodes[0]
privKey0 = privKey_keys0.pkToPk.get privKey0 = privKey_keys0.pkToPk.get
@ -195,7 +195,7 @@ suite "Providers Tests: 20 nodes":
setupAll: setupAll:
rng = keys.newRng() rng = keys.newRng()
nodes = bootstrapNetwork(nodecount=20) nodes = await bootstrapNetwork(nodecount=20)
targetId = toNodeId(keys.PrivateKey.random(rng[]).toPublicKey) targetId = toNodeId(keys.PrivateKey.random(rng[]).toPublicKey)
(node0, privKey_keys0) = nodes[0] (node0, privKey_keys0) = nodes[0]
privKey0 = privKey_keys0.pkToPk.get privKey0 = privKey_keys0.pkToPk.get