From b7d4b675bdfa19f2eaaa2b87decddaf20f6dc921 Mon Sep 17 00:00:00 2001
From: Danish Arora <35004822+danisharora099@users.noreply.github.com>
Date: Wed, 19 Apr 2023 13:07:29 +0530
Subject: [PATCH] fix: peer-exchange go-waku interop (#1300)

* merge: master

* fix: CI

* use: js script instead of shell script to run precheck and mocha

* check for peer id instead of ws multiaddr in response
---
 packages/tests/src/run-tests.js                 |  2 --
 packages/tests/tests/peer_exchange.node.spec.ts | 12 +++++-------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/packages/tests/src/run-tests.js b/packages/tests/src/run-tests.js
index 50c8cf11f3..53b187df8a 100644
--- a/packages/tests/src/run-tests.js
+++ b/packages/tests/src/run-tests.js
@@ -9,11 +9,9 @@ const WAKUNODE_IMAGE =
 async function main() {
   try {
     await execAsync(`docker inspect ${WAKUNODE_IMAGE}`);
-
     console.log("Using local image");
   } catch (error) {
     console.log("Pulling image...");
-
     await execAsync(`docker pull ${WAKUNODE_IMAGE}`);
     console.log("Image pulled");
   }
diff --git a/packages/tests/tests/peer_exchange.node.spec.ts b/packages/tests/tests/peer_exchange.node.spec.ts
index 975a00e0dd..1bbf335465 100644
--- a/packages/tests/tests/peer_exchange.node.spec.ts
+++ b/packages/tests/tests/peer_exchange.node.spec.ts
@@ -92,7 +92,7 @@ describe("Peer Exchange", () => {
         discv5BootstrapNode: enr,
       });
 
-      const nwaku1Ma = await nwaku1.getMultiaddrWithId();
+      const nwaku1PeerId = await nwaku1.getPeerId();
       const nwaku2Ma = await nwaku2.getMultiaddrWithId();
 
       waku = await createLightNode();
@@ -130,14 +130,12 @@ describe("Peer Exchange", () => {
       expect(peerInfos.length).to.be.lessThanOrEqual(numPeersToRequest);
       expect(peerInfos[0].ENR).to.not.be.null;
 
-      const doesMultiaddrExist =
+      const doesPeerIdExistInResponse =
         peerInfos.find(
-          (peerInfo) =>
-            peerInfo.ENR?.getFullMultiaddrs()?.find((multiaddr) =>
-              multiaddr.equals(nwaku1Ma)
-            ) !== undefined
+          ({ ENR }) => ENR?.peerInfo?.id.toString() === nwaku1PeerId.toString()
         ) !== undefined;
-      expect(doesMultiaddrExist).to.be.equal(true);
+
+      expect(doesPeerIdExistInResponse).to.be.equal(true);
 
       expect(waku.libp2p.peerStore.has(await nwaku2.getPeerId())).to.be.true;
     });