From 49c39682e45b0e3f8e03c4d2292b5a74a775dacb Mon Sep 17 00:00:00 2001
From: Danish Arora <35004822+danisharora099@users.noreply.github.com>
Date: Mon, 11 Mar 2024 01:53:03 +0530
Subject: [PATCH] fix(tests): sharding (#1893)

---
 packages/tests/tests/getPeers.spec.ts | 40 +++++++++++++++++----------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/packages/tests/tests/getPeers.spec.ts b/packages/tests/tests/getPeers.spec.ts
index fa8705d86d..8035046900 100644
--- a/packages/tests/tests/getPeers.spec.ts
+++ b/packages/tests/tests/getPeers.spec.ts
@@ -72,33 +72,45 @@ describe("getConnectedPeersForProtocolAndShard", function () {
     expect(peers.length).to.be.greaterThan(0);
   });
 
-  // Had to use cluster 0 because of https://github.com/waku-org/js-waku/issues/1848
-  it("same cluster, different shard: nodes connect", async function () {
+  it("same cluster, different shard: nodes don't connect", async function () {
     this.timeout(15000);
 
-    const shardInfo: ShardInfo = {
-      clusterId: 0,
+    const shardInfo1: ShardInfo = {
+      clusterId: 2,
       shards: [1]
     };
 
-    const shardInfoServiceNode: ShardInfo = {
-      clusterId: 0,
-      shards: [1]
+    const shardInfo2: ShardInfo = {
+      clusterId: 2,
+      shards: [2]
     };
 
+    // Separate shard
     await serviceNode1.start({
       discv5Discovery: true,
       peerExchange: true,
-      clusterId: shardInfoServiceNode.clusterId,
-      pubsubTopic: shardInfoToPubsubTopics(shardInfoServiceNode),
+      clusterId: shardInfo1.clusterId,
+      pubsubTopic: shardInfoToPubsubTopics(shardInfo1),
       lightpush: true,
       relay: true
     });
 
-    const serviceNodeMa = await serviceNode1.getMultiaddrWithId();
+    // Same shard
+    await serviceNode2.start({
+      discv5Discovery: true,
+      peerExchange: true,
+      clusterId: shardInfo2.clusterId,
+      pubsubTopic: shardInfoToPubsubTopics(shardInfo2),
+      lightpush: true,
+      relay: true
+    });
 
-    waku = await createLightNode({ shardInfo });
-    await waku.libp2p.dialProtocol(serviceNodeMa, LightPushCodec);
+    const serviceNode1Ma = await serviceNode1.getMultiaddrWithId();
+    const serviceNode2Ma = await serviceNode2.getMultiaddrWithId();
+
+    waku = await createLightNode({ shardInfo: shardInfo2 });
+    await waku.libp2p.dialProtocol(serviceNode1Ma, LightPushCodec);
+    await waku.libp2p.dialProtocol(serviceNode2Ma, LightPushCodec);
     await waku.start();
     await waitForRemotePeer(waku, [Protocols.LightPush]);
 
@@ -106,9 +118,9 @@ describe("getConnectedPeersForProtocolAndShard", function () {
       waku.libp2p.getConnections(),
       waku.libp2p.peerStore,
       waku.libp2p.getProtocols(),
-      shardInfo
+      ensureShardingConfigured(shardInfo2).shardInfo
     );
-    expect(peers.length).to.be.greaterThan(0);
+    expect(peers.length).to.be.equal(1);
   });
 
   it("different cluster, same shard: nodes don't connect", async function () {