From c290fc587a90442a55de14162c2af3c4c9a4a474 Mon Sep 17 00:00:00 2001 From: achingbrain Date: Tue, 26 Apr 2022 07:57:11 +0100 Subject: [PATCH] fix: add delays for gossipsub GossipSub needs the heartbeat to run before the mesh overlay is built - we need to wait for this to happen otherwise messages don't get gossiped onwards to peers. --- .../src/pubsub/multiple-nodes.ts | 30 ++++++++++++------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/packages/libp2p-interface-compliance-tests/src/pubsub/multiple-nodes.ts b/packages/libp2p-interface-compliance-tests/src/pubsub/multiple-nodes.ts index 8ac45aea7..3cc829141 100644 --- a/packages/libp2p-interface-compliance-tests/src/pubsub/multiple-nodes.ts +++ b/packages/libp2p-interface-compliance-tests/src/pubsub/multiple-nodes.ts @@ -12,6 +12,7 @@ import type { Message, PubSub } from '@libp2p/interfaces/pubsub' import type { PubSubArgs } from './index.js' import type { Components } from '@libp2p/interfaces/components' import { start, stop } from '../index.js' +import delay from 'delay' export default (common: TestSetup) => { describe('pubsub with multiple nodes', function () { @@ -137,18 +138,21 @@ export default (common: TestSetup) => { psB.subscribe(topic) psC.subscribe(topic) - let counter = 0 - - psA.addEventListener('message', incMsg) - psB.addEventListener('message', incMsg) - psC.addEventListener('message', incMsg) - await Promise.all([ waitForSubscriptionUpdate(psA, componentsB.getPeerId()), waitForSubscriptionUpdate(psB, componentsA.getPeerId()), waitForSubscriptionUpdate(psC, componentsB.getPeerId()) ]) + // GossipSub needs time to build the mesh overlay + await delay(1000) + + let counter = 0 + + psA.addEventListener('message', incMsg) + psB.addEventListener('message', incMsg) + psC.addEventListener('message', incMsg) + const result = await psA.publish(topic, uint8ArrayFromString('hey')) expect(result).to.have.property('recipients').with.property('length').greaterThanOrEqual(1) @@ -190,10 +194,6 @@ export default (common: TestSetup) => { const defer = pDefer() let counter = 0 - psA.addEventListener('message', incMsg) - psB.addEventListener('message', incMsg) - psC.addEventListener('message', incMsg) - psA.subscribe(topic) psB.subscribe(topic) psC.subscribe(topic) @@ -204,6 +204,13 @@ export default (common: TestSetup) => { waitForSubscriptionUpdate(psC, componentsB.getPeerId()) ]) + // GossipSub needs time to build the mesh overlay + await delay(1000) + + psA.addEventListener('message', incMsg) + psB.addEventListener('message', incMsg) + psC.addEventListener('message', incMsg) + await psB.publish(topic, uint8ArrayFromString('hey')) function incMsg (evt: CustomEvent) { @@ -352,6 +359,9 @@ export default (common: TestSetup) => { waitForSubscriptionUpdate(psE, componentsD.getPeerId()) ]) + // GossipSub needs time to build the mesh overlay + await delay(1000) + await psC.publish('Z', uint8ArrayFromString('hey from c')) function incMsg (evt: CustomEvent) {