@libp2p/interface-compliance-tests 1.1.22 → 1.1.25

package/dist/src/pubsub/connection-handlers.js

@@ -4,38 +4,27 @@ 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 { CustomEvent } from '@libp2p/interfaces';
-import { Components } from '@libp2p/interfaces/components';
+import { connectPeers } from '../mocks/registrar.js';
 import { start, stop } from '../index.js';
+import { createComponents } from './utils.js';
+import { pEvent } from 'p-event';
 export default (common) => {
     describe('pubsub connection handlers', () => {
         let psA;
         let psB;
-        let peerA;
-        let peerB;
-        let registrarA;
-        let registrarB;
+        let componentsA;
+        let componentsB;
         describe('nodes send state on connection', () => {
             // Create pubsub nodes and connect them
             before(async () => {
-                peerA = await createEd25519PeerId();
-                peerB = await createEd25519PeerId();
-                registrarA = mockRegistrar();
-                registrarB = mockRegistrar();
+                componentsA = await createComponents();
+                componentsB = await createComponents();
                 psA = await common.setup({
-                    components: new Components({
-                        peerId: peerA,
-                        registrar: registrarA
-                    }),
+                    components: componentsA,
                     init: {}
                 });
                 psB = await common.setup({
-                    components: new Components({
-                        peerId: peerB,
-                        registrar: registrarB
-                    }),
+                    components: componentsB,
                     init: {}
                 });
                 // Start pubsub
@@ -58,54 +47,34 @@ export default (common) => {
             });
             it('existing subscriptions are sent upon peer connection', async function () {
                 const subscriptionsChanged = Promise.all([
-                    new Promise((resolve) => psA.addEventListener('pubsub:subscription-change', resolve, {
-                        once: true
-                    })),
-                    new Promise((resolve) => psB.addEventListener('pubsub:subscription-change', resolve, {
-                        once: true
-                    }))
+                    pEvent(psA, 'subscription-change'),
+                    pEvent(psB, 'subscription-change')
                 ]);
-                await connectPeers(psA.multicodecs[0], {
-                    peerId: peerA,
-                    registrar: registrarA
-                }, {
-                    peerId: peerB,
-                    registrar: registrarB
-                });
+                await connectPeers(psA.multicodecs[0], componentsA, componentsB);
                 await subscriptionsChanged;
                 expect(psA.getPeers()).to.have.lengthOf(1);
                 expect(psB.getPeers()).to.have.lengthOf(1);
                 expect(psA.getTopics()).to.deep.equal(['Za']);
                 expect(psB.getTopics()).to.deep.equal(['Zb']);
-                expect(psA.getSubscribers('Zb').map(p => p.toString())).to.deep.equal([peerB.toString()]);
-                expect(psB.getSubscribers('Za').map(p => p.toString())).to.deep.equal([peerA.toString()]);
+                expect(psA.getSubscribers('Zb').map(p => p.toString())).to.deep.equal([componentsB.getPeerId().toString()]);
+                expect(psB.getSubscribers('Za').map(p => p.toString())).to.deep.equal([componentsA.getPeerId().toString()]);
             });
         });
         describe('pubsub started before connect', () => {
             let psA;
             let psB;
-            let peerA;
-            let peerB;
-            let registrarA;
-            let registrarB;
+            let componentsA;
+            let componentsB;
             // Create pubsub nodes and start them
             beforeEach(async () => {
-                peerA = await createEd25519PeerId();
-                peerB = await createEd25519PeerId();
-                registrarA = mockRegistrar();
-                registrarB = mockRegistrar();
+                componentsA = await createComponents();
+                componentsB = await createComponents();
                 psA = await common.setup({
-                    components: new Components({
-                        peerId: peerA,
-                        registrar: registrarA
-                    }),
+                    components: componentsA,
                     init: {}
                 });
                 psB = await common.setup({
-                    components: new Components({
-                        peerId: peerB,
-                        registrar: registrarB
-                    }),
+                    components: componentsB,
                     init: {}
                 });
                 await start(psA, psB);
@@ -115,13 +84,7 @@ export default (common) => {
                 await common.teardown();
             });
             it('should get notified of connected peers on dial', async () => {
-                await connectPeers(psA.multicodecs[0], {
-                    peerId: peerA,
-                    registrar: registrarA
-                }, {
-                    peerId: peerB,
-                    registrar: registrarB
-                });
+                await connectPeers(psA.multicodecs[0], componentsA, componentsB);
                 return await Promise.all([
                     pWaitFor(() => psA.getPeers().length === 1),
                     pWaitFor(() => psB.getPeers().length === 1)
@@ -131,19 +94,16 @@ export default (common) => {
                 const defer = pDefer();
                 const topic = 'test-topic';
                 const data = uint8ArrayFromString('hey!');
-                await connectPeers(psA.multicodecs[0], {
-                    peerId: peerA,
-                    registrar: registrarA
-                }, {
-                    peerId: peerB,
-                    registrar: registrarB
-                });
+                await connectPeers(psA.multicodecs[0], componentsA, componentsB);
                 let subscribedTopics = psA.getTopics();
                 expect(subscribedTopics).to.not.include(topic);
-                psA.addEventListener(topic, (evt) => {
-                    const msg = evt.detail;
-                    expect(msg.data).to.equalBytes(data);
-                    defer.resolve();
+                psA.subscribe(topic);
+                psA.addEventListener('message', (evt) => {
+                    if (evt.detail.topic === topic) {
+                        const msg = evt.detail;
+                        expect(msg.data).to.equalBytes(data);
+                        defer.resolve();
+                    }
                 });
                 psA.subscribe(topic);
                 subscribedTopics = psA.getTopics();
@@ -151,37 +111,27 @@ export default (common) => {
                 // wait for psB to know about psA subscription
                 await pWaitFor(() => {
                     const subscribedPeers = psB.getSubscribers(topic);
-                    return subscribedPeers.map(p => p.toString()).includes(peerA.toString());
+                    return subscribedPeers.map(p => p.toString()).includes(componentsA.getPeerId().toString()); // eslint-disable-line max-nested-callbacks
                 });
-                void psB.dispatchEvent(new CustomEvent(topic, { detail: data }));
+                await psB.publish(topic, data);
                 await defer.promise;
             });
         });
         describe('pubsub started after connect', () => {
             let psA;
             let psB;
-            let peerA;
-            let peerB;
-            let registrarA;
-            let registrarB;
+            let componentsA;
+            let componentsB;
             // Create pubsub nodes
             beforeEach(async () => {
-                peerA = await createEd25519PeerId();
-                peerB = await createEd25519PeerId();
-                registrarA = mockRegistrar();
-                registrarB = mockRegistrar();
+                componentsA = await createComponents();
+                componentsB = await createComponents();
                 psA = await common.setup({
-                    components: new Components({
-                        peerId: peerA,
-                        registrar: registrarA
-                    }),
+                    components: componentsA,
                     init: {}
                 });
                 psB = await common.setup({
-                    components: new Components({
-                        peerId: peerB,
-                        registrar: registrarB
-                    }),
+                    components: componentsB,
                     init: {}
                 });
             });
@@ -192,13 +142,7 @@ export default (common) => {
             });
             it('should get notified of connected peers after starting', async () => {
                 await start(psA, psB);
-                await connectPeers(psA.multicodecs[0], {
-                    peerId: peerA,
-                    registrar: registrarA
-                }, {
-                    peerId: peerB,
-                    registrar: registrarB
-                });
+                await connectPeers(psA.multicodecs[0], componentsA, componentsB);
                 return await Promise.all([
                     pWaitFor(() => psA.getPeers().length === 1),
                     pWaitFor(() => psB.getPeers().length === 1)
@@ -209,23 +153,20 @@ export default (common) => {
                 const topic = 'test-topic';
                 const data = uint8ArrayFromString('hey!');
                 await start(psA, psB);
-                await connectPeers(psA.multicodecs[0], {
-                    peerId: peerA,
-                    registrar: registrarA
-                }, {
-                    peerId: peerB,
-                    registrar: registrarB
-                });
+                await connectPeers(psA.multicodecs[0], componentsA, componentsB);
                 await Promise.all([
                     pWaitFor(() => psA.getPeers().length === 1),
                     pWaitFor(() => psB.getPeers().length === 1)
                 ]);
                 let subscribedTopics = psA.getTopics();
                 expect(subscribedTopics).to.not.include(topic);
-                psA.addEventListener(topic, (evt) => {
-                    const msg = evt.detail;
-                    expect(msg.data).to.equalBytes(data);
-                    defer.resolve();
+                psA.subscribe(topic);
+                psA.addEventListener('message', (evt) => {
+                    if (evt.detail.topic === topic) {
+                        const msg = evt.detail;
+                        expect(msg.data).to.equalBytes(data);
+                        defer.resolve();
+                    }
                 });
                 psA.subscribe(topic);
                 subscribedTopics = psA.getTopics();
@@ -233,37 +174,27 @@ export default (common) => {
                 // wait for psB to know about psA subscription
                 await pWaitFor(() => {
                     const subscribedPeers = psB.getSubscribers(topic);
-                    return subscribedPeers.map(p => p.toString()).includes(peerA.toString());
+                    return subscribedPeers.map(p => p.toString()).includes(componentsA.getPeerId().toString()); // eslint-disable-line max-nested-callbacks
                 });
-                void psB.dispatchEvent(new CustomEvent(topic, { detail: data }));
+                await psB.publish(topic, data);
                 await defer.promise;
             });
         });
         describe('pubsub with intermittent connections', () => {
             let psA;
             let psB;
-            let peerA;
-            let peerB;
-            let registrarA;
-            let registrarB;
+            let componentsA;
+            let componentsB;
             // Create pubsub nodes and start them
             beforeEach(async () => {
-                peerA = await createEd25519PeerId();
-                peerB = await createEd25519PeerId();
-                registrarA = mockRegistrar();
-                registrarB = mockRegistrar();
+                componentsA = await createComponents();
+                componentsB = await createComponents();
                 psA = await common.setup({
-                    components: new Components({
-                        peerId: peerA,
-                        registrar: registrarA
-                    }),
+                    components: componentsA,
                     init: {}
                 });
                 psB = await common.setup({
-                    components: new Components({
-                        peerId: peerB,
-                        registrar: registrarB
-                    }),
+                    components: componentsB,
                     init: {}
                 });
                 await start(psA, psB);
@@ -279,20 +210,17 @@ export default (common) => {
                 let counter = 0;
                 const defer1 = pDefer();
                 const defer2 = pDefer();
-                await connectPeers(psA.multicodecs[0], {
-                    peerId: peerA,
-                    registrar: registrarA
-                }, {
-                    peerId: peerB,
-                    registrar: registrarB
-                });
+                await connectPeers(psA.multicodecs[0], componentsA, componentsB);
                 let subscribedTopics = psA.getTopics();
                 expect(subscribedTopics).to.not.include(topic);
-                psA.addEventListener(topic, (evt) => {
-                    const msg = evt.detail;
-                    expect(msg.data).to.equalBytes(data);
-                    counter++;
-                    counter === 1 ? defer1.resolve() : defer2.resolve();
+                psA.subscribe(topic);
+                psA.addEventListener('message', (evt) => {
+                    if (evt.detail.topic === topic) {
+                        const msg = evt.detail;
+                        expect(msg.data).to.equalBytes(data);
+                        counter++;
+                        counter === 1 ? defer1.resolve() : defer2.resolve();
+                    }
                 });
                 psA.subscribe(topic);
                 subscribedTopics = psA.getTopics();
@@ -300,9 +228,9 @@ export default (common) => {
                 // wait for psB to know about psA subscription
                 await pWaitFor(() => {
                     const subscribedPeers = psB.getSubscribers(topic);
-                    return subscribedPeers.map(p => p.toString()).includes(peerA.toString());
+                    return subscribedPeers.map(p => p.toString()).includes(componentsA.getPeerId().toString()); // eslint-disable-line max-nested-callbacks
                 });
-                void psB.dispatchEvent(new CustomEvent(topic, { detail: data }));
+                await psB.publish(topic, data);
                 await defer1.promise;
                 await psB.stop();
                 // @ts-expect-error protected fields
@@ -317,19 +245,13 @@ export default (common) => {
                 // @ts-expect-error protected fields
                 await psB._libp2p.start();
                 await psB.start();
-                await connectPeers(psA.multicodecs[0], {
-                    peerId: peerA,
-                    registrar: registrarA
-                }, {
-                    peerId: peerB,
-                    registrar: registrarB
-                });
+                await connectPeers(psA.multicodecs[0], componentsA, componentsB);
                 // wait for remoteLibp2p to know about libp2p subscription
                 await pWaitFor(() => {
                     const subscribedPeers = psB.getSubscribers(topic);
-                    return subscribedPeers.toString().includes(peerA.toString());
+                    return subscribedPeers.toString().includes(componentsA.getPeerId().toString());
                 });
-                void psB.dispatchEvent(new CustomEvent(topic, { detail: data }));
+                await psB.publish(topic, data);
                 await defer2.promise;
             });
             it.skip('should handle quick reconnects with a delayed disconnect', async () => {
@@ -338,7 +260,11 @@ export default (common) => {
                 let aReceivedSecondMessageFromB = false;
                 let bReceivedFirstMessageFromA = false;
                 let bReceivedSecondMessageFromA = false;
+                const topic = 'reconnect-channel';
                 const handlerSpyA = (evt) => {
+                    if (evt.detail.topic !== topic) {
+                        return;
+                    }
                     const message = evt.detail;
                     const data = uint8ArrayToString(message.data);
                     if (data === 'message-from-b-1') {
@@ -349,6 +275,9 @@ export default (common) => {
                     }
                 };
                 const handlerSpyB = (evt) => {
+                    if (evt.detail.topic !== topic) {
+                        return;
+                    }
                     const message = evt.detail;
                     const data = uint8ArrayToString(message.data);
                     if (data === 'message-from-a-1') {
@@ -358,30 +287,23 @@ export default (common) => {
                         bReceivedSecondMessageFromA = true;
                     }
                 };
-                const topic = 'reconnect-channel';
-                psA.addEventListener(topic, handlerSpyA);
-                psB.addEventListener(topic, handlerSpyB);
+                psA.addEventListener('message', handlerSpyA);
+                psB.addEventListener('message', handlerSpyB);
                 psA.subscribe(topic);
                 psB.subscribe(topic);
                 // Create two connections to the remote peer
                 // @ts-expect-error protected fields
                 const originalConnection = await psA._libp2p.dialer.connectToPeer(psB.peerId);
                 // second connection
-                await connectPeers(psA.multicodecs[0], {
-                    peerId: peerA,
-                    registrar: registrarA
-                }, {
-                    peerId: peerB,
-                    registrar: registrarB
-                });
+                await connectPeers(psA.multicodecs[0], componentsA, componentsB);
                 // Wait for subscriptions to occur
                 await pWaitFor(() => {
-                    return psA.getSubscribers(topic).includes(peerB) &&
-                        psB.getSubscribers(topic).map(p => p.toString()).includes(peerA.toString());
+                    return psA.getSubscribers(topic).map(p => p.toString()).includes(componentsB.getPeerId().toString()) &&
+                        psB.getSubscribers(topic).map(p => p.toString()).includes(componentsA.getPeerId().toString());
                 });
                 // Verify messages go both ways
-                void psA.dispatchEvent(new CustomEvent(topic, { detail: uint8ArrayFromString('message-from-a-1') }));
-                void psB.dispatchEvent(new CustomEvent(topic, { detail: uint8ArrayFromString('message-from-b-1') }));
+                await psA.publish(topic, uint8ArrayFromString('message-from-a-1'));
+                await psB.publish(topic, uint8ArrayFromString('message-from-b-1'));
                 await pWaitFor(() => {
                     return aReceivedFirstMessageFromB && bReceivedFirstMessageFromA;
                 });
@@ -391,8 +313,8 @@ export default (common) => {
                 await originalConnection.close();
                 await pWaitFor(() => psAConnUpdateSpy.callCount === 1);
                 // Verify messages go both ways after the disconnect
-                void psA.dispatchEvent(new CustomEvent(topic, { detail: uint8ArrayFromString('message-from-a-2') }));
-                void psB.dispatchEvent(new CustomEvent(topic, { detail: uint8ArrayFromString('message-from-b-2') }));
+                await psA.publish(topic, uint8ArrayFromString('message-from-a-2'));
+                await psB.publish(topic, uint8ArrayFromString('message-from-b-2'));
                 await pWaitFor(() => {
                     return aReceivedSecondMessageFromB && bReceivedSecondMessageFromA;
                 });

package/dist/src/pubsub/connection-handlers.js.map

@@ -1 +1 @@
-{"version":3,"file":"connection-handlers.js","sourceRoot":"","sources":["../../../src/pubsub/connection-handlers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"connection-handlers.js","sourceRoot":"","sources":["../../../src/pubsub/connection-handlers.ts"],"names":[],"mappings":"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"}

package/dist/src/pubsub/emit-self.d.ts

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

package/dist/src/pubsub/emit-self.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"emit-self.d.ts","sourceRoot":"","sources":["../../../src/pubsub/emit-self.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAC5C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;iCAQhC,UAAU,kBAAkB,EAAE,UAAU,CAAC;AAAjE,wBA2EC"}
+{"version":3,"file":"emit-self.d.ts","sourceRoot":"","sources":["../../../src/pubsub/emit-self.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAG5C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;iCAO/B,UAAU,MAAM,EAAE,UAAU,CAAC;AAArD,wBAmFC"}

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

@@ -3,22 +3,21 @@ import sinon from 'sinon';
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string';
 import { createEd25519PeerId } from '@libp2p/peer-id-factory';
 import { mockRegistrar } from '../mocks/registrar.js';
-import { CustomEvent } from '@libp2p/interfaces';
 import { Components } from '@libp2p/interfaces/components';
 import { start, stop } from '../index.js';
+import { createComponents } from './utils.js';
 const topic = 'foo';
 const data = uint8ArrayFromString('bar');
 const shouldNotHappen = () => expect.fail();
 export default (common) => {
     describe('emit self', () => {
         let pubsub;
+        let components;
         describe('enabled', () => {
             before(async () => {
+                components = await createComponents();
                 pubsub = await common.setup({
-                    components: new Components({
-                        peerId: await createEd25519PeerId(),
-                        registrar: mockRegistrar()
-                    }),
+                    components,
                     init: {
                         emitSelf: true
                     }
@@ -34,11 +33,18 @@ export default (common) => {
                 await common.teardown();
             });
             it('should emit to self on publish', async () => {
-                const promise = new Promise((resolve) => pubsub.addEventListener(topic, resolve, {
-                    once: true
-                }));
-                void pubsub.dispatchEvent(new CustomEvent(topic, { detail: data }));
-                return await promise;
+                const promise = new Promise((resolve) => {
+                    pubsub.addEventListener('message', (evt) => {
+                        if (evt.detail.topic === topic) {
+                            resolve();
+                        }
+                    }, {
+                        once: true
+                    });
+                });
+                const result = await pubsub.publish(topic, data);
+                await promise;
+                expect(result).to.have.property('recipients').with.lengthOf(1);
             });
         });
         describe('disabled', () => {
@@ -63,10 +69,10 @@ export default (common) => {
                 await common.teardown();
             });
             it('should not emit to self on publish', async () => {
-                pubsub.addEventListener(topic, () => shouldNotHappen, {
+                pubsub.addEventListener('message', shouldNotHappen, {
                     once: true
                 });
-                void pubsub.dispatchEvent(new CustomEvent(topic, { detail: data }));
+                await pubsub.publish(topic, data);
                 // Wait 1 second to guarantee that self is not noticed
                 return await new Promise((resolve) => setTimeout(resolve, 1000));
             });

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":"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"}
+{"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,11 +1,10 @@
 import type { TestSetup } from '../index.js';
-import type { PubSubInit } from '@libp2p/interfaces/pubsub';
-import type { PubSubBaseProtocol } from '@libp2p/pubsub';
+import type { PubSub, PubSubInit } from '@libp2p/interfaces/pubsub';
 import type { Components } from '@libp2p/interfaces/components';
 export interface PubSubArgs {
     components: Components;
     init: PubSubInit;
 }
-declare const _default: (common: TestSetup<PubSubBaseProtocol, PubSubArgs>) => void;
+declare const _default: (common: TestSetup<PubSub, PubSubArgs>) => 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,UAAU,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAA;AAE/D,MAAM,WAAW,UAAU;IACzB,UAAU,EAAE,UAAU,CAAA;IACtB,IAAI,EAAE,UAAU,CAAA;CACjB;iCAEuB,UAAU,kBAAkB,EAAE,UAAU,CAAC;AAAjE,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,MAAM,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AACnE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAA;AAE/D,MAAM,WAAW,UAAU;IACzB,UAAU,EAAE,UAAU,CAAA;IACtB,IAAI,EAAE,UAAU,CAAA;CACjB;iCAEuB,UAAU,MAAM,EAAE,UAAU,CAAC;AAArD,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;AAWnD,eAAe,CAAC,MAAiD,EAAE,EAAE;IACnE,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;AAUnD,eAAe,CAAC,MAAqC,EAAE,EAAE;IACvD,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,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=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":"AAWA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAE5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAC5C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;iCAQhC,UAAU,kBAAkB,EAAE,UAAU,CAAC;AAAjE,wBAiHC"}
+{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../../src/pubsub/messages.ts"],"names":[],"mappings":"AAGA,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;iCASpB,UAAU,MAAM,EAAE,UAAU,CAAC;AAArD,wBAwCC"}