@libp2p/interface-compliance-tests 1.1.18 → 1.1.21

package/src/pubsub/connection-handlers.ts

@@ -1,4 +1,4 @@
-import { expect } from 'aegir/utils/chai.js'
+import { expect } from 'aegir/chai'
 import sinon from 'sinon'
 import pDefer from 'p-defer'
 import pWaitFor from 'p-wait-for'
@@ -14,6 +14,7 @@ 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, PubSubArgs>) => {
   describe('pubsub connection handlers', () => {
@@ -49,8 +50,7 @@ export default (common: TestSetup<PubSubBaseProtocol, PubSubArgs>) => {
         })
 
         // Start pubsub
-        await psA.start()
-        await psB.start()
+        await start(psA, psB)
 
         expect(psA.getPeers()).to.be.empty()
         expect(psB.getPeers()).to.be.empty()
@@ -134,8 +134,7 @@ export default (common: TestSetup<PubSubBaseProtocol, PubSubArgs>) => {
           init: {}
         })
 
-        await psA.start()
-        await psB.start()
+        await start(psA, psB)
       })
 
       afterEach(async () => {
@@ -231,15 +230,13 @@ export default (common: TestSetup<PubSubBaseProtocol, PubSubArgs>) => {
       afterEach(async () => {
         sinon.restore()
 
-        await psA.stop()
-        await psB.stop()
+        await stop(psA, psB)
 
         await common.teardown()
       })
 
       it('should get notified of connected peers after starting', async () => {
-        await psA.start()
-        await psB.start()
+        await start(psA, psB)
 
         await connectPeers(psA.multicodecs[0], {
           peerId: peerA,
@@ -260,8 +257,7 @@ export default (common: TestSetup<PubSubBaseProtocol, PubSubArgs>) => {
         const topic = 'test-topic'
         const data = uint8ArrayFromString('hey!')
 
-        await psA.start()
-        await psB.start()
+        await start(psA, psB)
 
         await connectPeers(psA.multicodecs[0], {
           peerId: peerA,
@@ -331,15 +327,13 @@ export default (common: TestSetup<PubSubBaseProtocol, PubSubArgs>) => {
           init: {}
         })
 
-        await psA.start()
-        await psB.start()
+        await start(psA, psB)
       })
 
       afterEach(async () => {
         sinon.restore()
 
-        await psA.stop()
-        await psB.stop()
+        await stop(psA, psB)
 
         await common.teardown()
       })

package/src/pubsub/emit-self.ts

@@ -1,4 +1,4 @@
-import { expect } from 'aegir/utils/chai.js'
+import { expect } from 'aegir/chai'
 import sinon from 'sinon'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { createEd25519PeerId } from '@libp2p/peer-id-factory'
@@ -8,6 +8,7 @@ import type { TestSetup } from '../index.js'
 import type { PubSubArgs } from './index.js'
 import type { PubSubBaseProtocol } from '@libp2p/pubsub'
 import { Components } from '@libp2p/interfaces/components'
+import { start, stop } from '../index.js'
 
 const topic = 'foo'
 const data = uint8ArrayFromString('bar')
@@ -31,13 +32,13 @@ export default (common: TestSetup<PubSubBaseProtocol, PubSubArgs>) => {
       })
 
       before(async () => {
-        await pubsub.start()
+        await start(pubsub)
         pubsub.subscribe(topic)
       })
 
       after(async () => {
         sinon.restore()
-        await pubsub.stop()
+        await stop(pubsub)
         await common.teardown()
       })
 
@@ -66,13 +67,13 @@ export default (common: TestSetup<PubSubBaseProtocol, PubSubArgs>) => {
       })
 
       before(async () => {
-        await pubsub.start()
+        await start(pubsub)
         pubsub.subscribe(topic)
       })
 
       after(async () => {
         sinon.restore()
-        await pubsub.stop()
+        await stop(pubsub)
         await common.teardown()
       })
 

package/src/pubsub/messages.ts

@@ -1,4 +1,4 @@
-import { expect } from 'aegir/utils/chai.js'
+import { expect } from 'aegir/chai'
 import sinon from 'sinon'
 import { createEd25519PeerId } from '@libp2p/peer-id-factory'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
@@ -15,6 +15,7 @@ import type { PubSubArgs } from './index.js'
 import type { PubSubBaseProtocol } from '@libp2p/pubsub'
 import { Components } from '@libp2p/interfaces/components'
 import type { PeerId } from '@libp2p/interfaces/peer-id'
+import { start, stop } from '../index.js'
 
 const topic = 'foo'
 const data = uint8ArrayFromString('bar')
@@ -37,12 +38,12 @@ export default (common: TestSetup<PubSubBaseProtocol, PubSubArgs>) => {
           emitSelf: true
         }
       })
-      await pubsub.start()
+      await start(pubsub)
     })
 
     afterEach(async () => {
       sinon.restore()
-      await pubsub.stop()
+      await stop(pubsub)
       await common.teardown()
     })
 

package/src/pubsub/multiple-nodes.ts

@@ -1,5 +1,5 @@
 /* eslint max-nested-callbacks: ["error", 6] */
-import { expect } from 'aegir/utils/chai.js'
+import { expect } from 'aegir/chai'
 import sinon from 'sinon'
 import pDefer from 'p-defer'
 import pWaitFor from 'p-wait-for'
@@ -16,6 +16,7 @@ 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, PubSubArgs>) => {
   describe('pubsub with multiple nodes', function () {
@@ -73,9 +74,7 @@ export default (common: TestSetup<PubSubBaseProtocol, 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, 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()
         })
@@ -353,9 +350,7 @@ export default (common: TestSetup<PubSubBaseProtocol, 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, 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

@@ -1,5 +1,5 @@
 /* eslint max-nested-callbacks: ["error", 6] */
-import { expect } from 'aegir/utils/chai.js'
+import { expect } from 'aegir/chai'
 import sinon from 'sinon'
 import pDefer from 'p-defer'
 import pWaitFor from 'p-wait-for'
@@ -16,6 +16,7 @@ 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'
 
@@ -60,8 +61,7 @@ export default (common: TestSetup<PubSubBaseProtocol, 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, PubSubArgs>) => {
     afterEach(async () => {
       sinon.restore()
 
-      await psA.stop()
-      await psB.stop()
+      await stop(psA, psB)
 
       await common.teardown()
     })

package/src/record/index.ts

@@ -1,4 +1,4 @@
-import { expect } from 'aegir/utils/chai.js'
+import { expect } from 'aegir/chai'
 import type { TestSetup } from '../index.js'
 import type { Record } from '@libp2p/interfaces/record'
 

package/src/stream-muxer/base-test.ts

@@ -1,4 +1,4 @@
-import { expect } from 'aegir/utils/chai.js'
+import { expect } from 'aegir/chai'
 import { duplexPair } from 'it-pair/duplex'
 import { pipe } from 'it-pipe'
 import drain from 'it-drain'

package/src/stream-muxer/close-test.ts

@@ -4,7 +4,7 @@ import { duplexPair } from 'it-pair/duplex'
 import { abortableSource } from 'abortable-iterator'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import drain from 'it-drain'
-import { expect } from 'aegir/utils/chai.js'
+import { expect } from 'aegir/chai'
 import delay from 'delay'
 import type { TestSetup } from '../index.js'
 import type { StreamMuxerFactory } from '@libp2p/interfaces/stream-muxer'

package/src/stream-muxer/spawner.ts

@@ -1,4 +1,4 @@
-import { expect } from 'aegir/utils/chai.js'
+import { expect } from 'aegir/chai'
 import { duplexPair } from 'it-pair/duplex'
 import { pipe } from 'it-pipe'
 import pLimit from 'p-limit'

package/src/topology/topology.ts

@@ -1,4 +1,4 @@
-import { expect } from 'aegir/utils/chai.js'
+import { expect } from 'aegir/chai'
 import sinon from 'sinon'
 import type { TestSetup } from '../index.js'
 import type { Topology } from '@libp2p/interfaces/topology'

package/src/transport/dial-test.ts

@@ -1,4 +1,4 @@
-import { expect } from 'aegir/utils/chai.js'
+import { expect } from 'aegir/chai'
 import { isValidTick } from '../utils/is-valid-tick.js'
 import { mockUpgrader } from '../mocks/upgrader.js'
 import { mockRegistrar } from '../mocks/registrar.js'

package/src/transport/filter-test.ts

@@ -1,4 +1,4 @@
-import { expect } from 'aegir/utils/chai.js'
+import { expect } from 'aegir/chai'
 import type { TestSetup } from '../index.js'
 import type { Transport } from '@libp2p/interfaces/transport'
 import type { TransportTestFixtures } from './index.js'

package/src/transport/listen-test.ts

@@ -1,5 +1,5 @@
 /* eslint max-nested-callbacks: ["error", 8] */
-import { expect } from 'aegir/utils/chai.js'
+import { expect } from 'aegir/chai'
 import sinon from 'sinon'
 import pWaitFor from 'p-wait-for'
 import { pipe } from 'it-pipe'