refactor(tests): group waku store test suite files

tests/all_tests_v2.nim

@@ -1,11 +1,11 @@
+## Waku common test suite
 import
-  # Waku common test suite
   ./v2/test_envvar_serialization,
   ./v2/test_confutils_envvar,
   ./v2/test_sqlite_migrations
 
+## Waku archive test suite
 import
-  # Waku archive test suite
   ./v2/waku_archive/test_driver_queue_index,
   ./v2/waku_archive/test_driver_queue_pagination,
   ./v2/waku_archive/test_driver_queue_query,
@@ -15,14 +15,21 @@ import
   ./v2/waku_archive/test_retention_policy,
   ./v2/waku_archive/test_waku_archive
 
+## Waku store test suite
+import
+  ./v2/waku_store/test_rpc_codec,
+  ./v2/waku_store/test_waku_store,
+  ./v2/waku_store/test_wakunode_store
+
+when defined(waku_exp_store_resume):
+  # TODO: Review store resume test cases (#1282)
+  import ./v2/waku_store/test_resume
+
+
 import
   # Waku v2 tests
   ./v2/test_wakunode,
   ./v2/test_wakunode_relay,
-  # Waku Store
-  ./v2/test_waku_store_rpc_codec,
-  ./v2/test_waku_store,
-  ./v2/test_wakunode_store,
   # Waku LightPush
   ./v2/test_waku_lightpush,
   ./v2/test_wakunode_lightpush,
@@ -66,9 +73,6 @@ when defined(rln):
     ./v2/test_wakunode_rln_relay,
     ./v2/test_waku_rln_relay_onchain
 
-when defined(waku_exp_store_resume):
-  # TODO: Review store resume test cases (#1282)
-  import ./v2/test_waku_store_resume
 
 
 # TODO: Only enable this once swap module is integrated more nicely as a dependency, i.e. as submodule with CI etc

tests/v2/waku_store/test_rpc_codec.nim

@@ -5,10 +5,11 @@ import
   testutils/unittests,
   chronos
 import
-  ../../waku/v2/protocol/waku_store/rpc,
+  ../../../waku/common/protobuf,
-  ../../waku/v2/protocol/waku_store/rpc_codec,
+  ../../../waku/v2/protocol/waku_store/rpc,
-  ../../waku/v2/utils/time,
+  ../../../waku/v2/protocol/waku_store/rpc_codec,
-  ./testlib/common
+  ../../../waku/v2/utils/time,
+  ../testlib/common
 
 
 procSuite "Waku Store - RPC codec":

tests/v2/waku_store/test_waku_store.nim

@@ -7,12 +7,12 @@ import
   chronicles,
   libp2p/crypto/crypto
 import
-  ../../waku/v2/node/peer_manager/peer_manager,
+  ../../../waku/v2/node/peer_manager/peer_manager,
-  ../../waku/v2/protocol/waku_message,
+  ../../../waku/v2/protocol/waku_message,
-  ../../waku/v2/protocol/waku_store,
+  ../../../waku/v2/protocol/waku_store,
-  ../../waku/v2/protocol/waku_store/client,
+  ../../../waku/v2/protocol/waku_store/client,
-  ./testlib/common,
+  ../testlib/common,
-  ./testlib/switch
+  ../testlib/switch
 
 
 

tests/v2/waku_store/test_wakunode_store.nim

@@ -13,17 +13,17 @@ import
   libp2p/protocols/pubsub/pubsub,
   libp2p/protocols/pubsub/gossipsub
 import
-  ../../waku/common/sqlite,
+  ../../../waku/common/sqlite,
-  ../../waku/v2/node/peer_manager/peer_manager,
+  ../../../waku/v2/node/peer_manager/peer_manager,
-  ../../waku/v2/protocol/waku_message,
+  ../../../waku/v2/protocol/waku_message,
-  ../../waku/v2/protocol/waku_archive,
+  ../../../waku/v2/protocol/waku_archive,
-  ../../waku/v2/protocol/waku_archive/driver/sqlite_driver,
+  ../../../waku/v2/protocol/waku_archive/driver/sqlite_driver,
-  ../../waku/v2/protocol/waku_store,
+  ../../../waku/v2/protocol/waku_store,
-  ../../waku/v2/protocol/waku_filter,
+  ../../../waku/v2/protocol/waku_filter,
-  ../../waku/v2/utils/peers,
+  ../../../waku/v2/utils/peers,
-  ../../waku/v2/utils/time,
+  ../../../waku/v2/utils/time,
-  ../../waku/v2/node/waku_node,
+  ../../../waku/v2/node/waku_node,
-  ./testlib/common
+  ../testlib/common
 
 from std/times import getTime, toUnixFloat