From 7cbb0bb28f8094fb77121efad0b1650bf2ef07fe Mon Sep 17 00:00:00 2001
From: Lorenzo Delgado <lorenzo@status.im>
Date: Tue, 7 Feb 2023 17:18:41 +0100
Subject: [PATCH] chore(tests): moved common test suites to its own folder

---
 tests/all_tests_common.nim                       |  7 +++++++
 tests/all_tests_v2.nim                           | 16 +++++++++-------
 tests/{v2 => common}/test_confutils_envvar.nim   |  0
 .../{v2 => common}/test_envvar_serialization.nim |  0
 tests/{v2 => common}/test_sqlite_migrations.nim  |  0
 5 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 tests/all_tests_common.nim
 rename tests/{v2 => common}/test_confutils_envvar.nim (100%)
 rename tests/{v2 => common}/test_envvar_serialization.nim (100%)
 rename tests/{v2 => common}/test_sqlite_migrations.nim (100%)

diff --git a/tests/all_tests_common.nim b/tests/all_tests_common.nim
new file mode 100644
index 000000000..38392726d
--- /dev/null
+++ b/tests/all_tests_common.nim
@@ -0,0 +1,7 @@
+{.used.}
+
+# Waku common test suite
+import
+  ./common/test_envvar_serialization,
+  ./common/test_confutils_envvar,
+  ./common/test_sqlite_migrations
diff --git a/tests/all_tests_v2.nim b/tests/all_tests_v2.nim
index c7cc7d659..193151391 100644
--- a/tests/all_tests_v2.nim
+++ b/tests/all_tests_v2.nim
@@ -1,8 +1,8 @@
-## Waku common test suite
-import
-  ./v2/test_envvar_serialization,
-  ./v2/test_confutils_envvar,
-  ./v2/test_sqlite_migrations
+## Common
+
+# Waku common test suite
+import ./all_tests_common
+
 
 ## Waku v2
 
@@ -40,7 +40,6 @@ import
   ./v2/test_wakunode_filter,
   ./v2/test_waku_peer_exchange,
   ./v2/test_peer_store_extended,
-  ./v2/test_waku_swap,
   ./v2/test_utils_peers,
   ./v2/test_message_cache,
   ./v2/test_jsonrpc_waku,
@@ -75,7 +74,10 @@ when defined(rln):
     ./v2/test_wakunode_rln_relay,
     ./v2/test_waku_rln_relay_onchain
 
+# Waku swap test suite
+import
+  ./v2/test_waku_swap
 
 # TODO: Only enable this once swap module is integrated more nicely as a dependency, i.e. as submodule with CI etc
 # For PoC execute it manually and run separate module here: https://github.com/vacp2p/swap-contracts-module
-#  ./v2/test_waku_swap_contracts
+# import ./v2/test_waku_swap_contracts
diff --git a/tests/v2/test_confutils_envvar.nim b/tests/common/test_confutils_envvar.nim
similarity index 100%
rename from tests/v2/test_confutils_envvar.nim
rename to tests/common/test_confutils_envvar.nim
diff --git a/tests/v2/test_envvar_serialization.nim b/tests/common/test_envvar_serialization.nim
similarity index 100%
rename from tests/v2/test_envvar_serialization.nim
rename to tests/common/test_envvar_serialization.nim
diff --git a/tests/v2/test_sqlite_migrations.nim b/tests/common/test_sqlite_migrations.nim
similarity index 100%
rename from tests/v2/test_sqlite_migrations.nim
rename to tests/common/test_sqlite_migrations.nim