@libp2p/interface-compliance-tests 1.1.13 → 1.1.16

package/src/transport/listen-test.ts

@@ -7,19 +7,18 @@ import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { isValidTick } from '../utils/is-valid-tick.js'
 import { mockUpgrader } from '../mocks/upgrader.js'
 import defer from 'p-defer'
-import { CustomEvent } from '@libp2p/interfaces'
+import { mockRegistrar } from '../mocks/registrar.js'
+import drain from 'it-drain'
 import type { TestSetup } from '../index.js'
-import type { Transport } from '@libp2p/interfaces/transport'
-import type { TransportTestFixtures, SetupArgs } from './index.js'
+import type { Transport, Upgrader } from '@libp2p/interfaces/transport'
+import type { TransportTestFixtures } from './index.js'
 import type { Multiaddr } from '@multiformats/multiaddr'
 import type { Connection } from '@libp2p/interfaces/connection'
-import type { Registrar } from '@libp2p/interfaces/src/registrar'
-import { mockRegistrar } from '../mocks/registrar.js'
-import drain from 'it-drain'
+import type { Registrar } from '@libp2p/interfaces/registrar'
 
-export default (common: TestSetup<TransportTestFixtures, SetupArgs>) => {
+export default (common: TestSetup<TransportTestFixtures>) => {
   describe('listen', () => {
-    let upgrader = mockUpgrader()
+    let upgrader: Upgrader
     let addrs: Multiaddr[]
     let transport: Transport
     let registrar: Registrar
@@ -30,7 +29,7 @@ export default (common: TestSetup<TransportTestFixtures, SetupArgs>) => {
         registrar
       });
 
-      ({ transport, addrs } = await common.setup({ upgrader }))
+      ({ transport, addrs } = await common.setup())
     })
 
     after(async () => {
@@ -42,7 +41,9 @@ export default (common: TestSetup<TransportTestFixtures, SetupArgs>) => {
     })
 
     it('simple', async () => {
-      const listener = transport.createListener()
+      const listener = transport.createListener({
+        upgrader
+      })
       await listener.listen(addrs[0])
       await listener.close()
     })
@@ -52,11 +53,12 @@ export default (common: TestSetup<TransportTestFixtures, SetupArgs>) => {
       const listenerConns: Connection[] = []
 
       const protocol = '/test/protocol'
-      void registrar.handle(protocol, (evt) => {
-        void drain(evt.detail.stream.source)
+      void registrar.handle(protocol, (data) => {
+        void drain(data.stream.source)
       })
 
       const listener = transport.createListener({
+        upgrader,
         handler: (conn) => {
           listenerConns.push(conn)
         }
@@ -67,8 +69,12 @@ export default (common: TestSetup<TransportTestFixtures, SetupArgs>) => {
 
       // Create two connections to the listener
       const [conn1] = await Promise.all([
-        transport.dial(addrs[0]),
-        transport.dial(addrs[0])
+        transport.dial(addrs[0], {
+          upgrader
+        }),
+        transport.dial(addrs[0], {
+          upgrader
+        })
       ])
 
       // Give the listener a chance to finish its upgrade
@@ -102,16 +108,16 @@ export default (common: TestSetup<TransportTestFixtures, SetupArgs>) => {
       sinon.stub(upgrader, 'upgradeInbound').throws()
 
       const listener = transport.createListener({
-        handler: () => {
-          throw new Error('should not handle the connection if upgradeInbound throws')
-        }
+        upgrader
       })
 
       // Listen
       await listener.listen(addrs[0])
 
       // Create a connection to the listener
-      const conn = await transport.dial(addrs[0])
+      const conn = await transport.dial(addrs[0], {
+        upgrader
+      })
 
       await pWaitFor(() => typeof conn.stat.timeline.close === 'number')
       await listener.close()
@@ -120,7 +126,9 @@ export default (common: TestSetup<TransportTestFixtures, SetupArgs>) => {
     describe('events', () => {
       it('connection', async () => {
         const upgradeSpy = sinon.spy(upgrader, 'upgradeInbound')
-        const listener = transport.createListener()
+        const listener = transport.createListener({
+          upgrader
+        })
         const deferred = defer()
         let conn
 
@@ -131,7 +139,9 @@ export default (common: TestSetup<TransportTestFixtures, SetupArgs>) => {
 
         void (async () => {
           await listener.listen(addrs[0])
-          await transport.dial(addrs[0])
+          await transport.dial(addrs[0], {
+            upgrader
+          })
         })()
 
         await deferred.promise
@@ -142,7 +152,9 @@ export default (common: TestSetup<TransportTestFixtures, SetupArgs>) => {
       })
 
       it('listening', (done) => {
-        const listener = transport.createListener()
+        const listener = transport.createListener({
+          upgrader
+        })
         listener.addEventListener('listening', () => {
           listener.close().then(done, done)
         })
@@ -150,18 +162,22 @@ export default (common: TestSetup<TransportTestFixtures, SetupArgs>) => {
       })
 
       it('error', (done) => {
-        const listener = transport.createListener()
+        const listener = transport.createListener({
+          upgrader
+        })
         listener.addEventListener('error', (evt) => {
           expect(evt.detail).to.be.an.instanceOf(Error)
           listener.close().then(done, done)
         })
-        listener.dispatchEvent(new CustomEvent('error', {
-          detail: new Error('my err')
+        listener.dispatchEvent(new ErrorEvent('error', {
+          error: new Error('my err')
         }))
       })
 
       it('close', (done) => {
-        const listener = transport.createListener()
+        const listener = transport.createListener({
+          upgrader
+        })
         listener.addEventListener('close', () => done())
 
         void (async () => {

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

@@ -1,5 +0,0 @@
-import type { TestSetup } from '../index.js';
-import type { Crypto } from '@libp2p/interfaces/crypto';
-declare const _default: (common: TestSetup<Crypto>) => void;
-export default _default;
-//# sourceMappingURL=index.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/crypto/index.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;iCAI/B,UAAU,MAAM,CAAC;AAAzC,wBA0FC"}

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

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

package/dist/src/crypto/utils/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/crypto/utils/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAA;AAGvE,wBAAgB,gBAAgB,IAAK,CAAC,mBAAmB,EAAE,mBAAmB,CAAC,CAiB9E"}

package/dist/src/crypto/utils/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/crypto/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAInD,MAAM,UAAU,gBAAgB;IAC9B,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,UAAU,EAAc,CAAA;IAEhD,SAAS,cAAc,CAAE,MAA0B;QACjD,MAAM,MAAM,GAAwB;YAClC,GAAG,MAAM;YACT,KAAK,EAAE,KAAK,IAAI,EAAE,GAAE,CAAC;YACrB,UAAU,EAAE,IAAI,SAAS,CAAC,yBAAyB,CAAC;YACpD,QAAQ,EAAE;gBACR,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE;aACjB;SACF,CAAA;QAED,OAAO,MAAM,CAAA;IACf,CAAC;IAED,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC,CAAA;AACxD,CAAC"}