diff --git a/tests/all_tests_common b/tests/all_tests_common new file mode 100755 index 000000000..a3256cdb6 Binary files /dev/null and b/tests/all_tests_common differ diff --git a/tests/common/test_ratelimit_setting.nim b/tests/common/test_ratelimit_setting.nim index 2bc95fbfb..f4ca5d56b 100644 --- a/tests/common/test_ratelimit_setting.nim +++ b/tests/common/test_ratelimit_setting.nim @@ -9,7 +9,7 @@ {.used.} import testutils/unittests -import chronos, libp2p/stream/connection +import chronos, libp2p/stream/connection, libp2p/crypto/crypto import std/[options, tables] import ../../waku/common/rate_limit/request_limiter @@ -17,9 +17,9 @@ import ../../waku/common/rate_limit/timed_map let proto = "ProtocolDescriptor" -let conn1 = Connection(peerId: PeerId.random().tryGet()) -let conn2 = Connection(peerId: PeerId.random().tryGet()) -let conn3 = Connection(peerId: PeerId.random().tryGet()) +let conn1 = Connection(peerId: PeerId.random(newRng()).tryGet()) +let conn2 = Connection(peerId: PeerId.random(newRng()).tryGet()) +let conn3 = Connection(peerId: PeerId.random(newRng()).tryGet()) suite "RateLimitSetting": test "Parse rate limit setting - ok": diff --git a/tests/common/test_requestratelimiter.nim b/tests/common/test_requestratelimiter.nim index be910b38e..65131813d 100644 --- a/tests/common/test_requestratelimiter.nim +++ b/tests/common/test_requestratelimiter.nim @@ -9,7 +9,7 @@ {.used.} import testutils/unittests -import chronos, libp2p/stream/connection +import chronos, libp2p/stream/connection, libp2p/crypto/crypto import std/options import ../../waku/common/rate_limit/request_limiter @@ -17,9 +17,9 @@ import ../../waku/common/rate_limit/timed_map let proto = "ProtocolDescriptor" -let conn1 = Connection(peerId: PeerId.random().tryGet()) -let conn2 = Connection(peerId: PeerId.random().tryGet()) -let conn3 = Connection(peerId: PeerId.random().tryGet()) +let conn1 = Connection(peerId: PeerId.random(newRng()).tryGet()) +let conn2 = Connection(peerId: PeerId.random(newRng()).tryGet()) +let conn3 = Connection(peerId: PeerId.random(newRng()).tryGet()) suite "RequestRateLimiter": test "RequestRateLimiter Allow up to main bucket": diff --git a/tests/node/test_wakunode_filter.nim b/tests/node/test_wakunode_filter.nim index 2777b0124..90b58fde7 100644 --- a/tests/node/test_wakunode_filter.nim +++ b/tests/node/test_wakunode_filter.nim @@ -5,7 +5,8 @@ import testutils/unittests, chronos, chronicles, - libp2p/[peerstore, crypto/crypto] + libp2p/[peerstore, crypto/crypto], + bearssl/rand import waku/[ @@ -31,7 +32,7 @@ proc createRequest( pubsubTopic = none(PubsubTopic), contentTopics = newSeq[ContentTopic](), ): FilterSubscribeRequest = - let requestId = generateRequestId(rng) + let requestId = generateRequestId(rng()) return FilterSubscribeRequest( requestId: requestId, diff --git a/tests/test_helpers.nim b/tests/test_helpers.nim index e46a8c894..814fba8ec 100644 --- a/tests/test_helpers.nim +++ b/tests/test_helpers.nim @@ -21,7 +21,7 @@ proc setupTestNode*( addAllCapabilities = false, bindUdpPort = address.udpPort, # Assume same as external bindTcpPort = address.tcpPort, # Assume same as external - rng = rng, + rng = rng(), ) nextPort.inc for capability in capabilities: diff --git a/tests/testlib/wakunode.nim b/tests/testlib/wakunode.nim index 77c017d96..355514495 100644 --- a/tests/testlib/wakunode.nim +++ b/tests/testlib/wakunode.nim @@ -55,7 +55,7 @@ proc newTestWakuNode*( extPort = none(Port), extMultiAddrs = newSeq[MultiAddress](), peerStorage: PeerStorage = nil, - maxConnections = builders.MaxConnections, + maxConnections = DefaultMaxConnections, wsBindPort: Port = (Port) 8000, wsEnabled: bool = false, wssEnabled: bool = false, diff --git a/tests/waku_filter_v2/waku_filter_utils.nim b/tests/waku_filter_v2/waku_filter_utils.nim index 2f04ceb36..ffaa67f36 100644 --- a/tests/waku_filter_v2/waku_filter_utils.nim +++ b/tests/waku_filter_v2/waku_filter_utils.nim @@ -36,7 +36,7 @@ proc newTestWakuFilter*( proc newTestWakuFilterClient*(switch: Switch): Future[WakuFilterClient] {.async.} = let peerManager = PeerManager.new(switch) - proto = WakuFilterClient.new(peerManager, rng) + proto = WakuFilterClient.new(peerManager, rng()) await proto.start() switch.mount(proto) diff --git a/tests/waku_lightpush/lightpush_utils.nim b/tests/waku_lightpush/lightpush_utils.nim index 7bd44a311..427eaffd6 100644 --- a/tests/waku_lightpush/lightpush_utils.nim +++ b/tests/waku_lightpush/lightpush_utils.nim @@ -20,7 +20,7 @@ proc newTestWakuLightpushNode*( peerManager = PeerManager.new(switch) wakuAutoSharding = Sharding(clusterId: 1, shardCountGenZero: 8) proto = WakuLightPush.new( - peerManager, rng, handler, some(wakuAutoSharding), rateLimitSetting + peerManager, rng(), handler, some(wakuAutoSharding), rateLimitSetting ) await proto.start() @@ -30,4 +30,4 @@ proc newTestWakuLightpushNode*( proc newTestWakuLightpushClient*(switch: Switch): WakuLightPushClient = let peerManager = PeerManager.new(switch) - WakuLightPushClient.new(peerManager, rng) + WakuLightPushClient.new(peerManager, rng()) diff --git a/tests/waku_lightpush_legacy/lightpush_utils.nim b/tests/waku_lightpush_legacy/lightpush_utils.nim index d5602173a..59428b3b5 100644 --- a/tests/waku_lightpush_legacy/lightpush_utils.nim +++ b/tests/waku_lightpush_legacy/lightpush_utils.nim @@ -19,7 +19,7 @@ proc newTestWakuLegacyLightpushNode*( ): Future[WakuLegacyLightPush] {.async.} = let peerManager = PeerManager.new(switch) - proto = WakuLegacyLightPush.new(peerManager, rng, handler, rateLimitSetting) + proto = WakuLegacyLightPush.new(peerManager, rng(), handler, rateLimitSetting) await proto.start() switch.mount(proto) @@ -28,4 +28,4 @@ proc newTestWakuLegacyLightpushNode*( proc newTestWakuLegacyLightpushClient*(switch: Switch): WakuLegacyLightPushClient = let peerManager = PeerManager.new(switch) - WakuLegacyLightPushClient.new(peerManager, rng) + WakuLegacyLightPushClient.new(peerManager, rng()) diff --git a/tests/waku_relay/test_wakunode_relay.nim b/tests/waku_relay/test_wakunode_relay.nim index a687119bd..2bf235de6 100644 --- a/tests/waku_relay/test_wakunode_relay.nim +++ b/tests/waku_relay/test_wakunode_relay.nim @@ -1,7 +1,7 @@ {.used.} import - std/[os, strutils, sequtils, sysrand, math], + std/[os, options, strutils, sequtils, sysrand, math], stew/byteutils, testutils/unittests, chronos, diff --git a/tests/waku_rln_relay/utils_onchain.nim b/tests/waku_rln_relay/utils_onchain.nim index db07d3cd6..4a16f2c46 100644 --- a/tests/waku_rln_relay/utils_onchain.nim +++ b/tests/waku_rln_relay/utils_onchain.nim @@ -446,7 +446,7 @@ proc createEthAccount*( let gasPrice = Quantity(await web3.provider.eth_gasPrice()) web3.defaultAccount = accounts[0] - let pk = keys.PrivateKey.random(rng[]) + let pk = keys.PrivateKey.random(common.rng()[]) let acc = Address(toCanonicalAddress(pk.toPublicKey())) var tx: TransactionArgs @@ -464,7 +464,7 @@ proc createEthAccount*( return (pk, acc) proc createEthAccount*(web3: Web3): (keys.PrivateKey, Address) = - let pk = keys.PrivateKey.random(rng[]) + let pk = keys.PrivateKey.random(common.rng()[]) let acc = Address(toCanonicalAddress(pk.toPublicKey())) return (pk, acc) diff --git a/tests/waku_store/store_utils.nim b/tests/waku_store/store_utils.nim index 4586a0631..c4bbb8f93 100644 --- a/tests/waku_store/store_utils.nim +++ b/tests/waku_store/store_utils.nim @@ -10,7 +10,7 @@ proc newTestWakuStore*( ): Future[WakuStore] {.async.} = let peerManager = PeerManager.new(switch) - proto = WakuStore.new(peerManager, rng, handler) + proto = WakuStore.new(peerManager, rng(), handler) await proto.start() switch.mount(proto) @@ -19,4 +19,4 @@ proc newTestWakuStore*( proc newTestWakuStoreClient*(switch: Switch): WakuStoreClient {.gcsafe.} = let peerManager = PeerManager.new(switch) - WakuStoreClient.new(peerManager, rng) + WakuStoreClient.new(peerManager, rng()) diff --git a/tests/waku_store/test_wakunode_store.nim b/tests/waku_store/test_wakunode_store.nim index fa73cd16d..b7732aa65 100644 --- a/tests/waku_store/test_wakunode_store.nim +++ b/tests/waku_store/test_wakunode_store.nim @@ -1,7 +1,7 @@ {.used.} import - std/sequtils, + std/[options, sequtils], testutils/unittests, chronicles, chronos,