diff --git a/tests/v2/standard_setup.nim b/tests/v2/standard_setup.nim index 79cfa276c..dc1861e6b 100644 --- a/tests/v2/standard_setup.nim +++ b/tests/v2/standard_setup.nim @@ -42,7 +42,7 @@ proc newStandardSwitch*(privKey = none(PrivateKey), rng = newRng()): Switch = info "newStandardSwitch" proc createMplex(conn: Connection): Muxer = - result = newMplex(conn) + result = Mplex.init(conn) let seckey = privKey.get(otherwise = PrivateKey.random(ECDSA, rng[]).tryGet()) diff --git a/tests/v2/test_waku.nim b/tests/v2/test_waku.nim index f0fc70b00..d3e2759ea 100644 --- a/tests/v2/test_waku.nim +++ b/tests/v2/test_waku.nim @@ -7,7 +7,7 @@ # Apache License, version 2.0, (LICENSE-APACHEv2) # MIT license (LICENSE-MIT) -import unittest, options, tables, sets +import unittest, options, tables, sets, sequtils import chronos, chronicles import utils, libp2p/errors, @@ -30,7 +30,7 @@ proc waitSub(sender, receiver: auto; key: string) {.async, gcsafe.} = var ceil = 15 let fsub = cast[WakuSub](sender.pubSub.get()) while not fsub.floodsub.hasKey(key) or - not fsub.floodsub[key].contains(receiver.peerInfo.id): + not fsub.floodsub[key].anyIt(it.peerInfo.id == receiver.peerInfo.id): await sleepAsync(100.millis) dec ceil doAssert(ceil > 0, "waitSub timeout!") diff --git a/vendor/news b/vendor/news index 1caa232d6..a3a6e3ae5 160000 --- a/vendor/news +++ b/vendor/news @@ -1 +1 @@ -Subproject commit 1caa232d63f4607f90d5a9eb428fbe772e010d21 +Subproject commit a3a6e3ae5ff16126942f4febe746ca4da978072b diff --git a/vendor/nim-chronicles b/vendor/nim-chronicles index 3d7619b1f..3e42e9a33 160000 --- a/vendor/nim-chronicles +++ b/vendor/nim-chronicles @@ -1 +1 @@ -Subproject commit 3d7619b1f559c86b2ef026f386d6d872b9331c82 +Subproject commit 3e42e9a33e3e490d9f18d8e33219f67f64f4d8a7 diff --git a/vendor/nim-chronos b/vendor/nim-chronos index ce6e7d17b..3968f09ae 160000 --- a/vendor/nim-chronos +++ b/vendor/nim-chronos @@ -1 +1 @@ -Subproject commit ce6e7d17b11b33d5dd17123827dda43af553a7eb +Subproject commit 3968f09ae1cd3e8c4e73729cbccf2587ff669203 diff --git a/vendor/nim-eth b/vendor/nim-eth index 7f77ba230..765883c45 160000 --- a/vendor/nim-eth +++ b/vendor/nim-eth @@ -1 +1 @@ -Subproject commit 7f77ba230806c58f8cdff782559c8b133ae48f4e +Subproject commit 765883c454be726799f4e724b4dc2ca8fe25bc74 diff --git a/vendor/nim-libp2p b/vendor/nim-libp2p index bec9a0658..3b088f898 160000 --- a/vendor/nim-libp2p +++ b/vendor/nim-libp2p @@ -1 +1 @@ -Subproject commit bec9a0658f612bcaec518021717462fd5f509ba8 +Subproject commit 3b088f898045ceb72387effa1ef81938959aa725 diff --git a/vendor/nim-serialization b/vendor/nim-serialization index e0e51015b..5b11c4173 160000 --- a/vendor/nim-serialization +++ b/vendor/nim-serialization @@ -1 +1 @@ -Subproject commit e0e51015b7348b61aa5d7391af4f8f4487713f91 +Subproject commit 5b11c4173159a15d52f0bb6a26a1aa2b40f0f2be diff --git a/vendor/nim-stew b/vendor/nim-stew index 32b86bfd1..ec2f52b0c 160000 --- a/vendor/nim-stew +++ b/vendor/nim-stew @@ -1 +1 @@ -Subproject commit 32b86bfd1ff97764e94447675559bf37a4ffb407 +Subproject commit ec2f52b0cea1f1daa33f38ca4ba289d8f40f4104 diff --git a/vendor/nimbus-build-system b/vendor/nimbus-build-system index 4fe12e1cf..e0d9939f9 160000 --- a/vendor/nimbus-build-system +++ b/vendor/nimbus-build-system @@ -1 +1 @@ -Subproject commit 4fe12e1cfd7b4bce6d9802024342662f372bd5e5 +Subproject commit e0d9939f9fce2bcbcf3451689b33bb3423fcf58e diff --git a/vendor/nimcrypto b/vendor/nimcrypto index 30d0ceaba..f767595f4 160000 --- a/vendor/nimcrypto +++ b/vendor/nimcrypto @@ -1 +1 @@ -Subproject commit 30d0ceaba02c0b966515f98873a0404786fbf796 +Subproject commit f767595f4ddec2b5570b5194feb96954c00a6499