@libp2p/interface-compliance-tests 1.0.8 → 1.1.3

package/dist/src/utils/mock-muxer.js

@@ -0,0 +1,37 @@
+import { pair } from 'it-pair';
+import { pushable } from 'it-pushable';
+import drain from 'it-drain';
+export function mockMuxer() {
+    let streamId = 0;
+    let streams = [];
+    const p = pushable();
+    const muxer = {
+        source: p,
+        sink: async (source) => {
+            await drain(source);
+        },
+        get streams() {
+            return streams;
+        },
+        newStream: (name) => {
+            const echo = pair();
+            const id = `${streamId++}`;
+            const stream = {
+                id,
+                sink: echo.sink,
+                source: echo.source,
+                close: () => {
+                    streams = streams.filter(s => s !== stream);
+                },
+                abort: () => { },
+                reset: () => { },
+                timeline: {
+                    open: 0
+                }
+            };
+            return stream;
+        }
+    };
+    return muxer;
+}
+//# sourceMappingURL=mock-muxer.js.map

package/dist/src/utils/mock-muxer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mock-muxer.js","sourceRoot":"","sources":["../../../src/utils/mock-muxer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAC9B,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,KAAK,MAAM,UAAU,CAAA;AAI5B,MAAM,UAAU,SAAS;IACvB,IAAI,QAAQ,GAAG,CAAC,CAAA;IAChB,IAAI,OAAO,GAAa,EAAE,CAAA;IAC1B,MAAM,CAAC,GAAG,QAAQ,EAAc,CAAA;IAEhC,MAAM,KAAK,GAAU;QACnB,MAAM,EAAE,CAAC;QACT,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;YACrB,MAAM,KAAK,CAAC,MAAM,CAAC,CAAA;QACrB,CAAC;QACD,IAAI,OAAO;YACT,OAAO,OAAO,CAAA;QAChB,CAAC;QACD,SAAS,EAAE,CAAC,IAAa,EAAE,EAAE;YAC3B,MAAM,IAAI,GAAG,IAAI,EAAc,CAAA;YAE/B,MAAM,EAAE,GAAG,GAAG,QAAQ,EAAE,EAAE,CAAA;YAC1B,MAAM,MAAM,GAAW;gBACrB,EAAE;gBACF,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,KAAK,EAAE,GAAG,EAAE;oBACV,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,CAAA;gBAC7C,CAAC;gBACD,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;gBACf,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;gBACf,QAAQ,EAAE;oBACR,IAAI,EAAE,CAAC;iBACR;aACF,CAAA;YAED,OAAO,MAAM,CAAA;QACf,CAAC;KACF,CAAA;IAED,OAAO,KAAK,CAAA;AACd,CAAC"}

package/dist/src/utils/mock-registrar.d.ts

@@ -0,0 +1,12 @@
+import type { Registrar, StreamHandler } from '@libp2p/interfaces/registrar';
+import type { MulticodecTopology } from '../../../libp2p-topology/src/multicodec-topology';
+export declare class MockRegistrar implements Registrar {
+    readonly topologies: Map<string, MulticodecTopology>;
+    readonly streamHandlers: Map<string, StreamHandler>;
+    handle(multicodecs: string | string[], handler: StreamHandler): Promise<void>;
+    unhandle(multicodec: string): Promise<void>;
+    register(topology: MulticodecTopology): string;
+    unregister(id: string): void;
+}
+export declare function mockRegistrar(): MockRegistrar;
+//# sourceMappingURL=mock-registrar.d.ts.map

package/dist/src/utils/mock-registrar.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mock-registrar.d.ts","sourceRoot":"","sources":["../../../src/utils/mock-registrar.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAC5E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kDAAkD,CAAA;AAE1F,qBAAa,aAAc,YAAW,SAAS;IAC7C,SAAgB,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAY;IACvE,SAAgB,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAY;IAEhE,MAAM,CAAE,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,EAAE,aAAa;IAQ9D,QAAQ,CAAE,UAAU,EAAE,MAAM;IAIlC,QAAQ,CAAE,QAAQ,EAAE,kBAAkB;IAQtC,UAAU,CAAE,EAAE,EAAE,MAAM;CAGvB;AAED,wBAAgB,aAAa,kBAE5B"}

package/dist/src/utils/mock-registrar.js

@@ -0,0 +1,27 @@
+export class MockRegistrar {
+    constructor() {
+        this.topologies = new Map();
+        this.streamHandlers = new Map();
+    }
+    async handle(multicodecs, handler) {
+        if (!Array.isArray(multicodecs)) {
+            multicodecs = [multicodecs];
+        }
+        this.streamHandlers.set(multicodecs[0], handler);
+    }
+    async unhandle(multicodec) {
+        this.streamHandlers.delete(multicodec);
+    }
+    register(topology) {
+        const { multicodecs } = topology;
+        this.topologies.set(multicodecs[0], topology);
+        return multicodecs[0];
+    }
+    unregister(id) {
+        this.topologies.delete(id);
+    }
+}
+export function mockRegistrar() {
+    return new MockRegistrar();
+}
+//# sourceMappingURL=mock-registrar.js.map

package/dist/src/utils/mock-registrar.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mock-registrar.js","sourceRoot":"","sources":["../../../src/utils/mock-registrar.ts"],"names":[],"mappings":"AAGA,MAAM,OAAO,aAAa;IAA1B;QACkB,eAAU,GAAoC,IAAI,GAAG,EAAE,CAAA;QACvD,mBAAc,GAA+B,IAAI,GAAG,EAAE,CAAA;IAyBxE,CAAC;IAvBC,KAAK,CAAC,MAAM,CAAE,WAA8B,EAAE,OAAsB;QAClE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;YAC/B,WAAW,GAAG,CAAC,WAAW,CAAC,CAAA;SAC5B;QAED,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAA;IAClD,CAAC;IAED,KAAK,CAAC,QAAQ,CAAE,UAAkB;QAChC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;IACxC,CAAC;IAED,QAAQ,CAAE,QAA4B;QACpC,MAAM,EAAE,WAAW,EAAE,GAAG,QAAQ,CAAA;QAEhC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAA;QAE7C,OAAO,WAAW,CAAC,CAAC,CAAC,CAAA;IACvB,CAAC;IAED,UAAU,CAAE,EAAU;QACpB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IAC5B,CAAC;CACF;AAED,MAAM,UAAU,aAAa;IAC3B,OAAO,IAAI,aAAa,EAAE,CAAA;AAC5B,CAAC"}

package/dist/src/utils/mock-upgrader.d.ts

@@ -0,0 +1,7 @@
+import type { Upgrader } from '@libp2p/interfaces/transport';
+import type { Muxer } from '@libp2p/interfaces/stream-muxer';
+export interface MockUpgraderOptions {
+    muxer?: Muxer;
+}
+export declare function mockUpgrader(options?: MockUpgraderOptions): Upgrader;
+//# sourceMappingURL=mock-upgrader.d.ts.map

package/dist/src/utils/mock-upgrader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mock-upgrader.d.ts","sourceRoot":"","sources":["../../../src/utils/mock-upgrader.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAuB,MAAM,8BAA8B,CAAA;AACjF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iCAAiC,CAAA;AAE5D,MAAM,WAAW,mBAAmB;IAClC,KAAK,CAAC,EAAE,KAAK,CAAA;CACd;AAED,wBAAgB,YAAY,CAAE,OAAO,GAAE,mBAAwB,YAsB9D"}

package/dist/src/utils/mock-upgrader.js

@@ -0,0 +1,24 @@
+import { expect } from 'aegir/utils/chai.js';
+import { mockMuxer } from './mock-muxer.js';
+import { mockConnection } from './mock-connection.js';
+export function mockUpgrader(options = {}) {
+    const ensureProps = (multiaddrConnection) => {
+        ['sink', 'source', 'remoteAddr', 'timeline', 'close'].forEach(prop => {
+            expect(multiaddrConnection).to.have.property(prop);
+        });
+        return multiaddrConnection;
+    };
+    const muxer = options.muxer ?? mockMuxer();
+    const upgrader = {
+        async upgradeOutbound(multiaddrConnection) {
+            ensureProps(multiaddrConnection);
+            return await mockConnection(multiaddrConnection, 'outbound', muxer);
+        },
+        async upgradeInbound(multiaddrConnection) {
+            ensureProps(multiaddrConnection);
+            return await mockConnection(multiaddrConnection, 'inbound', muxer);
+        }
+    };
+    return upgrader;
+}
+//# sourceMappingURL=mock-upgrader.js.map

package/dist/src/utils/mock-upgrader.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mock-upgrader.js","sourceRoot":"","sources":["../../../src/utils/mock-upgrader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAQrD,MAAM,UAAU,YAAY,CAAE,UAA+B,EAAE;IAC7D,MAAM,WAAW,GAAG,CAAC,mBAAwC,EAAE,EAAE;QAC/D,CAAC,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACnE,MAAM,CAAC,mBAAmB,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QACpD,CAAC,CAAC,CAAA;QACF,OAAO,mBAAmB,CAAA;IAC5B,CAAC,CAAA;IAED,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,SAAS,EAAE,CAAA;IAE1C,MAAM,QAAQ,GAAa;QACzB,KAAK,CAAC,eAAe,CAAE,mBAAmB;YACxC,WAAW,CAAC,mBAAmB,CAAC,CAAA;YAChC,OAAO,MAAM,cAAc,CAAC,mBAAmB,EAAE,UAAU,EAAE,KAAK,CAAC,CAAA;QACrE,CAAC;QACD,KAAK,CAAC,cAAc,CAAE,mBAAmB;YACvC,WAAW,CAAC,mBAAmB,CAAC,CAAA;YAChC,OAAO,MAAM,cAAc,CAAC,mBAAmB,EAAE,SAAS,EAAE,KAAK,CAAC,CAAA;QACpE,CAAC;KACF,CAAA;IAED,OAAO,QAAQ,CAAA;AACjB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@libp2p/interface-compliance-tests",
-  "version": "1.0.8",
+  "version": "1.1.3",
   "description": "Compliance tests for JS libp2p interfaces",
   "license": "Apache-2.0 OR MIT",
   "homepage": "https://github.com/libp2p/js-libp2p-interfaces/tree/master/packages/libp2p-interface-compliance-tests#readme",
@@ -73,8 +73,12 @@
       "types": "./dist/src/stream-muxer/index.d.ts"
     },
     "./topology": {
-      "import": "./dist/src/topology/index.js",
-      "types": "./dist/src/topology/index.d.ts"
+      "import": "./dist/src/topology/topology.js",
+      "types": "./dist/src/topology/topology.d.ts"
+    },
+    "./topology/multicodec-toplogy": {
+      "import": "./dist/src/topology/multicodec-toplogy.js",
+      "types": "./dist/src/topology/multicodec-toplogy.d.ts"
     },
     "./transport": {
       "import": "./dist/src/transport/index.js",
@@ -84,6 +88,38 @@
       "import": "./dist/src/transport/utils/index.js",
       "types": "./dist/src/transport/utils/index.d.ts"
     },
+    "./utils/mock-connection": {
+      "import": "./dist/src/utils/mock-connection.js",
+      "types": "./dist/src/utils/mock-connection.d.ts"
+    },
+    "./utils/mock-connection-gater": {
+      "import": "./dist/src/utils/mock-connection-gater.js",
+      "types": "./dist/src/utils/mock-connection-gater.d.ts"
+    },
+    "./utils/mock-connection-manager": {
+      "import": "./dist/src/utils/mock-connection-manager.js",
+      "types": "./dist/src/utils/mock-connection-manager.d.ts"
+    },
+    "./utils/mock-multiaddr-connection": {
+      "import": "./dist/src/utils/mock-multiaddr-connection.js",
+      "types": "./dist/src/utils/mock-multiaddr-connection.d.ts"
+    },
+    "./utils/mock-muxer": {
+      "import": "./dist/src/utils/mock-muxer.js",
+      "types": "./dist/src/utils/mock-muxer.d.ts"
+    },
+    "./utils/mock-peer-store": {
+      "import": "./dist/src/utils/mock-peer-store.js",
+      "types": "./dist/src/utils/mock-peer-store.d.ts"
+    },
+    "./utils/mock-registrar": {
+      "import": "./dist/src/utils/mock-registrar.js",
+      "types": "./dist/src/utils/mock-registrar.d.ts"
+    },
+    "./utils/mock-upgrader": {
+      "import": "./dist/src/utils/mock-upgrader.js",
+      "types": "./dist/src/utils/mock-upgrader.d.ts"
+    },
     "./utils/peers": {
       "import": "./dist/src/utils/peers.js",
       "types": "./dist/src/utils/peers.d.ts"
@@ -178,10 +214,10 @@
   },
   "scripts": {
     "lint": "aegir lint",
-    "dep-check": "aegir dep-check dist/src/**/*.js",
+    "dep-check": "aegir dep-check dist/src/**/*.js dist/test/**/*.js",
     "build": "tsc",
     "pretest": "npm run build",
-    "test": "aegir test -f ./dist/test/**/*.js",
+    "test": "aegir test -f ./dist/test/*.js -f ./dist/test/**/*.js",
     "test:chrome": "npm run test -- -t browser",
     "test:chrome-webworker": "npm run test -- -t webworker",
     "test:firefox": "npm run test -- -t browser -- --browser firefox",
@@ -190,13 +226,11 @@
     "test:electron-main": "npm run test -- -t electron-main"
   },
   "dependencies": {
-    "@libp2p/connection": "^1.0.0",
     "@libp2p/crypto": "^0.22.2",
     "@libp2p/interfaces": "^1.0.0",
     "@libp2p/peer-id": "^1.0.0",
     "@libp2p/peer-id-factory": "^1.0.0",
-    "@libp2p/pubsub": "^1.0.0",
-    "@libp2p/topology": "^1.0.0",
+    "@libp2p/pubsub": "^1.1.0",
     "@multiformats/multiaddr": "^10.1.1",
     "abortable-iterator": "^4.0.0",
     "aegir": "^36.1.3",

package/src/peer-discovery/index.ts

@@ -16,9 +16,6 @@ export default (common: TestSetup<PeerDiscovery & Startable>) => {
 
     afterEach('ensure discovery was stopped', async () => {
       await discovery.stop()
-
-      discovery.removeAllListeners()
-
       await common.teardown()
     })
 
@@ -44,7 +41,8 @@ export default (common: TestSetup<PeerDiscovery & Startable>) => {
       const defer = pDefer()
       await discovery.start()
 
-      discovery.on('peer', ({ id, multiaddrs }) => {
+      discovery.addEventListener('peer', (evt) => {
+        const { id, multiaddrs } = evt.detail
         expect(id).to.exist()
         expect(id).to.have.property('type').that.is.oneOf(['RSA', 'Ed25519', 'secp256k1'])
         expect(multiaddrs).to.exist()
@@ -58,7 +56,7 @@ export default (common: TestSetup<PeerDiscovery & Startable>) => {
     })
 
     it('should not receive a peer event before start', async () => {
-      discovery.on('peer', () => {
+      discovery.addEventListener('peer', () => {
         throw new Error('should not receive a peer event before start')
       })
 
@@ -70,14 +68,14 @@ export default (common: TestSetup<PeerDiscovery & Startable>) => {
 
       await discovery.start()
 
-      discovery.on('peer', () => {
+      discovery.addEventListener('peer', () => {
         deferStart.resolve()
       })
 
       await deferStart.promise
       await discovery.stop()
 
-      discovery.on('peer', () => {
+      discovery.addEventListener('peer', () => {
         throw new Error('should not receive a peer event after stop')
       })
 

package/src/pubsub/api.ts

@@ -4,15 +4,15 @@ import pDefer from 'p-defer'
 import pWaitFor from 'p-wait-for'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import type { TestSetup } from '../index.js'
-import type { PubSub, Message } from '@libp2p/interfaces/pubsub'
-import type { Startable } from '@libp2p/interfaces'
+import type { PubSub } from '@libp2p/interfaces/pubsub'
+import type { EventMap } from './index.js'
 
 const topic = 'foo'
 const data = uint8ArrayFromString('bar')
 
-export default (common: TestSetup<PubSub & Startable>) => {
+export default (common: TestSetup<PubSub<EventMap>>) => {
   describe('pubsub api', () => {
-    let pubsub: PubSub & Startable
+    let pubsub: PubSub<EventMap>
 
     // Create pubsub router
     beforeEach(async () => {
@@ -51,7 +51,7 @@ export default (common: TestSetup<PubSub & Startable>) => {
 
       await pubsub.start()
       pubsub.subscribe(topic)
-      pubsub.on('topic', handler)
+      pubsub.addEventListener('topic', handler)
 
       await pWaitFor(() => {
         const topics = pubsub.getTopics()
@@ -71,15 +71,14 @@ export default (common: TestSetup<PubSub & Startable>) => {
     it('can subscribe and publish correctly', async () => {
       const defer = pDefer()
 
-      const handler = (msg: Message) => {
-        expect(msg).to.not.eql(undefined)
-        defer.resolve()
-      }
-
       await pubsub.start()
 
       pubsub.subscribe(topic)
-      pubsub.on(topic, handler)
+      pubsub.addEventListener(topic, (evt) => {
+        const msg = evt.detail
+        expect(msg).to.not.eql(undefined)
+        defer.resolve()
+      })
       await pubsub.publish(topic, data)
       await defer.promise
 

package/src/pubsub/connection-handlers.ts

@@ -7,12 +7,12 @@ import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { expectSet } from './utils.js'
 import type { TestSetup } from '../index.js'
 import type { PubSub, Message } from '@libp2p/interfaces/pubsub'
-import type { Startable } from '@libp2p/interfaces'
+import type { EventMap } from './index.js'
 
-export default (common: TestSetup<PubSub & Startable>) => {
+export default (common: TestSetup<PubSub<EventMap>>) => {
   describe('pubsub connection handlers', () => {
-    let psA: PubSub & Startable
-    let psB: PubSub & Startable
+    let psA: PubSub<EventMap>
+    let psB: PubSub<EventMap>
 
     describe('nodes send state on connection', () => {
       // Create pubsub nodes and connect them
@@ -48,8 +48,12 @@ export default (common: TestSetup<PubSub & Startable>) => {
         await Promise.all([
           // @ts-expect-error protected fields
           psA._libp2p.dial(psB.peerId),
-          new Promise((resolve) => psA.once('pubsub:subscription-change', resolve)),
-          new Promise((resolve) => psB.once('pubsub:subscription-change', resolve))
+          new Promise((resolve) => psA.addEventListener('pubsub:subscription-change', resolve, {
+            once: true
+          })),
+          new Promise((resolve) => psB.addEventListener('pubsub:subscription-change', resolve, {
+            once: true
+          }))
         ])
 
         expect(psA.peers.size).to.equal(1)
@@ -103,7 +107,8 @@ export default (common: TestSetup<PubSub & Startable>) => {
         let subscribedTopics = psA.getTopics()
         expect(subscribedTopics).to.not.include(topic)
 
-        psA.on(topic, (msg) => {
+        psA.addEventListener(topic, (evt) => {
+          const msg = evt.detail
           expect(msg.data).to.equalBytes(data)
           defer.resolve()
         })
@@ -174,7 +179,8 @@ export default (common: TestSetup<PubSub & Startable>) => {
         let subscribedTopics = psA.getTopics()
         expect(subscribedTopics).to.not.include(topic)
 
-        psA.on(topic, (msg) => {
+        psA.addEventListener(topic, (evt) => {
+          const msg = evt.detail
           expect(msg.data).to.equalBytes(data)
           defer.resolve()
         })
@@ -228,7 +234,8 @@ export default (common: TestSetup<PubSub & Startable>) => {
         let subscribedTopics = psA.getTopics()
         expect(subscribedTopics).to.not.include(topic)
 
-        psA.on(topic, (msg) => {
+        psA.addEventListener(topic, (evt) => {
+          const msg = evt.detail
           expect(msg.data).to.equalBytes(data)
           counter++
           counter === 1 ? defer1.resolve() : defer2.resolve()
@@ -285,7 +292,8 @@ export default (common: TestSetup<PubSub & Startable>) => {
         let bReceivedFirstMessageFromA = false
         let bReceivedSecondMessageFromA = false
 
-        const handlerSpyA = (message: Message) => {
+        const handlerSpyA = (evt: CustomEvent<Message>) => {
+          const message = evt.detail
           const data = uint8ArrayToString(message.data)
 
           if (data === 'message-from-b-1') {
@@ -296,7 +304,8 @@ export default (common: TestSetup<PubSub & Startable>) => {
             aReceivedSecondMessageFromB = true
           }
         }
-        const handlerSpyB = (message: Message) => {
+        const handlerSpyB = (evt: CustomEvent<Message>) => {
+          const message = evt.detail
           const data = uint8ArrayToString(message.data)
 
           if (data === 'message-from-a-1') {
@@ -310,8 +319,8 @@ export default (common: TestSetup<PubSub & Startable>) => {
 
         const topic = 'reconnect-channel'
 
-        psA.on(topic, handlerSpyA)
-        psB.on(topic, handlerSpyB)
+        psA.addEventListener(topic, handlerSpyA)
+        psB.addEventListener(topic, handlerSpyB)
         psA.subscribe(topic)
         psB.subscribe(topic)
 

package/src/pubsub/emit-self.ts

@@ -3,15 +3,15 @@ import sinon from 'sinon'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import type { TestSetup } from '../index.js'
 import type { PubSub, PubsubOptions } from '@libp2p/interfaces/pubsub'
-import type { Startable } from '@libp2p/interfaces'
+import type { EventMap } from './index.js'
 
 const topic = 'foo'
 const data = uint8ArrayFromString('bar')
 const shouldNotHappen = () => expect.fail()
 
-export default (common: TestSetup<PubSub & Startable, Partial<PubsubOptions>>) => {
+export default (common: TestSetup<PubSub<EventMap>, Partial<PubsubOptions>>) => {
   describe('emit self', () => {
-    let pubsub: PubSub & Startable
+    let pubsub: PubSub<EventMap>
 
     describe('enabled', () => {
       before(async () => {
@@ -30,7 +30,9 @@ export default (common: TestSetup<PubSub & Startable, Partial<PubsubOptions>>) =
       })
 
       it('should emit to self on publish', async () => {
-        const promise = new Promise((resolve) => pubsub.once(topic, resolve))
+        const promise = new Promise((resolve) => pubsub.addEventListener(topic, resolve, {
+          once: true
+        }))
 
         void pubsub.publish(topic, data)
 
@@ -55,7 +57,9 @@ export default (common: TestSetup<PubSub & Startable, Partial<PubsubOptions>>) =
       })
 
       it('should not emit to self on publish', async () => {
-        pubsub.once(topic, () => shouldNotHappen)
+        pubsub.addEventListener(topic, () => shouldNotHappen, {
+          once: true
+        })
 
         void pubsub.publish(topic, data)
 

package/src/pubsub/index.ts

@@ -5,10 +5,17 @@ import connectionHandlersTest from './connection-handlers.js'
 import twoNodesTest from './two-nodes.js'
 import multipleNodesTest from './multiple-nodes.js'
 import type { TestSetup } from '../index.js'
-import type { PubSub } from '@libp2p/interfaces/pubsub'
-import type { Startable } from '@libp2p/interfaces'
+import type { PubSub, Message, PubsubEvents } from '@libp2p/interfaces/pubsub'
 
-export default (common: TestSetup<PubSub & Startable>) => {
+export interface EventMap extends PubsubEvents {
+  'topic': CustomEvent<Message>
+  'foo': CustomEvent<Message>
+  'test-topic': CustomEvent<Message>
+  'reconnect-channel': CustomEvent<Message>
+  'Z': CustomEvent<Message>
+}
+
+export default (common: TestSetup<PubSub<EventMap>>) => {
   describe('interface-pubsub compliance tests', () => {
     apiTest(common)
     emitSelfTest(common)

package/src/pubsub/messages.ts

@@ -6,14 +6,14 @@ import * as utils from '@libp2p/pubsub/utils'
 import { PeerStreams } from '@libp2p/pubsub/peer-streams'
 import type { TestSetup } from '../index.js'
 import type { PubSub } from '@libp2p/interfaces/pubsub'
-import type { Startable } from '@libp2p/interfaces'
+import type { EventMap } from './index.js'
 
 const topic = 'foo'
 const data = uint8ArrayFromString('bar')
 
-export default (common: TestSetup<PubSub & Startable>) => {
+export default (common: TestSetup<PubSub<EventMap>>) => {
   describe('messages', () => {
-    let pubsub: PubSub & Startable
+    let pubsub: PubSub<EventMap>
 
     // Create pubsub router
     beforeEach(async () => {