Skip to content

Commit b7d4b67

Browse files
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
1 parent 306e38b commit b7d4b67

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

packages/tests/src/run-tests.js

-2
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,9 @@ const WAKUNODE_IMAGE =
99
async function main() {
1010
try {
1111
await execAsync(`docker inspect ${WAKUNODE_IMAGE}`);
12-
1312
console.log("Using local image");
1413
} catch (error) {
1514
console.log("Pulling image...");
16-
1715
await execAsync(`docker pull ${WAKUNODE_IMAGE}`);
1816
console.log("Image pulled");
1917
}

packages/tests/tests/peer_exchange.node.spec.ts

+5-7
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ describe("Peer Exchange", () => {
9292
discv5BootstrapNode: enr,
9393
});
9494

95-
const nwaku1Ma = await nwaku1.getMultiaddrWithId();
95+
const nwaku1PeerId = await nwaku1.getPeerId();
9696
const nwaku2Ma = await nwaku2.getMultiaddrWithId();
9797

9898
waku = await createLightNode();
@@ -130,14 +130,12 @@ describe("Peer Exchange", () => {
130130
expect(peerInfos.length).to.be.lessThanOrEqual(numPeersToRequest);
131131
expect(peerInfos[0].ENR).to.not.be.null;
132132

133-
const doesMultiaddrExist =
133+
const doesPeerIdExistInResponse =
134134
peerInfos.find(
135-
(peerInfo) =>
136-
peerInfo.ENR?.getFullMultiaddrs()?.find((multiaddr) =>
137-
multiaddr.equals(nwaku1Ma)
138-
) !== undefined
135+
({ ENR }) => ENR?.peerInfo?.id.toString() === nwaku1PeerId.toString()
139136
) !== undefined;
140-
expect(doesMultiaddrExist).to.be.equal(true);
137+
138+
expect(doesPeerIdExistInResponse).to.be.equal(true);
141139

142140
expect(waku.libp2p.peerStore.has(await nwaku2.getPeerId())).to.be.true;
143141
});

0 commit comments

Comments
 (0)