@libp2p/interface-compliance-tests 1.1.23 → 1.1.26

package/dist/src/pubsub/messages.js

@@ -1,29 +1,20 @@
 import { expect } from 'aegir/chai';
 import sinon from 'sinon';
-import { createEd25519PeerId } from '@libp2p/peer-id-factory';
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string';
-import { noSignMsgId } from '@libp2p/pubsub/utils';
-import { PeerStreams } from '@libp2p/pubsub/peer-streams';
-import { mockRegistrar } from '../mocks/registrar.js';
-import pDefer from 'p-defer';
-import delay from 'delay';
-import pWaitFor from 'p-wait-for';
-import { Components } from '@libp2p/interfaces/components';
 import { start, stop } from '../index.js';
+import { pEvent } from 'p-event';
+import { createComponents } from './utils.js';
 const topic = 'foo';
 const data = uint8ArrayFromString('bar');
 export default (common) => {
     describe('messages', () => {
-        let peerId;
         let pubsub;
+        let components;
         // Create pubsub router
         beforeEach(async () => {
-            peerId = await createEd25519PeerId();
+            components = await createComponents();
             pubsub = await common.setup({
-                components: new Components({
-                    peerId,
-                    registrar: mockRegistrar()
-                }),
+                components,
                 init: {
                     emitSelf: true
                 }
@@ -36,69 +27,16 @@ export default (common) => {
             await common.teardown();
         });
         it('should emit normalized signed messages on publish', async () => {
+            const eventPromise = pEvent(pubsub, 'message');
             pubsub.globalSignaturePolicy = 'StrictSign';
-            const spy = sinon.spy(pubsub, 'publishMessage');
-            await pubsub.publish(topic, data);
-            await pWaitFor(async () => {
-                return spy.callCount === 1;
-            });
-            expect(spy).to.have.property('callCount', 1);
-            const [from, messageToEmit] = spy.getCall(0).args;
-            expect(from.toString()).to.equal(peerId.toString());
-            expect(messageToEmit.sequenceNumber).to.not.eql(undefined);
-            expect(messageToEmit.key).to.not.eql(undefined);
-            expect(messageToEmit.signature).to.not.eql(undefined);
-        });
-        it('should drop unsigned messages', async () => {
-            const publishSpy = sinon.spy(pubsub, 'publishMessage');
-            sinon.spy(pubsub, 'validate');
-            const peerStream = new PeerStreams({
-                id: await createEd25519PeerId(),
-                protocol: 'test'
-            });
-            const rpc = {
-                subscriptions: [],
-                messages: [{
-                        from: peerStream.id.toBytes(),
-                        data,
-                        sequenceNumber: await noSignMsgId(data),
-                        topic: topic
-                    }]
-            };
-            pubsub.subscribe(topic);
-            await pubsub.processRpc(peerStream.id, peerStream, rpc);
-            // message should not be delivered
-            await delay(1000);
-            expect(publishSpy).to.have.property('called', false);
-        });
-        it('should not drop unsigned messages if strict signing is disabled', async () => {
-            pubsub.globalSignaturePolicy = 'StrictNoSign';
-            const publishSpy = sinon.spy(pubsub, 'publishMessage');
-            sinon.spy(pubsub, 'validate');
-            const peerStream = new PeerStreams({
-                id: await createEd25519PeerId(),
-                protocol: 'test'
-            });
-            const rpc = {
-                subscriptions: [],
-                messages: [{
-                        from: peerStream.id.toBytes(),
-                        data,
-                        topic
-                    }]
-            };
             pubsub.subscribe(topic);
-            const deferred = pDefer();
-            pubsub.addEventListener('message', (evt) => {
-                if (evt.detail.topic === topic) {
-                    deferred.resolve();
-                }
-            });
-            await pubsub.processRpc(peerStream.id, peerStream, rpc);
-            // await message delivery
-            await deferred.promise;
-            expect(pubsub.validate).to.have.property('callCount', 1);
-            expect(publishSpy).to.have.property('callCount', 1);
+            await pubsub.publish(topic, data);
+            const event = await eventPromise;
+            const message = event.detail;
+            expect(message.from.toString()).to.equal(components.getPeerId().toString());
+            expect(message.sequenceNumber).to.not.eql(undefined);
+            expect(message.key).to.not.eql(undefined);
+            expect(message.signature).to.not.eql(undefined);
         });
     });
 };

package/dist/src/pubsub/messages.js.map

@@ -1 +1 @@
-{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../../src/pubsub/messages.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../../src/pubsub/messages.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AACnC,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,UAAU,IAAI,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAK5E,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAChC,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAE7C,MAAM,KAAK,GAAG,KAAK,CAAA;AACnB,MAAM,IAAI,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAA;AAExC,eAAe,CAAC,MAAqC,EAAE,EAAE;IACvD,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE;QACxB,IAAI,MAAc,CAAA;QAClB,IAAI,UAAsB,CAAA;QAE1B,uBAAuB;QACvB,UAAU,CAAC,KAAK,IAAI,EAAE;YACpB,UAAU,GAAG,MAAM,gBAAgB,EAAE,CAAA;YAErC,MAAM,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC;gBAC1B,UAAU;gBACV,IAAI,EAAE;oBACJ,QAAQ,EAAE,IAAI;iBACf;aACF,CAAC,CAAA;YACF,MAAM,KAAK,CAAC,MAAM,CAAC,CAAA;QACrB,CAAC,CAAC,CAAA;QAEF,SAAS,CAAC,KAAK,IAAI,EAAE;YACnB,KAAK,CAAC,OAAO,EAAE,CAAA;YACf,MAAM,IAAI,CAAC,MAAM,CAAC,CAAA;YAClB,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAA;QACzB,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,mDAAmD,EAAE,KAAK,IAAI,EAAE;YACjE,MAAM,YAAY,GAAG,MAAM,CAAkC,MAAM,EAAE,SAAS,CAAC,CAAA;YAE/E,MAAM,CAAC,qBAAqB,GAAG,YAAY,CAAA;YAC3C,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;YACvB,MAAM,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;YAEjC,MAAM,KAAK,GAAG,MAAM,YAAY,CAAA;YAChC,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAA;YAE5B,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAA;YAC3E,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;YACpD,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;YACzC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;QACjD,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA"}

package/dist/src/pubsub/multiple-nodes.d.ts

@@ -1,6 +1,6 @@
 import type { TestSetup } from '../index.js';
+import type { PubSub } from '@libp2p/interfaces/pubsub';
 import type { PubSubArgs } from './index.js';
-import type { PubSubBaseProtocol } from '@libp2p/pubsub';
-declare const _default: (common: TestSetup<PubSubBaseProtocol, PubSubArgs>) => void;
+declare const _default: (common: TestSetup<PubSub, PubSubArgs>) => void;
 export default _default;
 //# sourceMappingURL=multiple-nodes.d.ts.map

package/dist/src/pubsub/multiple-nodes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"multiple-nodes.d.ts","sourceRoot":"","sources":["../../../src/pubsub/multiple-nodes.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAE5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAG5C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;iCAIhC,UAAU,kBAAkB,EAAE,UAAU,CAAC;AAAjE,wBAohBC"}
+{"version":3,"file":"multiple-nodes.d.ts","sourceRoot":"","sources":["../../../src/pubsub/multiple-nodes.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,KAAK,EAAW,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAChE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;iCAIpB,UAAU,MAAM,EAAE,UAAU,CAAC;AAArD,wBAmZC"}

package/dist/src/pubsub/multiple-nodes.js

@@ -5,10 +5,8 @@ import pDefer from 'p-defer';
 import pWaitFor from 'p-wait-for';
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string';
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string';
-import { createEd25519PeerId } from '@libp2p/peer-id-factory';
-import { connectPeers, mockRegistrar } from '../mocks/registrar.js';
-import { waitForSubscriptionUpdate } from './utils.js';
-import { Components } from '@libp2p/interfaces/components';
+import { connectPeers } from '../mocks/registrar.js';
+import { createComponents, waitForSubscriptionUpdate } from './utils.js';
 import { start, stop } from '../index.js';
 export default (common) => {
     describe('pubsub with multiple nodes', function () {
@@ -20,43 +18,28 @@ export default (common) => {
                 let psA;
                 let psB;
                 let psC;
-                let peerIdA;
-                let peerIdB;
-                let peerIdC;
-                let registrarA;
-                let registrarB;
-                let registrarC;
+                let componentsA;
+                let componentsB;
+                let componentsC;
                 // Create and start pubsub nodes
                 beforeEach(async () => {
-                    peerIdA = await createEd25519PeerId();
-                    peerIdB = await createEd25519PeerId();
-                    peerIdC = await createEd25519PeerId();
-                    registrarA = mockRegistrar();
-                    registrarB = mockRegistrar();
-                    registrarC = mockRegistrar();
+                    componentsA = await createComponents();
+                    componentsB = await createComponents();
+                    componentsC = await createComponents();
                     psA = await common.setup({
-                        components: new Components({
-                            peerId: peerIdA,
-                            registrar: registrarA
-                        }),
+                        components: componentsA,
                         init: {
                             emitSelf: true
                         }
                     });
                     psB = await common.setup({
-                        components: new Components({
-                            peerId: peerIdB,
-                            registrar: registrarB
-                        }),
+                        components: componentsB,
                         init: {
                             emitSelf: true
                         }
                     });
                     psC = await common.setup({
-                        components: new Components({
-                            peerId: peerIdC,
-                            registrar: registrarC
-                        }),
+                        components: componentsC,
                         init: {
                             emitSelf: true
                         }
@@ -66,20 +49,8 @@ export default (common) => {
                 });
                 // Connect nodes
                 beforeEach(async () => {
-                    await connectPeers(psA.multicodecs[0], {
-                        peerId: peerIdA,
-                        registrar: registrarA
-                    }, {
-                        peerId: peerIdB,
-                        registrar: registrarB
-                    });
-                    await connectPeers(psA.multicodecs[0], {
-                        peerId: peerIdB,
-                        registrar: registrarB
-                    }, {
-                        peerId: peerIdC,
-                        registrar: registrarC
-                    });
+                    await connectPeers(psA.multicodecs[0], componentsA, componentsB);
+                    await connectPeers(psB.multicodecs[0], componentsB, componentsC);
                     // Wait for peers to be ready in pubsub
                     await pWaitFor(() => psA.getPeers().length === 1 &&
                         psC.getPeers().length === 1 &&
@@ -94,9 +65,9 @@ export default (common) => {
                     const topic = 'Z';
                     psA.subscribe(topic);
                     expect(psA.getTopics()).to.deep.equal([topic]);
-                    await waitForSubscriptionUpdate(psB, psA);
+                    await waitForSubscriptionUpdate(psB, componentsA.getPeerId());
                     expect(psB.getPeers().length).to.equal(2);
-                    expect(psB.getSubscribers(topic).map(p => p.toString())).to.deep.equal([peerIdA.toString()]);
+                    expect(psB.getSubscribers(topic).map(p => p.toString())).to.deep.equal([componentsA.getPeerId().toString()]);
                     expect(psC.getPeers().length).to.equal(1);
                     expect(psC.getSubscribers(topic)).to.be.empty();
                 });
@@ -105,13 +76,13 @@ export default (common) => {
                     psB.subscribe(topic);
                     expect(psB.getTopics()).to.deep.equal([topic]);
                     await Promise.all([
-                        waitForSubscriptionUpdate(psA, psB),
-                        waitForSubscriptionUpdate(psC, psB)
+                        waitForSubscriptionUpdate(psA, componentsB.getPeerId()),
+                        waitForSubscriptionUpdate(psC, componentsB.getPeerId())
                     ]);
                     expect(psA.getPeers().length).to.equal(1);
-                    expect(psA.getSubscribers(topic).map(p => p.toString())).to.deep.equal([peerIdB.toString()]);
+                    expect(psA.getSubscribers(topic).map(p => p.toString())).to.deep.equal([componentsB.getPeerId().toString()]);
                     expect(psC.getPeers().length).to.equal(1);
-                    expect(psC.getSubscribers(topic).map(p => p.toString())).to.deep.equal([peerIdB.toString()]);
+                    expect(psC.getSubscribers(topic).map(p => p.toString())).to.deep.equal([componentsB.getPeerId().toString()]);
                 });
                 it('subscribe to the topic on node c', async () => {
                     const topic = 'Z';
@@ -121,7 +92,7 @@ export default (common) => {
                     psB.addEventListener('subscription-change', () => {
                         expect(psA.getPeers().length).to.equal(1);
                         expect(psB.getPeers().length).to.equal(2);
-                        expect(psB.getSubscribers(topic).map(p => p.toString())).to.deep.equal([peerIdC.toString()]);
+                        expect(psB.getSubscribers(topic).map(p => p.toString())).to.deep.equal([componentsC.getPeerId().toString()]);
                         defer.resolve();
                     }, {
                         once: true
@@ -135,49 +106,29 @@ export default (common) => {
                     psB.subscribe(topic);
                     psC.subscribe(topic);
                     let counter = 0;
-                    psA.addEventListener('message', (evt) => {
-                        if (evt.detail.topic === topic) {
-                            incMsg(evt);
-                        }
-                    });
-                    psB.addEventListener('message', (evt) => {
-                        if (evt.detail.topic === topic) {
-                            incMsg(evt);
-                        }
-                    });
-                    psC.addEventListener('message', (evt) => {
-                        if (evt.detail.topic === topic) {
-                            incMsg(evt);
-                        }
-                    });
+                    psA.addEventListener('message', incMsg);
+                    psB.addEventListener('message', incMsg);
+                    psC.addEventListener('message', incMsg);
                     await Promise.all([
-                        waitForSubscriptionUpdate(psA, psB),
-                        waitForSubscriptionUpdate(psB, psA),
-                        waitForSubscriptionUpdate(psC, psB)
+                        waitForSubscriptionUpdate(psA, componentsB.getPeerId()),
+                        waitForSubscriptionUpdate(psB, componentsA.getPeerId()),
+                        waitForSubscriptionUpdate(psC, componentsB.getPeerId())
                     ]);
-                    psA.publish(topic, uint8ArrayFromString('hey'));
+                    const result = await psA.publish(topic, uint8ArrayFromString('hey'));
+                    expect(result).to.have.property('recipients').with.property('length').greaterThanOrEqual(1);
                     function incMsg(evt) {
                         const msg = evt.detail;
+                        if (msg.topic !== topic) {
+                            return;
+                        }
                         expect(uint8ArrayToString(msg.data)).to.equal('hey');
                         check();
                     }
                     function check() {
                         if (++counter === 3) {
-                            psA.removeEventListener('message', (evt) => {
-                                if (evt.detail.topic === topic) {
-                                    incMsg(evt);
-                                }
-                            });
-                            psB.removeEventListener('message', (evt) => {
-                                if (evt.detail.topic === topic) {
-                                    incMsg(evt);
-                                }
-                            });
-                            psC.removeEventListener('message', (evt) => {
-                                if (evt.detail.topic === topic) {
-                                    incMsg(evt);
-                                }
-                            });
+                            psA.removeEventListener('message', incMsg);
+                            psB.removeEventListener('message', incMsg);
+                            psC.removeEventListener('message', incMsg);
                             defer.resolve();
                         }
                     }
@@ -195,52 +146,31 @@ export default (common) => {
                         const topic = 'Z';
                         const defer = pDefer();
                         let counter = 0;
-                        psA.addEventListener('message', (evt) => {
-                            if (evt.detail.topic === topic) {
-                                incMsg(evt);
-                            }
-                        });
-                        psB.addEventListener('message', (evt) => {
-                            if (evt.detail.topic === topic) {
-                                incMsg(evt);
-                            }
-                        });
-                        psC.addEventListener('message', (evt) => {
-                            if (evt.detail.topic === topic) {
-                                incMsg(evt);
-                            }
-                        });
+                        psA.addEventListener('message', incMsg);
+                        psB.addEventListener('message', incMsg);
+                        psC.addEventListener('message', incMsg);
                         psA.subscribe(topic);
                         psB.subscribe(topic);
                         psC.subscribe(topic);
                         await Promise.all([
-                            waitForSubscriptionUpdate(psA, psB),
-                            waitForSubscriptionUpdate(psB, psA),
-                            waitForSubscriptionUpdate(psC, psB)
+                            waitForSubscriptionUpdate(psA, componentsB.getPeerId()),
+                            waitForSubscriptionUpdate(psB, componentsA.getPeerId()),
+                            waitForSubscriptionUpdate(psC, componentsB.getPeerId())
                         ]);
-                        psB.publish(topic, uint8ArrayFromString('hey'));
+                        await psB.publish(topic, uint8ArrayFromString('hey'));
                         function incMsg(evt) {
                             const msg = evt.detail;
+                            if (msg.topic !== topic) {
+                                return;
+                            }
                             expect(uint8ArrayToString(msg.data)).to.equal('hey');
                             check();
                         }
                         function check() {
                             if (++counter === 3) {
-                                psA.removeEventListener('message', (evt) => {
-                                    if (evt.detail.topic === topic) {
-                                        incMsg(evt);
-                                    }
-                                });
-                                psB.removeEventListener('message', (evt) => {
-                                    if (evt.detail.topic === topic) {
-                                        incMsg(evt);
-                                    }
-                                });
-                                psC.removeEventListener('message', (evt) => {
-                                    if (evt.detail.topic === topic) {
-                                        incMsg(evt);
-                                    }
-                                });
+                                psA.removeEventListener('message', incMsg);
+                                psB.removeEventListener('message', incMsg);
+                                psC.removeEventListener('message', incMsg);
                                 defer.resolve();
                             }
                         }
@@ -261,69 +191,44 @@ export default (common) => {
                 let psC;
                 let psD;
                 let psE;
-                let peerIdA;
-                let peerIdB;
-                let peerIdC;
-                let peerIdD;
-                let peerIdE;
-                let registrarA;
-                let registrarB;
-                let registrarC;
-                let registrarD;
-                let registrarE;
+                let componentsA;
+                let componentsB;
+                let componentsC;
+                let componentsD;
+                let componentsE;
                 // Create and start pubsub nodes
                 beforeEach(async () => {
-                    peerIdA = await createEd25519PeerId();
-                    peerIdB = await createEd25519PeerId();
-                    peerIdC = await createEd25519PeerId();
-                    peerIdD = await createEd25519PeerId();
-                    peerIdE = await createEd25519PeerId();
-                    registrarA = mockRegistrar();
-                    registrarB = mockRegistrar();
-                    registrarC = mockRegistrar();
-                    registrarD = mockRegistrar();
-                    registrarE = mockRegistrar();
+                    componentsA = await createComponents();
+                    componentsB = await createComponents();
+                    componentsC = await createComponents();
+                    componentsD = await createComponents();
+                    componentsE = await createComponents();
                     psA = await common.setup({
-                        components: new Components({
-                            peerId: peerIdA,
-                            registrar: registrarA
-                        }),
+                        components: componentsA,
                         init: {
                             emitSelf: true
                         }
                     });
                     psB = await common.setup({
-                        components: new Components({
-                            peerId: peerIdB,
-                            registrar: registrarB
-                        }),
+                        components: componentsB,
                         init: {
                             emitSelf: true
                         }
                     });
                     psC = await common.setup({
-                        components: new Components({
-                            peerId: peerIdC,
-                            registrar: registrarC
-                        }),
+                        components: componentsC,
                         init: {
                             emitSelf: true
                         }
                     });
                     psD = await common.setup({
-                        components: new Components({
-                            peerId: peerIdD,
-                            registrar: registrarD
-                        }),
+                        components: componentsD,
                         init: {
                             emitSelf: true
                         }
                     });
                     psE = await common.setup({
-                        components: new Components({
-                            peerId: peerIdE,
-                            registrar: registrarE
-                        }),
+                        components: componentsE,
                         init: {
                             emitSelf: true
                         }
@@ -333,34 +238,10 @@ export default (common) => {
                 });
                 // connect nodes
                 beforeEach(async () => {
-                    await connectPeers(psA.multicodecs[0], {
-                        peerId: peerIdA,
-                        registrar: registrarA
-                    }, {
-                        peerId: peerIdB,
-                        registrar: registrarB
-                    });
-                    await connectPeers(psA.multicodecs[0], {
-                        peerId: peerIdB,
-                        registrar: registrarB
-                    }, {
-                        peerId: peerIdC,
-                        registrar: registrarC
-                    });
-                    await connectPeers(psA.multicodecs[0], {
-                        peerId: peerIdC,
-                        registrar: registrarC
-                    }, {
-                        peerId: peerIdD,
-                        registrar: registrarD
-                    });
-                    await connectPeers(psA.multicodecs[0], {
-                        peerId: peerIdD,
-                        registrar: registrarD
-                    }, {
-                        peerId: peerIdE,
-                        registrar: registrarE
-                    });
+                    await connectPeers(psA.multicodecs[0], componentsA, componentsB);
+                    await connectPeers(psA.multicodecs[0], componentsB, componentsC);
+                    await connectPeers(psA.multicodecs[0], componentsC, componentsD);
+                    await connectPeers(psA.multicodecs[0], componentsD, componentsE);
                     // Wait for peers to be ready in pubsub
                     await pWaitFor(() => psA.getPeers().length === 1 &&
                         psB.getPeers().length === 2 &&
@@ -389,45 +270,28 @@ export default (common) => {
                     let counter = 0;
                     const topic = 'Z';
                     psA.subscribe(topic);
-                    psA.addEventListener('message', (evt) => {
-                        if (evt.detail.topic === topic) {
-                            incMsg(evt);
-                        }
-                    });
+                    psA.addEventListener('message', incMsg);
                     psB.subscribe(topic);
-                    psB.addEventListener('message', (evt) => {
-                        if (evt.detail.topic === topic) {
-                            incMsg(evt);
-                        }
-                    });
+                    psB.addEventListener('message', incMsg);
                     psC.subscribe(topic);
-                    psC.addEventListener('message', (evt) => {
-                        if (evt.detail.topic === topic) {
-                            incMsg(evt);
-                        }
-                    });
+                    psC.addEventListener('message', incMsg);
                     psD.subscribe(topic);
-                    psD.addEventListener('message', (evt) => {
-                        if (evt.detail.topic === topic) {
-                            incMsg(evt);
-                        }
-                    });
+                    psD.addEventListener('message', incMsg);
                     psE.subscribe(topic);
-                    psE.addEventListener('message', (evt) => {
-                        if (evt.detail.topic === topic) {
-                            incMsg(evt);
-                        }
-                    });
+                    psE.addEventListener('message', incMsg);
                     await Promise.all([
-                        waitForSubscriptionUpdate(psA, psB),
-                        waitForSubscriptionUpdate(psB, psA),
-                        waitForSubscriptionUpdate(psC, psB),
-                        waitForSubscriptionUpdate(psD, psC),
-                        waitForSubscriptionUpdate(psE, psD)
+                        waitForSubscriptionUpdate(psA, componentsB.getPeerId()),
+                        waitForSubscriptionUpdate(psB, componentsA.getPeerId()),
+                        waitForSubscriptionUpdate(psC, componentsB.getPeerId()),
+                        waitForSubscriptionUpdate(psD, componentsC.getPeerId()),
+                        waitForSubscriptionUpdate(psE, componentsD.getPeerId())
                     ]);
-                    psC.publish('Z', uint8ArrayFromString('hey from c'));
+                    await psC.publish('Z', uint8ArrayFromString('hey from c'));
                     function incMsg(evt) {
                         const msg = evt.detail;
+                        if (msg.topic !== topic) {
+                            return;
+                        }
                         expect(uint8ArrayToString(msg.data)).to.equal('hey from c');
                         check();
                     }