try some fixes

waku-org · Jan 15, 2024 · a3c26a6 · a3c26a6
1 parent b301ba3
commit a3c26a6
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 14 deletions.
diff --git a/packages/tests/tests/filter/multiple_pubsub.node.spec.ts b/packages/tests/tests/filter/multiple_pubsub.node.spec.ts
@@ -387,10 +387,14 @@ describe("Waku Filter V2 (Named sharding): Multiple PubsubTopics", function () {
 
   this.beforeEach(async function () {
     this.timeout(15000);
-    [nwaku, waku] = await runNodes(this, [
-      customPubsubTopic1,
-      customPubsubTopic2
-    ]);
+    [nwaku, waku] = await runNodes(
+      this,
+      [customPubsubTopic1, customPubsubTopic2],
+      {
+        clusterId: 3,
+        shards: [1, 2]
+      }
+    );
     subscription = await waku.filter.createSubscription(customPubsubTopic1);
     messageCollector = new MessageCollector();
   });

diff --git a/packages/tests/tests/peer_exchange.node.spec.ts b/packages/tests/tests/peer_exchange.node.spec.ts
@@ -16,6 +16,7 @@ import { makeLogFileName } from "../src/log_file.js";
 import { NimGoNode } from "../src/node/node.js";
 
 describe("Peer Exchange", () => {
+  // TODO: fails for a long time
   describe("Locally Run Nodes", () => {
     let waku: LightNode;
     let nwaku1: NimGoNode;

diff --git a/packages/tests/tests/store/multiple_pubsub.spec.ts b/packages/tests/tests/store/multiple_pubsub.spec.ts
@@ -322,7 +322,7 @@ describe("Waku Store (Autosharding), custom pubsub topic", function () {
   });
 });
 
-describe("Waku Store (named sharding), custom pubsub topic", function () {
+describe.only("Waku Store (named sharding), custom pubsub topic", function () {
   this.timeout(15000);
   let waku: LightNode;
   let nwaku: NimGoNode;
@@ -342,18 +342,22 @@ describe("Waku Store (named sharding), custom pubsub topic", function () {
     nwaku = new NimGoNode(makeLogFileName(this));
     await nwaku.start({
       store: true,
-      pubsubTopic: [customShardedPubsubTopic1, customShardedPubsubTopic2],
-      relay: true
+      relay: true,
+      pubsubTopic: [customShardedPubsubTopic1, customShardedPubsubTopic2]
     });
     await nwaku.ensureSubscriptions([
       customShardedPubsubTopic1,
       customShardedPubsubTopic2
     ]);
 
-    waku = await startAndConnectLightNode(nwaku, [
-      customShardedPubsubTopic1,
-      customShardedPubsubTopic2
-    ]);
+    waku = await startAndConnectLightNode(
+      nwaku,
+      [customShardedPubsubTopic1, customShardedPubsubTopic2],
+      {
+        clusterId: 3,
+        shards: [1, 2]
+      }
+    );
   });
 
   afterEach(async function () {

diff --git a/packages/tests/tests/store/utils.ts b/packages/tests/tests/store/utils.ts
@@ -107,12 +107,13 @@ export async function startAndConnectLightNode(
   shardInfo?: ShardingParams
 ): Promise<LightNode> {
   const waku = await createLightNode({
+    pubsubTopics: shardInfo ? undefined : pubsubTopics,
+    staticNoiseKey: NOISE_KEY_1,
+    libp2p: { addresses: { listen: ["/ip4/0.0.0.0/tcp/0/ws"] } },
     ...((pubsubTopics.length !== 1 ||
       pubsubTopics[0] !== DefaultPubsubTopic) && {
       shardInfo: shardInfo
-    }),
-    pubsubTopics: shardInfo ? undefined : pubsubTopics,
-    staticNoiseKey: NOISE_KEY_1
+    })
   });
   await waku.start();
   await waku.dial(await instance.getMultiaddrWithId());