@libp2p/interface-compliance-tests 1.1.16 → 1.1.19

package/src/pubsub/multiple-nodes.ts

@@ -11,22 +11,23 @@ import { CustomEvent } from '@libp2p/interfaces'
 import { waitForSubscriptionUpdate } from './utils.js'
 import type { TestSetup } from '../index.js'
 import type { Message } from '@libp2p/interfaces/pubsub'
-import type { EventMap, PubSubArgs } from './index.js'
+import type { PubSubArgs } from './index.js'
 import type { PeerId } from '@libp2p/interfaces/peer-id'
 import type { Registrar } from '@libp2p/interfaces/registrar'
 import type { PubSubBaseProtocol } from '@libp2p/pubsub'
 import { Components } from '@libp2p/interfaces/components'
+import { start, stop } from '../index.js'
 
-export default (common: TestSetup<PubSubBaseProtocol<EventMap>, PubSubArgs>) => {
+export default (common: TestSetup<PubSubBaseProtocol, PubSubArgs>) => {
   describe('pubsub with multiple nodes', function () {
     describe('every peer subscribes to the topic', () => {
       describe('line', () => {
         // line
         // ◉────◉────◉
         // a    b    c
-        let psA: PubSubBaseProtocol<EventMap>
-        let psB: PubSubBaseProtocol<EventMap>
-        let psC: PubSubBaseProtocol<EventMap>
+        let psA: PubSubBaseProtocol
+        let psB: PubSubBaseProtocol
+        let psC: PubSubBaseProtocol
         let peerIdA: PeerId
         let peerIdB: PeerId
         let peerIdC: PeerId
@@ -73,9 +74,7 @@ export default (common: TestSetup<PubSubBaseProtocol<EventMap>, PubSubArgs>) =>
           })
 
           // Start pubsub modes
-          await Promise.all(
-            [psA, psB, psC].map(async (p) => await p.start())
-          )
+          await start(psA, psB, psC)
         })
 
         // Connect nodes
@@ -106,9 +105,7 @@ export default (common: TestSetup<PubSubBaseProtocol<EventMap>, PubSubArgs>) =>
         afterEach(async () => {
           sinon.restore()
 
-          await Promise.all(
-            [psA, psB, psC].map(async (p) => await p.stop())
-          )
+          await stop(psA, psB, psC)
 
           await common.teardown()
         })
@@ -276,11 +273,11 @@ export default (common: TestSetup<PubSubBaseProtocol<EventMap>, PubSubArgs>) =>
         //   │b     d│
         // ◉─┘       └─◉
         // a
-        let psA: PubSubBaseProtocol<EventMap>
-        let psB: PubSubBaseProtocol<EventMap>
-        let psC: PubSubBaseProtocol<EventMap>
-        let psD: PubSubBaseProtocol<EventMap>
-        let psE: PubSubBaseProtocol<EventMap>
+        let psA: PubSubBaseProtocol
+        let psB: PubSubBaseProtocol
+        let psC: PubSubBaseProtocol
+        let psD: PubSubBaseProtocol
+        let psE: PubSubBaseProtocol
         let peerIdA: PeerId
         let peerIdB: PeerId
         let peerIdC: PeerId
@@ -353,9 +350,7 @@ export default (common: TestSetup<PubSubBaseProtocol<EventMap>, PubSubArgs>) =>
           })
 
           // Start pubsub nodes
-          await Promise.all(
-            [psA, psB, psC, psD, psE].map(async (p) => await p.start())
-          )
+          await start(psA, psB, psC, psD, psE)
         })
 
         // connect nodes
@@ -400,9 +395,7 @@ export default (common: TestSetup<PubSubBaseProtocol<EventMap>, PubSubArgs>) =>
         })
 
         afterEach(async () => {
-          await Promise.all(
-            [psA, psB, psC, psD, psE].map(async (p) => await p.stop())
-          )
+          await stop(psA, psB, psC, psD, psE)
           await common.teardown()
         })
 

package/src/pubsub/two-nodes.ts

@@ -11,11 +11,12 @@ import { CustomEvent } from '@libp2p/interfaces'
 import { waitForSubscriptionUpdate } from './utils.js'
 import type { TestSetup } from '../index.js'
 import type { Message } from '@libp2p/interfaces/pubsub'
-import type { EventMap, PubSubArgs } from './index.js'
+import type { PubSubArgs } from './index.js'
 import type { PeerId } from '@libp2p/interfaces/peer-id'
 import type { Registrar } from '@libp2p/interfaces/registrar'
 import type { PubSubBaseProtocol } from '@libp2p/pubsub'
 import { Components } from '@libp2p/interfaces/components'
+import { start, stop } from '../index.js'
 
 const topic = 'foo'
 
@@ -23,10 +24,10 @@ function shouldNotHappen () {
   expect.fail()
 }
 
-export default (common: TestSetup<PubSubBaseProtocol<EventMap>, PubSubArgs>) => {
+export default (common: TestSetup<PubSubBaseProtocol, PubSubArgs>) => {
   describe('pubsub with two nodes', () => {
-    let psA: PubSubBaseProtocol<EventMap>
-    let psB: PubSubBaseProtocol<EventMap>
+    let psA: PubSubBaseProtocol
+    let psB: PubSubBaseProtocol
     let peerIdA: PeerId
     let peerIdB: PeerId
     let registrarA: Registrar
@@ -60,8 +61,7 @@ export default (common: TestSetup<PubSubBaseProtocol<EventMap>, PubSubArgs>) =>
       })
 
       // Start pubsub and connect nodes
-      await psA.start()
-      await psB.start()
+      await start(psA, psB)
 
       expect(psA.getPeers()).to.be.empty()
       expect(psB.getPeers()).to.be.empty()
@@ -81,8 +81,7 @@ export default (common: TestSetup<PubSubBaseProtocol<EventMap>, PubSubArgs>) =>
     afterEach(async () => {
       sinon.restore()
 
-      await psA.stop()
-      await psB.stop()
+      await stop(psA, psB)
 
       await common.teardown()
     })

package/src/transport/listen-test.ts

@@ -9,6 +9,7 @@ import { mockUpgrader } from '../mocks/upgrader.js'
 import defer from 'p-defer'
 import { mockRegistrar } from '../mocks/registrar.js'
 import drain from 'it-drain'
+import { CustomEvent } from '@libp2p/interfaces'
 import type { TestSetup } from '../index.js'
 import type { Transport, Upgrader } from '@libp2p/interfaces/transport'
 import type { TransportTestFixtures } from './index.js'
@@ -169,8 +170,8 @@ export default (common: TestSetup<TransportTestFixtures>) => {
           expect(evt.detail).to.be.an.instanceOf(Error)
           listener.close().then(done, done)
         })
-        listener.dispatchEvent(new ErrorEvent('error', {
-          error: new Error('my err')
+        listener.dispatchEvent(new CustomEvent('error', {
+          detail: new Error('my err')
         }))
       })