From 699a35217b684daca464596cf1f0a4dc8179f420 Mon Sep 17 00:00:00 2001 From: Aaryamann Challani <43716372+rymnc@users.noreply.github.com> Date: Thu, 2 Mar 2023 15:37:37 +0530 Subject: [PATCH] chore(rln-relay): move rln-relay test suite to own dir (#1587) * chore(rln-relay): move rln-relay test suite to own dir * fix(tests): rename test_utils to utils --- tests/all_tests_v2.nim | 9 ++++----- tests/v2/test_rln_wrappers.nim | 0 tests/v2/test_web3.nim | 7 ------- .../test_rln_group_manager_onchain.nim | 16 ++++++++-------- .../test_rln_group_manager_static.nim | 8 ++++---- .../{ => waku_rln_relay}/test_waku_rln_relay.nim | 8 ++++---- .../test_wakunode_rln_relay.nim | 12 ++++++------ .../{test_utils.nim => waku_rln_relay/utils.nim} | 0 8 files changed, 26 insertions(+), 34 deletions(-) delete mode 100644 tests/v2/test_rln_wrappers.nim delete mode 100644 tests/v2/test_web3.nim rename tests/v2/{ => waku_rln_relay}/test_rln_group_manager_onchain.nim (97%) rename tests/v2/{ => waku_rln_relay}/test_rln_group_manager_static.nim (95%) rename tests/v2/{ => waku_rln_relay}/test_waku_rln_relay.nim (99%) rename tests/v2/{ => waku_rln_relay}/test_wakunode_rln_relay.nim (98%) rename tests/v2/{test_utils.nim => waku_rln_relay/utils.nim} (100%) diff --git a/tests/all_tests_v2.nim b/tests/all_tests_v2.nim index 85d6394de..571849668 100644 --- a/tests/all_tests_v2.nim +++ b/tests/all_tests_v2.nim @@ -48,7 +48,6 @@ import ./v2/test_utils_peers, ./v2/test_message_cache, ./v2/test_peer_manager, - ./v2/test_web3, # TODO remove it when rln-relay tests get finalized ./v2/test_peer_storage, ./v2/test_waku_keepalive, ./v2/test_namespacing_utils, @@ -94,10 +93,10 @@ import ./all_tests_wakubridge when defined(rln): import - ./v2/test_waku_rln_relay, - ./v2/test_wakunode_rln_relay, - ./v2/test_rln_group_manager_onchain, - ./v2/test_rln_group_manager_static + ./v2/waku_rln_relay/test_waku_rln_relay, + ./v2/waku_rln_relay/test_wakunode_rln_relay, + ./v2/waku_rln_relay/test_rln_group_manager_onchain, + ./v2/waku_rln_relay/test_rln_group_manager_static # Waku swap test suite import diff --git a/tests/v2/test_rln_wrappers.nim b/tests/v2/test_rln_wrappers.nim deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/v2/test_web3.nim b/tests/v2/test_web3.nim deleted file mode 100644 index 420cc7054..000000000 --- a/tests/v2/test_web3.nim +++ /dev/null @@ -1,7 +0,0 @@ -{.used.} - -import web3 -proc web3Test() = - var web3: Web3 # an identifier from web3 package - -web3Test() diff --git a/tests/v2/test_rln_group_manager_onchain.nim b/tests/v2/waku_rln_relay/test_rln_group_manager_onchain.nim similarity index 97% rename from tests/v2/test_rln_group_manager_onchain.nim rename to tests/v2/waku_rln_relay/test_rln_group_manager_onchain.nim index 600dc5b93..f0b865469 100644 --- a/tests/v2/test_rln_group_manager_onchain.nim +++ b/tests/v2/waku_rln_relay/test_rln_group_manager_onchain.nim @@ -18,14 +18,14 @@ import libp2p/crypto/crypto, eth/keys import - ../../waku/v2/protocol/waku_rln_relay/protocol_types, - ../../waku/v2/protocol/waku_rln_relay/constants, - ../../waku/v2/protocol/waku_rln_relay/contract, - ../../waku/v2/protocol/waku_rln_relay/rln, - ../../waku/v2/protocol/waku_rln_relay/conversion_utils, - ../../waku/v2/protocol/waku_rln_relay/group_manager/on_chain/group_manager, - ./testlib/common, - ./test_utils + ../../../waku/v2/protocol/waku_rln_relay/protocol_types, + ../../../waku/v2/protocol/waku_rln_relay/constants, + ../../../waku/v2/protocol/waku_rln_relay/contract, + ../../../waku/v2/protocol/waku_rln_relay/rln, + ../../../waku/v2/protocol/waku_rln_relay/conversion_utils, + ../../../waku/v2/protocol/waku_rln_relay/group_manager/on_chain/group_manager, + ../testlib/common, + ./utils proc generateCredentials(rlnInstance: ptr RLN): IdentityCredential = let credRes = membershipKeyGen(rlnInstance) diff --git a/tests/v2/test_rln_group_manager_static.nim b/tests/v2/waku_rln_relay/test_rln_group_manager_static.nim similarity index 95% rename from tests/v2/test_rln_group_manager_static.nim rename to tests/v2/waku_rln_relay/test_rln_group_manager_static.nim index ca57b1374..a6528fd0c 100644 --- a/tests/v2/test_rln_group_manager_static.nim +++ b/tests/v2/waku_rln_relay/test_rln_group_manager_static.nim @@ -9,10 +9,10 @@ import testutils/unittests, stew/results, options, - ../../waku/v2/protocol/waku_rln_relay/protocol_types, - ../../waku/v2/protocol/waku_rln_relay/rln, - ../../waku/v2/protocol/waku_rln_relay/conversion_utils, - ../../waku/v2/protocol/waku_rln_relay/group_manager/static/group_manager + ../../../waku/v2/protocol/waku_rln_relay/protocol_types, + ../../../waku/v2/protocol/waku_rln_relay/rln, + ../../../waku/v2/protocol/waku_rln_relay/conversion_utils, + ../../../waku/v2/protocol/waku_rln_relay/group_manager/static/group_manager import stew/shims/net, diff --git a/tests/v2/test_waku_rln_relay.nim b/tests/v2/waku_rln_relay/test_waku_rln_relay.nim similarity index 99% rename from tests/v2/test_waku_rln_relay.nim rename to tests/v2/waku_rln_relay/test_waku_rln_relay.nim index a735773a6..4c37d7c71 100644 --- a/tests/v2/test_waku_rln_relay.nim +++ b/tests/v2/waku_rln_relay/test_waku_rln_relay.nim @@ -11,10 +11,10 @@ import stint, libp2p/crypto/crypto import - ../../waku/v2/protocol/waku_message, - ../../waku/v2/protocol/waku_rln_relay, - ../../waku/v2/protocol/waku_keystore, - ./testlib/common + ../../../waku/v2/protocol/waku_message, + ../../../waku/v2/protocol/waku_rln_relay, + ../../../waku/v2/protocol/waku_keystore, + ../testlib/common const RlnRelayPubsubTopic = "waku/2/rlnrelay/proto" const RlnRelayContentTopic = "waku/2/rlnrelay/proto" diff --git a/tests/v2/test_wakunode_rln_relay.nim b/tests/v2/waku_rln_relay/test_wakunode_rln_relay.nim similarity index 98% rename from tests/v2/test_wakunode_rln_relay.nim rename to tests/v2/waku_rln_relay/test_wakunode_rln_relay.nim index 7e82522c3..897e77be3 100644 --- a/tests/v2/test_wakunode_rln_relay.nim +++ b/tests/v2/waku_rln_relay/test_wakunode_rln_relay.nim @@ -14,12 +14,12 @@ import libp2p/protocols/pubsub/pubsub, eth/keys import - ../../waku/v2/node/waku_node, - ../../waku/v2/protocol/waku_message, - ../../waku/v2/protocol/waku_rln_relay, - ../../waku/v2/protocol/waku_keystore, - ../../waku/v2/utils/peers, - ./testlib/waku2 + ../../../waku/v2/node/waku_node, + ../../../waku/v2/protocol/waku_message, + ../../../waku/v2/protocol/waku_rln_relay, + ../../../waku/v2/protocol/waku_keystore, + ../../../waku/v2/utils/peers, + ../testlib/waku2 from std/times import epochTime diff --git a/tests/v2/test_utils.nim b/tests/v2/waku_rln_relay/utils.nim similarity index 100% rename from tests/v2/test_utils.nim rename to tests/v2/waku_rln_relay/utils.nim