@libp2p/interface-compliance-tests 1.1.6 → 1.1.10

package/dist/src/pubsub/emit-self.js.map

@@ -1 +1 @@
-{"version":3,"file":"emit-self.js","sourceRoot":"","sources":["../../../src/pubsub/emit-self.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAC5C,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,UAAU,IAAI,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAK5E,MAAM,KAAK,GAAG,KAAK,CAAA;AACnB,MAAM,IAAI,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAA;AACxC,MAAM,eAAe,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAA;AAE3C,eAAe,CAAC,MAA2D,EAAE,EAAE;IAC7E,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;QACzB,IAAI,MAAwB,CAAA;QAE5B,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE;YACvB,MAAM,CAAC,KAAK,IAAI,EAAE;gBAChB,MAAM,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAA;YACjD,CAAC,CAAC,CAAA;YAEF,MAAM,CAAC,KAAK,IAAI,EAAE;gBAChB,MAAM,MAAM,CAAC,KAAK,EAAE,CAAA;gBACpB,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;YACzB,CAAC,CAAC,CAAA;YAEF,KAAK,CAAC,KAAK,IAAI,EAAE;gBACf,KAAK,CAAC,OAAO,EAAE,CAAA;gBACf,MAAM,MAAM,CAAC,IAAI,EAAE,CAAA;gBACnB,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAA;YACzB,CAAC,CAAC,CAAA;YAEF,EAAE,CAAC,gCAAgC,EAAE,KAAK,IAAI,EAAE;gBAC9C,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,KAAK,EAAE,OAAO,EAAE;oBAC/E,IAAI,EAAE,IAAI;iBACX,CAAC,CAAC,CAAA;gBAEH,KAAK,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;gBAEhC,OAAO,MAAM,OAAO,CAAA;YACtB,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QAEF,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE;YACxB,MAAM,CAAC,KAAK,IAAI,EAAE;gBAChB,MAAM,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAA;YAClD,CAAC,CAAC,CAAA;YAEF,MAAM,CAAC,KAAK,IAAI,EAAE;gBAChB,MAAM,MAAM,CAAC,KAAK,EAAE,CAAA;gBACpB,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;YACzB,CAAC,CAAC,CAAA;YAEF,KAAK,CAAC,KAAK,IAAI,EAAE;gBACf,KAAK,CAAC,OAAO,EAAE,CAAA;gBACf,MAAM,MAAM,CAAC,IAAI,EAAE,CAAA;gBACnB,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAA;YACzB,CAAC,CAAC,CAAA;YAEF,EAAE,CAAC,oCAAoC,EAAE,KAAK,IAAI,EAAE;gBAClD,MAAM,CAAC,gBAAgB,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,eAAe,EAAE;oBACpD,IAAI,EAAE,IAAI;iBACX,CAAC,CAAA;gBAEF,KAAK,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;gBAEhC,sDAAsD;gBACtD,OAAO,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAA;YAClE,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA"}
+{"version":3,"file":"emit-self.js","sourceRoot":"","sources":["../../../src/pubsub/emit-self.ts"],"names":[],"mappings":"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"}

package/dist/src/pubsub/index.d.ts

@@ -1,12 +1,15 @@
 import type { TestSetup } from '../index.js';
-import type { PubSub, Message, PubsubEvents } from '@libp2p/interfaces/pubsub';
-export interface EventMap extends PubsubEvents {
+import type { Message, PubSubEvents, PubSubOptions } from '@libp2p/interfaces/pubsub';
+import type { PubsubBaseProtocol } from '@libp2p/pubsub';
+export interface EventMap extends PubSubEvents {
     'topic': CustomEvent<Message>;
     'foo': CustomEvent<Message>;
     'test-topic': CustomEvent<Message>;
     'reconnect-channel': CustomEvent<Message>;
     'Z': CustomEvent<Message>;
+    'Za': CustomEvent<Message>;
+    'Zb': CustomEvent<Message>;
 }
-declare const _default: (common: TestSetup<PubSub<EventMap>>) => void;
+declare const _default: (common: TestSetup<PubsubBaseProtocol<EventMap>, PubSubOptions>) => void;
 export default _default;
 //# sourceMappingURL=index.d.ts.map

package/dist/src/pubsub/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/pubsub/index.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAE9E,MAAM,WAAW,QAAS,SAAQ,YAAY;IAC5C,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,CAAA;IAC7B,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,CAAA;IAC3B,YAAY,EAAE,WAAW,CAAC,OAAO,CAAC,CAAA;IAClC,mBAAmB,EAAE,WAAW,CAAC,OAAO,CAAC,CAAA;IACzC,GAAG,EAAE,WAAW,CAAC,OAAO,CAAC,CAAA;CAC1B;iCAEuB,UAAU,OAAO,QAAQ,CAAC,CAAC;AAAnD,wBASC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/pubsub/index.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACrF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAExD,MAAM,WAAW,QAAS,SAAQ,YAAY;IAC5C,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,CAAA;IAC7B,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,CAAA;IAC3B,YAAY,EAAE,WAAW,CAAC,OAAO,CAAC,CAAA;IAClC,mBAAmB,EAAE,WAAW,CAAC,OAAO,CAAC,CAAA;IACzC,GAAG,EAAE,WAAW,CAAC,OAAO,CAAC,CAAA;IACzB,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,CAAA;IAC1B,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,CAAA;CAC3B;iCAEuB,UAAU,mBAAmB,QAAQ,CAAC,EAAE,aAAa,CAAC;AAA9E,wBASC"}

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/pubsub/index.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,UAAU,CAAA;AAC9B,OAAO,YAAY,MAAM,gBAAgB,CAAA;AACzC,OAAO,YAAY,MAAM,eAAe,CAAA;AACxC,OAAO,sBAAsB,MAAM,0BAA0B,CAAA;AAC7D,OAAO,YAAY,MAAM,gBAAgB,CAAA;AACzC,OAAO,iBAAiB,MAAM,qBAAqB,CAAA;AAYnD,eAAe,CAAC,MAAmC,EAAE,EAAE;IACrD,QAAQ,CAAC,mCAAmC,EAAE,GAAG,EAAE;QACjD,OAAO,CAAC,MAAM,CAAC,CAAA;QACf,YAAY,CAAC,MAAM,CAAC,CAAA;QACpB,YAAY,CAAC,MAAM,CAAC,CAAA;QACpB,sBAAsB,CAAC,MAAM,CAAC,CAAA;QAC9B,YAAY,CAAC,MAAM,CAAC,CAAA;QACpB,iBAAiB,CAAC,MAAM,CAAC,CAAA;IAC3B,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/pubsub/index.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,UAAU,CAAA;AAC9B,OAAO,YAAY,MAAM,gBAAgB,CAAA;AACzC,OAAO,YAAY,MAAM,eAAe,CAAA;AACxC,OAAO,sBAAsB,MAAM,0BAA0B,CAAA;AAC7D,OAAO,YAAY,MAAM,gBAAgB,CAAA;AACzC,OAAO,iBAAiB,MAAM,qBAAqB,CAAA;AAenD,eAAe,CAAC,MAA8D,EAAE,EAAE;IAChF,QAAQ,CAAC,mCAAmC,EAAE,GAAG,EAAE;QACjD,OAAO,CAAC,MAAM,CAAC,CAAA;QACf,YAAY,CAAC,MAAM,CAAC,CAAA;QACpB,YAAY,CAAC,MAAM,CAAC,CAAA;QACpB,sBAAsB,CAAC,MAAM,CAAC,CAAA;QAC9B,YAAY,CAAC,MAAM,CAAC,CAAA;QACpB,iBAAiB,CAAC,MAAM,CAAC,CAAA;IAC3B,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA"}

package/dist/src/pubsub/messages.d.ts

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

package/dist/src/pubsub/messages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../../src/pubsub/messages.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AACvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;iCAKlB,UAAU,OAAO,QAAQ,CAAC,CAAC;AAAnD,wBAiGC"}
+{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../../src/pubsub/messages.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,KAAK,EAAE,aAAa,EAAO,MAAM,2BAA2B,CAAA;AACnE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAC1C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;iCAKhC,UAAU,mBAAmB,QAAQ,CAAC,EAAE,aAAa,CAAC;AAA9E,wBA0GC"}

package/dist/src/pubsub/messages.js

@@ -1,9 +1,14 @@
 import { expect } from 'aegir/utils/chai.js';
 import sinon from 'sinon';
-import * as PeerIdFactory from '@libp2p/peer-id-factory';
+import { createEd25519PeerId } from '@libp2p/peer-id-factory';
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string';
-import * as utils from '@libp2p/pubsub/utils';
+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 { CustomEvent } from '@libp2p/interfaces';
 const topic = 'foo';
 const data = uint8ArrayFromString('bar');
 export default (common) => {
@@ -11,7 +16,11 @@ export default (common) => {
         let pubsub;
         // Create pubsub router
         beforeEach(async () => {
-            pubsub = await common.setup();
+            pubsub = await common.setup({
+                peerId: await createEd25519PeerId(),
+                registrar: mockRegistrar(),
+                emitSelf: true
+            });
             await pubsub.start();
         });
         afterEach(async () => {
@@ -21,72 +30,66 @@ export default (common) => {
         });
         it('should emit normalized signed messages on publish', async () => {
             pubsub.globalSignaturePolicy = 'StrictSign';
-            // @ts-expect-error protected field
-            sinon.spy(pubsub, '_emitMessage');
-            await pubsub.publish(topic, data);
-            // @ts-expect-error protected field
-            expect(pubsub._emitMessage.callCount).to.eql(1);
-            // @ts-expect-error protected field
-            const [messageToEmit] = pubsub._emitMessage.getCall(0).args;
+            const spy = sinon.spy(pubsub, 'publishMessage');
+            await pubsub.dispatchEvent(new CustomEvent(topic, { detail: 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(pubsub.peerId.toString());
             expect(messageToEmit.seqno).to.not.eql(undefined);
             expect(messageToEmit.key).to.not.eql(undefined);
             expect(messageToEmit.signature).to.not.eql(undefined);
         });
         it('should drop unsigned messages', async () => {
-            // @ts-expect-error protected field
-            sinon.spy(pubsub, '_emitMessage');
-            // @ts-expect-error protected field
-            sinon.spy(pubsub, '_publish');
+            const publishSpy = sinon.spy(pubsub, 'publishMessage');
             sinon.spy(pubsub, 'validate');
             const peerStream = new PeerStreams({
-                id: await PeerIdFactory.createEd25519PeerId(),
+                id: await createEd25519PeerId(),
                 protocol: 'test'
             });
             const rpc = {
                 subscriptions: [],
-                msgs: [{
-                        receivedFrom: peerStream.id.toString(),
+                messages: [{
                         from: peerStream.id.toBytes(),
                         data,
-                        seqno: utils.randomSeqno(),
-                        topicIDs: [topic]
+                        seqno: await noSignMsgId(data),
+                        topic: topic
                     }]
             };
             pubsub.subscribe(topic);
-            // @ts-expect-error protected field
-            await pubsub._processRpc(peerStream.id.toString(), peerStream, rpc);
-            expect(pubsub.validate).to.have.property('callCount', 1);
-            // @ts-expect-error protected field
-            expect(pubsub._emitMessage).to.have.property('called', false);
-            // @ts-expect-error protected field
-            expect(pubsub._publish).to.have.property('called', false);
+            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';
-            // @ts-expect-error protected field
-            sinon.spy(pubsub, '_emitMessage');
-            // @ts-expect-error protected field
-            sinon.spy(pubsub, '_publish');
+            const publishSpy = sinon.spy(pubsub, 'publishMessage');
             sinon.spy(pubsub, 'validate');
             const peerStream = new PeerStreams({
-                id: await PeerIdFactory.createEd25519PeerId(),
+                id: await createEd25519PeerId(),
                 protocol: 'test'
             });
             const rpc = {
                 subscriptions: [],
-                msgs: [{
+                messages: [{
+                        from: peerStream.id.toBytes(),
                         data,
-                        topicIDs: [topic]
+                        topic
                     }]
             };
             pubsub.subscribe(topic);
-            // @ts-expect-error protected field
-            await pubsub._processRpc(peerStream.id.toString(), peerStream, rpc);
+            const deferred = pDefer();
+            pubsub.addEventListener(topic, () => {
+                deferred.resolve();
+            });
+            await pubsub.processRpc(peerStream.id, peerStream, rpc);
+            // await message delivery
+            await deferred.promise;
             expect(pubsub.validate).to.have.property('callCount', 1);
-            // @ts-expect-error protected field
-            expect(pubsub._emitMessage).to.have.property('called', 1);
-            // @ts-expect-error protected field
-            expect(pubsub._publish).to.have.property('called', 1);
+            expect(publishSpy).to.have.property('callCount', 1);
         });
     });
 };

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":"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"}

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

@@ -1,6 +1,7 @@
 import type { TestSetup } from '../index.js';
-import type { PubSub } from '@libp2p/interfaces/pubsub';
+import type { PubSubOptions } from '@libp2p/interfaces/pubsub';
 import type { EventMap } from './index.js';
-declare const _default: (common: TestSetup<PubSub<EventMap>>) => void;
+import type { PubsubBaseProtocol } from '@libp2p/pubsub';
+declare const _default: (common: TestSetup<PubsubBaseProtocol<EventMap>, PubSubOptions>) => 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":"AASA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,KAAK,EAAE,MAAM,EAAW,MAAM,2BAA2B,CAAA;AAChE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;iCAElB,UAAU,OAAO,QAAQ,CAAC,CAAC;AAAnD,wBA0WC"}
+{"version":3,"file":"multiple-nodes.d.ts","sourceRoot":"","sources":["../../../src/pubsub/multiple-nodes.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,KAAK,EAAW,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACvE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAG1C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;iCAEhC,UAAU,mBAAmB,QAAQ,CAAC,EAAE,aAAa,CAAC;AAA9E,wBAsdC"}

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

@@ -6,7 +6,9 @@ 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 { expectSet } from './utils.js';
+import { createEd25519PeerId } from '@libp2p/peer-id-factory';
+import { connectPeers, mockRegistrar } from '../mocks/registrar.js';
+import { CustomEvent } from '@libp2p/interfaces';
 export default (common) => {
     describe('pubsub with multiple nodes', function () {
         describe('every peer subscribes to the topic', () => {
@@ -17,46 +19,80 @@ export default (common) => {
                 let psA;
                 let psB;
                 let psC;
+                let peerIdA;
+                let peerIdB;
+                let peerIdC;
+                let registrarA;
+                let registrarB;
+                let registrarC;
                 // Create and start pubsub nodes
                 beforeEach(async () => {
-                    psA = await common.setup();
-                    psB = await common.setup();
-                    psC = await common.setup();
-                    [psA, psB, psC].map((p) => p.start());
+                    peerIdA = await createEd25519PeerId();
+                    peerIdB = await createEd25519PeerId();
+                    peerIdC = await createEd25519PeerId();
+                    registrarA = mockRegistrar();
+                    registrarB = mockRegistrar();
+                    registrarC = mockRegistrar();
+                    psA = await common.setup({
+                        peerId: peerIdA,
+                        registrar: registrarA,
+                        emitSelf: true
+                    });
+                    psB = await common.setup({
+                        peerId: peerIdB,
+                        registrar: registrarB,
+                        emitSelf: true
+                    });
+                    psC = await common.setup({
+                        peerId: peerIdC,
+                        registrar: registrarC,
+                        emitSelf: true
+                    });
+                    // Start pubsub modes
+                    await Promise.all([psA, psB, psC].map(async (p) => await p.start()));
                 });
                 // Connect nodes
                 beforeEach(async () => {
-                    // @ts-expect-error protected field
-                    await psA._libp2p.dial(psB.peerId);
-                    // @ts-expect-error protected field
-                    await psB._libp2p.dial(psC.peerId);
+                    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
+                    });
                     // Wait for peers to be ready in pubsub
-                    await pWaitFor(() => psA.peers.size === 1 &&
-                        psC.peers.size === 1 &&
-                        psA.peers.size === 1);
+                    await pWaitFor(() => psA.getPeers().length === 1 &&
+                        psC.getPeers().length === 1 &&
+                        psA.getPeers().length === 1);
                 });
                 afterEach(async () => {
                     sinon.restore();
-                    [psA, psB, psC].map((p) => p.stop());
+                    await Promise.all([psA, psB, psC].map(async (p) => await p.stop()));
                     await common.teardown();
                 });
                 it('subscribe to the topic on node a', async () => {
                     const topic = 'Z';
                     psA.subscribe(topic);
-                    expectSet(psA.subscriptions, [topic]);
+                    expect(psA.getTopics()).to.deep.equal([topic]);
                     await new Promise((resolve) => psB.addEventListener('pubsub:subscription-change', resolve, {
                         once: true
                     }));
-                    expect(psB.peers.size).to.equal(2);
-                    const aPeerId = psA.peerId.toString();
-                    expectSet(psB.topics.get(topic), [aPeerId]);
-                    expect(psC.peers.size).to.equal(1);
-                    expect(psC.topics.get(topic)).to.eql(undefined);
+                    expect(psB.getPeers().length).to.equal(2);
+                    expect(psB.getSubscribers(topic).map(p => p.toString())).to.deep.equal([peerIdA.toString()]);
+                    expect(psC.getPeers().length).to.equal(1);
+                    expect(psC.getSubscribers(topic)).to.be.empty();
                 });
                 it('subscribe to the topic on node b', async () => {
                     const topic = 'Z';
                     psB.subscribe(topic);
-                    expectSet(psB.subscriptions, [topic]);
+                    expect(psB.getTopics()).to.deep.equal([topic]);
                     await Promise.all([
                         new Promise((resolve) => psA.addEventListener('pubsub:subscription-change', resolve, {
                             once: true
@@ -65,20 +101,20 @@ export default (common) => {
                             once: true
                         }))
                     ]);
-                    expect(psA.peers.size).to.equal(1);
-                    expectSet(psA.topics.get(topic), [psB.peerId.toString()]);
-                    expect(psC.peers.size).to.equal(1);
-                    expectSet(psC.topics.get(topic), [psB.peerId.toString()]);
+                    expect(psA.getPeers().length).to.equal(1);
+                    expect(psA.getSubscribers(topic).map(p => p.toString())).to.deep.equal([peerIdB.toString()]);
+                    expect(psC.getPeers().length).to.equal(1);
+                    expect(psC.getSubscribers(topic).map(p => p.toString())).to.deep.equal([peerIdB.toString()]);
                 });
                 it('subscribe to the topic on node c', async () => {
                     const topic = 'Z';
                     const defer = pDefer();
                     psC.subscribe(topic);
-                    expectSet(psC.subscriptions, [topic]);
+                    expect(psC.getTopics()).to.deep.equal([topic]);
                     psB.addEventListener('pubsub:subscription-change', () => {
-                        expect(psA.peers.size).to.equal(1);
-                        expect(psB.peers.size).to.equal(2);
-                        expectSet(psB.topics.get(topic), [psC.peerId.toString()]);
+                        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()]);
                         defer.resolve();
                     }, {
                         once: true
@@ -88,28 +124,29 @@ export default (common) => {
                 it('publish on node a', async () => {
                     const topic = 'Z';
                     const defer = pDefer();
-                    psA.subscribe(topic);
-                    psB.subscribe(topic);
-                    psC.subscribe(topic);
                     // await subscription change
-                    await Promise.all([
-                        new Promise(resolve => psA.addEventListener('pubsub:subscription-change', () => resolve(null), {
+                    const p = Promise.all([
+                        new Promise(resolve => psA.addEventListener('pubsub:subscription-change', () => resolve(), {
                             once: true
                         })),
-                        new Promise(resolve => psB.addEventListener('pubsub:subscription-change', () => resolve(null), {
+                        new Promise(resolve => psB.addEventListener('pubsub:subscription-change', () => resolve(), {
                             once: true
                         })),
-                        new Promise(resolve => psC.addEventListener('pubsub:subscription-change', () => resolve(null), {
+                        new Promise(resolve => psC.addEventListener('pubsub:subscription-change', () => resolve(), {
                             once: true
                         }))
                     ]);
-                    // await a cycle
-                    await delay(1000);
+                    psA.subscribe(topic);
+                    psB.subscribe(topic);
+                    psC.subscribe(topic);
+                    await p;
                     let counter = 0;
                     psA.addEventListener(topic, incMsg);
                     psB.addEventListener(topic, incMsg);
                     psC.addEventListener(topic, incMsg);
-                    void psA.publish(topic, uint8ArrayFromString('hey'));
+                    // await a cycle
+                    await delay(1000);
+                    void psA.dispatchEvent(new CustomEvent(topic, { detail: uint8ArrayFromString('hey') }));
                     function incMsg(evt) {
                         const msg = evt.detail;
                         expect(uint8ArrayToString(msg.data)).to.equal('hey');
@@ -157,7 +194,7 @@ export default (common) => {
                         psC.addEventListener(topic, incMsg);
                         // await a cycle
                         await delay(1000);
-                        void psB.publish(topic, uint8ArrayFromString('hey'));
+                        void psB.dispatchEvent(new CustomEvent(topic, { detail: uint8ArrayFromString('hey') }));
                         function incMsg(evt) {
                             const msg = evt.detail;
                             expect(uint8ArrayToString(msg.data)).to.equal('hey');
@@ -188,47 +225,108 @@ 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;
                 // Create and start pubsub nodes
                 beforeEach(async () => {
-                    psA = await common.setup();
-                    psB = await common.setup();
-                    psC = await common.setup();
-                    psD = await common.setup();
-                    psE = await common.setup();
-                    [psA, psB, psC, psD, psE].map((p) => p.start());
+                    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();
+                    psA = await common.setup({
+                        peerId: peerIdA,
+                        registrar: registrarA,
+                        emitSelf: true
+                    });
+                    psB = await common.setup({
+                        peerId: peerIdB,
+                        registrar: registrarB,
+                        emitSelf: true
+                    });
+                    psC = await common.setup({
+                        peerId: peerIdC,
+                        registrar: registrarC,
+                        emitSelf: true
+                    });
+                    psD = await common.setup({
+                        peerId: peerIdD,
+                        registrar: registrarD,
+                        emitSelf: true
+                    });
+                    psE = await common.setup({
+                        peerId: peerIdE,
+                        registrar: registrarE,
+                        emitSelf: true
+                    });
+                    // Start pubsub nodes
+                    await Promise.all([psA, psB, psC, psD, psE].map(async (p) => await p.start()));
                 });
                 // connect nodes
                 beforeEach(async () => {
-                    // @ts-expect-error protected field
-                    await psA._libp2p.dial(psB.peerId);
-                    // @ts-expect-error protected field
-                    await psB._libp2p.dial(psC.peerId);
-                    // @ts-expect-error protected field
-                    await psC._libp2p.dial(psD.peerId);
-                    // @ts-expect-error protected field
-                    await psD._libp2p.dial(psE.peerId);
+                    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
+                    });
                     // Wait for peers to be ready in pubsub
-                    await pWaitFor(() => psA.peers.size === 1 &&
-                        psB.peers.size === 2 &&
-                        psC.peers.size === 2 &&
-                        psD.peers.size === 2 &&
-                        psE.peers.size === 1);
+                    await pWaitFor(() => psA.getPeers().length === 1 &&
+                        psB.getPeers().length === 2 &&
+                        psC.getPeers().length === 2 &&
+                        psD.getPeers().length === 2 &&
+                        psE.getPeers().length === 1);
                 });
                 afterEach(async () => {
-                    [psA, psB, psC, psD, psE].map((p) => p.stop());
+                    await Promise.all([psA, psB, psC, psD, psE].map(async (p) => await p.stop()));
                     await common.teardown();
                 });
                 it('subscribes', () => {
                     psA.subscribe('Z');
-                    expectSet(psA.subscriptions, ['Z']);
+                    expect(psA.getTopics()).to.deep.equal(['Z']);
                     psB.subscribe('Z');
-                    expectSet(psB.subscriptions, ['Z']);
+                    expect(psB.getTopics()).to.deep.equal(['Z']);
                     psC.subscribe('Z');
-                    expectSet(psC.subscriptions, ['Z']);
+                    expect(psC.getTopics()).to.deep.equal(['Z']);
                     psD.subscribe('Z');
-                    expectSet(psD.subscriptions, ['Z']);
+                    expect(psD.getTopics()).to.deep.equal(['Z']);
                     psE.subscribe('Z');
-                    expectSet(psE.subscriptions, ['Z']);
+                    expect(psE.getTopics()).to.deep.equal(['Z']);
                 });
                 it('publishes from c', async function () {
                     const defer = pDefer();
@@ -252,7 +350,7 @@ export default (common) => {
                     ]);
                     // await a cycle
                     await delay(1000);
-                    void psC.publish('Z', uint8ArrayFromString('hey from c'));
+                    void psC.dispatchEvent(new CustomEvent('Z', { detail: uint8ArrayFromString('hey from c') }));
                     function incMsg(evt) {
                         const msg = evt.detail;
                         expect(uint8ArrayToString(msg.data)).to.equal('hey from c');