fix: failing node_optional check (#2025)

* chore: remove predefine nodes list * remove import * chore: update & fix test * chore: remove console logs
waku-org · Jun 18, 2024 · 984fb94 · 984fb94
1 parent 16e9116
commit 984fb94
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 109 deletions.
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -9,10 +9,6 @@
       "types": "./dist/index.d.ts",
       "import": "./dist/index.js"
     },
-    "./lib/predefined_bootstrap_nodes": {
-      "types": "./dist/lib/predefined_bootstrap_nodes.d.ts",
-      "import": "./dist/lib/predefined_bootstrap_nodes.js"
-    },
     "./lib/message/version_0": {
       "types": "./dist/lib/message/version_0.d.ts",
       "import": "./dist/lib/message/version_0.js"

diff --git a/packages/core/src/lib/predefined_bootstrap_nodes.ts b/packages/core/src/lib/predefined_bootstrap_nodes.ts
diff --git a/packages/tests/tests/peer-exchange/pe.optional.spec.ts b/packages/tests/tests/peer-exchange/pe.optional.spec.ts
@@ -1,9 +1,9 @@
 import { bootstrap } from "@libp2p/bootstrap";
 import {
-  Fleet,
-  getPredefinedBootstrapNodes
-} from "@waku/core/lib/predefined_bootstrap_nodes";
-import { wakuPeerExchangeDiscovery } from "@waku/discovery";
+  DnsNodeDiscovery,
+  enrTree,
+  wakuPeerExchangeDiscovery
+} from "@waku/discovery";
 import type { LightNode } from "@waku/interfaces";
 import { createLightNode } from "@waku/sdk";
 import {
@@ -17,50 +17,56 @@ import { afterEachCustom, tearDownNodes } from "../../src";
 describe("Peer Exchange", () => {
   describe("Auto Discovery", function () {
     let waku: LightNode;
+    const predefinedNodes: string[] = [];
 
     afterEachCustom(this, async () => {
       await tearDownNodes([], waku);
     });
 
-    const testCases: [Fleet, number][] = [
-      [Fleet.Test, 2], // on test fleet there are only 3 peers
-      [Fleet.Sandbox, 3]
-    ];
+    it(`should discover peers other than used for bootstrapping`, async function () {
+      this.timeout(50_000);
 
-    testCases.map(([name, nodes]) => {
-      it(`should discover peers other than used for bootstrapping on ${name} fleet`, async function () {
-        this.timeout(50_000);
-        const predefinedNodes = getPredefinedBootstrapNodes(name, nodes);
+      const dns = await DnsNodeDiscovery.dnsOverHttp();
+      const dnsEnrs = await dns.getPeers(
+        [enrTree["SANDBOX"], enrTree["TEST"]],
+        {
+          lightPush: 1
+        }
+      );
+      const dnsPeerMultiaddrs = dnsEnrs
+        .flatMap(
+          (enr) => enr.peerInfo?.multiaddrs.map((ma) => ma.toString()) ?? []
+        )
+        .filter((ma) => ma.includes("wss"));
 
-        const singleShardInfo = { clusterId: 1, shard: 1 };
-        const shardInfo = singleShardInfosToShardInfo([singleShardInfo]);
-        const pubsubTopic = singleShardInfoToPubsubTopic(singleShardInfo);
-        waku = await createLightNode({
-          libp2p: {
-            peerDiscovery: [
-              bootstrap({ list: predefinedNodes }),
-              wakuPeerExchangeDiscovery([pubsubTopic])
-            ]
-          },
-          shardInfo: shardInfo
-        });
+      const singleShardInfo = { clusterId: 1, shard: 1 };
+      const shardInfo = singleShardInfosToShardInfo([singleShardInfo]);
+      const pubsubTopic = singleShardInfoToPubsubTopic(singleShardInfo);
+      waku = await createLightNode({
+        libp2p: {
+          peerDiscovery: [
+            bootstrap({ list: dnsPeerMultiaddrs }),
+            wakuPeerExchangeDiscovery([pubsubTopic])
+          ]
+        },
+        shardInfo: shardInfo
+      });
 
-        await waku.start();
+      await waku.start();
 
-        const foundPxPeer = await new Promise<boolean>((resolve) => {
-          waku.libp2p.addEventListener("peer:discovery", (evt) => {
-            const peerId = evt.detail.id.toString();
-            const isBootstrapNode = predefinedNodes.find((n) =>
-              n.includes(peerId)
-            );
-            if (!isBootstrapNode) {
-              resolve(true);
-            }
-          });
+      const foundPxPeer = await new Promise<boolean>((resolve) => {
+        waku.libp2p.addEventListener("peer:discovery", (evt) => {
+          const peerId = evt.detail.id.toString();
+          const isBootstrapNode = predefinedNodes.find((n) =>
+            n.includes(peerId)
+          );
+          if (!isBootstrapNode) {
+            resolve(true);
+          }
         });
-
-        expect(foundPxPeer).to.be.true;
       });
+
+      expect(foundPxPeer).to.be.true;
     });
   });
 });