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

@@ -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/waku_rln_relay/test_waku_rln_relay,
-    ./v2/test_wakunode_rln_relay,
+    ./v2/waku_rln_relay/test_wakunode_rln_relay,
-    ./v2/test_rln_group_manager_onchain,
+    ./v2/waku_rln_relay/test_rln_group_manager_onchain,
-    ./v2/test_rln_group_manager_static
+    ./v2/waku_rln_relay/test_rln_group_manager_static
 
 # Waku swap test suite
 import

tests/v2/test_web3.nim

@@ -1,7 +0,0 @@
-{.used.}
-
-import web3
-proc web3Test() =
-  var web3: Web3 # an identifier from web3 package
-
-web3Test()

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/protocol_types,
-  ../../waku/v2/protocol/waku_rln_relay/constants,
+  ../../../waku/v2/protocol/waku_rln_relay/constants,
-  ../../waku/v2/protocol/waku_rln_relay/contract,
+  ../../../waku/v2/protocol/waku_rln_relay/contract,
-  ../../waku/v2/protocol/waku_rln_relay/rln,
+  ../../../waku/v2/protocol/waku_rln_relay/rln,
-  ../../waku/v2/protocol/waku_rln_relay/conversion_utils,
+  ../../../waku/v2/protocol/waku_rln_relay/conversion_utils,
-  ../../waku/v2/protocol/waku_rln_relay/group_manager/on_chain/group_manager,
+  ../../../waku/v2/protocol/waku_rln_relay/group_manager/on_chain/group_manager,
-  ./testlib/common,
+  ../testlib/common,
-  ./test_utils
+  ./utils
 
 proc generateCredentials(rlnInstance: ptr RLN): IdentityCredential =
   let credRes = membershipKeyGen(rlnInstance)

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/protocol_types,
-  ../../waku/v2/protocol/waku_rln_relay/rln,
+  ../../../waku/v2/protocol/waku_rln_relay/rln,
-  ../../waku/v2/protocol/waku_rln_relay/conversion_utils,
+  ../../../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/group_manager/static/group_manager
 
 import
   stew/shims/net,

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_message,
-  ../../waku/v2/protocol/waku_rln_relay,
+  ../../../waku/v2/protocol/waku_rln_relay,
-  ../../waku/v2/protocol/waku_keystore,
+  ../../../waku/v2/protocol/waku_keystore,
-  ./testlib/common
+  ../testlib/common
 
 const RlnRelayPubsubTopic = "waku/2/rlnrelay/proto"
 const RlnRelayContentTopic = "waku/2/rlnrelay/proto"

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/node/waku_node,
-  ../../waku/v2/protocol/waku_message,
+  ../../../waku/v2/protocol/waku_message,
-  ../../waku/v2/protocol/waku_rln_relay,
+  ../../../waku/v2/protocol/waku_rln_relay,
-  ../../waku/v2/protocol/waku_keystore,
+  ../../../waku/v2/protocol/waku_keystore,
-  ../../waku/v2/utils/peers,
+  ../../../waku/v2/utils/peers,
-  ./testlib/waku2
+  ../testlib/waku2
 
 from std/times import epochTime