mounting protocols before starting nodes in tests

waku-org · Jul 17, 2024 · 5bb2a75 · 5bb2a75
1 parent c800d7a
commit 5bb2a75
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/tests/waku_store/test_wakunode_store.nim b/tests/waku_store/test_wakunode_store.nim
@@ -79,15 +79,15 @@ procSuite "WakuNode - Store":
       clientKey = generateSecp256k1Key()
       client = newTestWakuNode(clientKey, parseIpAddress("0.0.0.0"), Port(0))
 
-    waitFor allFutures(client.start(), server.start())
-
     let mountArchiveRes = server.mountArchive(archiveA)
     assert mountArchiveRes.isOk(), mountArchiveRes.error
 
     waitFor server.mountStore()
 
     client.mountStoreClient()
 
+    waitFor allFutures(client.start(), server.start())
+
     ## Given
     let req =
       StoreQueryRequest(includeData: true, contentTopics: @[DefaultContentTopic])
@@ -114,15 +114,15 @@ procSuite "WakuNode - Store":
       clientKey = generateSecp256k1Key()
       client = newTestWakuNode(clientKey, parseIpAddress("0.0.0.0"), Port(0))
 
-    waitFor allFutures(client.start(), server.start())
-
     let mountArchiveRes = server.mountArchive(archiveA)
     assert mountArchiveRes.isOk(), mountArchiveRes.error
 
     waitFor server.mountStore()
 
     client.mountStoreClient()
 
+    waitFor allFutures(client.start(), server.start())
+
     ## Given
     let req = StoreQueryRequest(
       includeData: true,
@@ -170,15 +170,15 @@ procSuite "WakuNode - Store":
       clientKey = generateSecp256k1Key()
       client = newTestWakuNode(clientKey, parseIpAddress("0.0.0.0"), Port(0))
 
-    waitFor allFutures(client.start(), server.start())
-
     let mountArchiveRes = server.mountArchive(archiveA)
     assert mountArchiveRes.isOk(), mountArchiveRes.error
 
     waitFor server.mountStore()
 
     client.mountStoreClient()
 
+    waitFor allFutures(client.start(), server.start())
+
     ## Given
     let req = StoreQueryRequest(
       includeData: true,

diff --git a/tests/waku_store_legacy/test_wakunode_store.nim b/tests/waku_store_legacy/test_wakunode_store.nim
@@ -70,15 +70,15 @@ procSuite "WakuNode - Store Legacy":
       clientKey = generateSecp256k1Key()
       client = newTestWakuNode(clientKey, parseIpAddress("0.0.0.0"), Port(0))
 
-    waitFor allFutures(client.start(), server.start())
-
     let mountArchiveRes = server.mountArchive(archiveA)
     assert mountArchiveRes.isOk(), mountArchiveRes.error
 
     waitFor server.mountLegacyStore()
 
     client.mountLegacyStoreClient()
 
+    waitFor allFutures(client.start(), server.start())
+
     ## Given
     let req = HistoryQuery(contentTopics: @[DefaultContentTopic])
     let serverPeer = server.peerInfo.toRemotePeerInfo()
@@ -104,15 +104,15 @@ procSuite "WakuNode - Store Legacy":
       clientKey = generateSecp256k1Key()
       client = newTestWakuNode(clientKey, parseIpAddress("0.0.0.0"), Port(0))
 
-    waitFor allFutures(client.start(), server.start())
-
     let mountArchiveRes = server.mountArchive(archiveA)
     assert mountArchiveRes.isOk(), mountArchiveRes.error
 
     waitFor server.mountLegacyStore()
 
     client.mountLegacyStoreClient()
 
+    waitFor allFutures(client.start(), server.start())
+
     ## Given
     let req = HistoryQuery(
       contentTopics: @[DefaultContentTopic],
@@ -159,15 +159,15 @@ procSuite "WakuNode - Store Legacy":
       clientKey = generateSecp256k1Key()
       client = newTestWakuNode(clientKey, parseIpAddress("0.0.0.0"), Port(0))
 
-    waitFor allFutures(client.start(), server.start())
-
     let mountArchiveRes = server.mountArchive(archiveA)
     assert mountArchiveRes.isOk(), mountArchiveRes.error
 
     waitFor server.mountLegacyStore()
 
     client.mountLegacyStoreClient()
 
+    waitFor allFutures(client.start(), server.start())
+
     ## Given
     let req = HistoryQuery(
       contentTopics: @[DefaultContentTopic],
@@ -218,8 +218,6 @@ procSuite "WakuNode - Store Legacy":
       clientKey = generateSecp256k1Key()
       client = newTestWakuNode(clientKey, parseIpAddress("0.0.0.0"), Port(0))
 
-    waitFor allFutures(client.start(), server.start(), filterSource.start())
-
     waitFor filterSource.mountFilter()
     let driver = newSqliteArchiveDriver()
 
@@ -230,6 +228,8 @@ procSuite "WakuNode - Store Legacy":
     waitFor server.mountFilterClient()
     client.mountLegacyStoreClient()
 
+    waitFor allFutures(client.start(), server.start(), filterSource.start())
+
     ## Given
     let message = fakeWakuMessage()
     let
@@ -284,15 +284,15 @@ procSuite "WakuNode - Store Legacy":
       clientKey = generateSecp256k1Key()
       client = newTestWakuNode(clientKey, parseIpAddress("0.0.0.0"), Port(0))
 
-    waitFor allFutures(client.start(), server.start())
-
     let mountArchiveRes = server.mountArchive(archiveA)
     assert mountArchiveRes.isOk(), mountArchiveRes.error
 
     waitFor server.mountLegacyStore()
 
     client.mountLegacyStoreClient()
 
+    waitFor allFutures(client.start(), server.start())
+
     ## Forcing a bad cursor with empty digest data
     var data: array[32, byte] = [
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

diff --git a/waku/node/waku_node.nim b/waku/node/waku_node.nim
@@ -1272,6 +1272,8 @@ proc start*(node: WakuNode) {.async.} =
   if not node.isBootstrapOnly():
     ## The switch will update addresses after start using the addressMapper
     await node.switch.start()
+  else:
+    warn "Did not start libp2p switch as no protocols are mounted"
 
   node.started = true