feat!: update libp2p interfaces (#1252)

BREAKING CHANGE: uses new single-issue libp2p interface modules

test/addresses/address-manager.spec.ts

@@ -7,10 +7,10 @@ import { createNode } from '../utils/creators/peer.js'
 import { createFromJSON } from '@libp2p/peer-id-factory'
 import Peers from '../fixtures/peers.js'
 import { stubInterface } from 'ts-sinon'
-import type { TransportManager } from '@libp2p/interfaces/transport'
-import type { PeerId } from '@libp2p/interfaces/peer-id'
+import type { TransportManager } from '@libp2p/interface-transport'
+import type { PeerId } from '@libp2p/interface-peer-id'
 import type { Libp2p } from '../../src/index.js'
-import { Components } from '@libp2p/interfaces/components'
+import { Components } from '@libp2p/components'
 
 const listenAddresses = ['/ip4/127.0.0.1/tcp/15006/ws', '/ip4/127.0.0.1/tcp/15008/ws']
 const announceAddreses = ['/dns4/peer.io']

test/configuration/pubsub.spec.ts

@@ -9,7 +9,7 @@ import { baseOptions, pubsubSubsystemOptions } from './utils.js'
 import { createPeerId } from '../utils/creators/peer.js'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { FloodSub } from '@libp2p/floodsub'
-import type { PubSub } from '@libp2p/interfaces/pubsub'
+import type { PubSub } from '@libp2p/interface-pubsub'
 
 describe('Pubsub subsystem is configurable', () => {
   let libp2p: Libp2p

test/configuration/utils.ts

@@ -5,9 +5,9 @@ import { WebSockets } from '@libp2p/websockets'
 import * as filters from '@libp2p/websockets/filters'
 import { MULTIADDRS_WEBSOCKETS } from '../fixtures/browser.js'
 import mergeOptions from 'merge-options'
-import type { Message, PublishResult, PubSubInit, PubSubRPC, PubSubRPCMessage } from '@libp2p/interfaces/pubsub'
+import type { Message, PublishResult, PubSubInit, PubSubRPC, PubSubRPCMessage } from '@libp2p/interface-pubsub'
 import type { Libp2pInit, Libp2pOptions } from '../../src/index.js'
-import type { PeerId } from '@libp2p/interfaces/peer-id'
+import type { PeerId } from '@libp2p/interface-peer-id'
 import * as cborg from 'cborg'
 import { peerIdFromString } from '@libp2p/peer-id'
 

test/connection-manager/auto-dialler.spec.ts

@@ -5,10 +5,10 @@ import { AutoDialler } from '../../src/connection-manager/auto-dialler.js'
 import pWaitFor from 'p-wait-for'
 import delay from 'delay'
 import { createEd25519PeerId } from '@libp2p/peer-id-factory'
-import { Components } from '@libp2p/interfaces/components'
+import { Components } from '@libp2p/components'
 import { stubInterface } from 'ts-sinon'
-import type { ConnectionManager } from '@libp2p/interfaces/connection-manager'
-import type { PeerStore, Peer } from '@libp2p/interfaces/peer-store'
+import type { ConnectionManager } from '@libp2p/interface-connection-manager'
+import type { PeerStore, Peer } from '@libp2p/interface-peer-store'
 
 describe('Auto-dialler', () => {
   it('should not dial self', async () => {

test/connection-manager/index.node.ts

@@ -2,19 +2,19 @@
 
 import { expect } from 'aegir/chai'
 import { createNode, createPeerId } from '../utils/creators/peer.js'
-import { mockConnection, mockDuplex, mockMultiaddrConnection, mockUpgrader } from '@libp2p/interface-compliance-tests/mocks'
+import { mockConnection, mockDuplex, mockMultiaddrConnection, mockUpgrader } from '@libp2p/interface-mocks'
 import { createBaseOptions } from '../utils/base-options.browser.js'
 import type { Libp2p } from '../../src/index.js'
-import type { PeerId } from '@libp2p/interfaces/peer-id'
+import type { PeerId } from '@libp2p/interface-peer-id'
 import { DefaultConnectionManager } from '../../src/connection-manager/index.js'
-import { Components } from '@libp2p/interfaces/components'
+import { Components } from '@libp2p/components'
 import { CustomEvent } from '@libp2p/interfaces/events'
-import * as STATUS from '@libp2p/interfaces/connection/status'
+import * as STATUS from '@libp2p/interface-connection/status'
 import { stubInterface } from 'ts-sinon'
-import type { KeyBook, PeerStore } from '@libp2p/interfaces/peer-store'
+import type { KeyBook, PeerStore } from '@libp2p/interface-peer-store'
 import sinon from 'sinon'
 import pWaitFor from 'p-wait-for'
-import type { Connection } from '@libp2p/interfaces/connection'
+import type { Connection } from '@libp2p/interface-connection'
 import delay from 'delay'
 import type { Libp2pNode } from '../../src/libp2p.js'
 import { codes } from '../../src/errors.js'

test/connection-manager/index.spec.ts

@@ -6,7 +6,7 @@ import { createNode } from '../utils/creators/peer.js'
 import { createBaseOptions } from '../utils/base-options.browser.js'
 import type { Libp2pNode } from '../../src/libp2p.js'
 import type { DefaultConnectionManager } from '../../src/connection-manager/index.js'
-import { mockConnection, mockDuplex, mockMultiaddrConnection } from '@libp2p/interface-compliance-tests/mocks'
+import { mockConnection, mockDuplex, mockMultiaddrConnection } from '@libp2p/interface-mocks'
 import { createEd25519PeerId } from '@libp2p/peer-id-factory'
 import { CustomEvent } from '@libp2p/interfaces/events'
 

test/content-routing/content-routing.node.ts

@@ -14,7 +14,7 @@ import { createNode, createPeerId, populateAddressBooks } from '../utils/creator
 import { createBaseOptions } from '../utils/base-options.js'
 import { createRoutingOptions } from './utils.js'
 import type { Libp2p } from '../../src/index.js'
-import type { PeerInfo } from '@libp2p/interfaces/peer-info'
+import type { PeerInfo } from '@libp2p/interface-peer-info'
 import type { Libp2pNode } from '../../src/libp2p.js'
 
 describe('content-routing', () => {

test/content-routing/dht/operation.node.ts

@@ -6,7 +6,7 @@ import pWaitFor from 'p-wait-for'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { subsystemMulticodecs, createSubsystemOptions } from './utils.js'
 import { createPeerId } from '../../utils/creators/peer.js'
-import type { PeerId } from '@libp2p/interfaces/peer-id'
+import type { PeerId } from '@libp2p/interface-peer-id'
 import { createLibp2pNode, Libp2pNode } from '../../../src/libp2p.js'
 import { start } from '@libp2p/interfaces/startable'
 

test/core/encryption.spec.ts

@@ -6,7 +6,7 @@ import { NOISE } from '@chainsafe/libp2p-noise'
 import { createLibp2p, Libp2pOptions } from '../../src/index.js'
 import { codes as ErrorCodes } from '../../src/errors.js'
 import { createPeerId } from '../utils/creators/peer.js'
-import type { PeerId } from '@libp2p/interfaces/peer-id'
+import type { PeerId } from '@libp2p/interface-peer-id'
 
 describe('Connection encryption configuration', () => {
   let peerId: PeerId

test/core/listening.node.ts

@@ -4,7 +4,7 @@ import { expect } from 'aegir/chai'
 import { TCP } from '@libp2p/tcp'
 import { NOISE } from '@chainsafe/libp2p-noise'
 import { createPeerId } from '../utils/creators/peer.js'
-import type { PeerId } from '@libp2p/interfaces/peer-id'
+import type { PeerId } from '@libp2p/interface-peer-id'
 import { createLibp2pNode, Libp2pNode } from '../../src/libp2p.js'
 
 const listenAddr = '/ip4/0.0.0.0/tcp/0'

test/dialing/dial-request.spec.ts

@@ -6,7 +6,7 @@ import { AbortError } from '@libp2p/interfaces/errors'
 import pDefer from 'p-defer'
 import delay from 'delay'
 import { DialAction, DialRequest } from '../../src/connection-manager/dialer/dial-request.js'
-import { mockConnection, mockDuplex, mockMultiaddrConnection } from '@libp2p/interface-compliance-tests/mocks'
+import { mockConnection, mockDuplex, mockMultiaddrConnection } from '@libp2p/interface-mocks'
 import { createEd25519PeerId } from '@libp2p/peer-id-factory'
 import { Multiaddr } from '@multiformats/multiaddr'
 import { Dialer } from '../../src/connection-manager/dialer/index.js'

test/dialing/direct.node.ts

@@ -13,7 +13,7 @@ import pSettle, { PromiseResult } from 'p-settle'
 import pWaitFor from 'p-wait-for'
 import { pipe } from 'it-pipe'
 import { pushable } from 'it-pushable'
-import { Connection, isConnection } from '@libp2p/interfaces/connection'
+import { Connection, isConnection } from '@libp2p/interface-connection'
 import { AbortError } from '@libp2p/interfaces/errors'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { MemoryDatastore } from 'datastore-core/memory'
@@ -22,11 +22,11 @@ import { DefaultAddressManager } from '../../src/address-manager/index.js'
 import { PersistentPeerStore } from '@libp2p/peer-store'
 import { DefaultTransportManager } from '../../src/transport-manager.js'
 import { codes as ErrorCodes } from '../../src/errors.js'
-import { mockConnectionGater, mockDuplex, mockMultiaddrConnection, mockUpgrader, mockConnection } from '@libp2p/interface-compliance-tests/mocks'
+import { mockConnectionGater, mockDuplex, mockMultiaddrConnection, mockUpgrader, mockConnection } from '@libp2p/interface-mocks'
 import Peers from '../fixtures/peers.js'
-import { Components } from '@libp2p/interfaces/components'
+import { Components } from '@libp2p/components'
 import { createFromJSON } from '@libp2p/peer-id-factory'
-import type { PeerId } from '@libp2p/interfaces/peer-id'
+import type { PeerId } from '@libp2p/interface-peer-id'
 import { createLibp2pNode, Libp2pNode } from '../../src/libp2p.js'
 import { PreSharedKeyConnectionProtector } from '../../src/pnet/index.js'
 import swarmKey from '../fixtures/swarm.key.js'
@@ -382,7 +382,7 @@ describe('libp2p.dialer (direct, TCP)', () => {
     await libp2p.dialProtocol(remoteLibp2p.peerId, '/stream-count/4')
 
     // Partially write to the echo stream
-    const source = pushable<Uint8Array>()
+    const source = pushable()
     void stream.sink(source)
     source.push(uint8ArrayFromString('hello'))
 

test/dialing/direct.spec.ts

@@ -17,18 +17,18 @@ import { Dialer, DialTarget } from '../../src/connection-manager/dialer/index.js
 import { publicAddressesFirst } from '@libp2p/utils/address-sort'
 import { PersistentPeerStore } from '@libp2p/peer-store'
 import { DefaultTransportManager } from '../../src/transport-manager.js'
-import { mockConnectionGater, mockDuplex, mockMultiaddrConnection, mockUpgrader, mockConnection } from '@libp2p/interface-compliance-tests/mocks'
+import { mockConnectionGater, mockDuplex, mockMultiaddrConnection, mockUpgrader, mockConnection } from '@libp2p/interface-mocks'
 import { createPeerId } from '../utils/creators/peer.js'
-import type { TransportManager } from '@libp2p/interfaces/transport'
-import { Components } from '@libp2p/interfaces/components'
+import type { TransportManager } from '@libp2p/interface-transport'
+import { Components } from '@libp2p/components'
 import { peerIdFromString } from '@libp2p/peer-id'
-import type { Connection } from '@libp2p/interfaces/connection'
+import type { Connection } from '@libp2p/interface-connection'
 import { createLibp2pNode, Libp2pNode } from '../../src/libp2p.js'
 import { DefaultConnectionManager } from '../../src/connection-manager/index.js'
 import { createFromJSON } from '@libp2p/peer-id-factory'
 import Peers from '../fixtures/peers.js'
 import { MULTIADDRS_WEBSOCKETS } from '../fixtures/browser.js'
-import type { PeerId } from '@libp2p/interfaces/peer-id'
+import type { PeerId } from '@libp2p/interface-peer-id'
 import { pEvent } from 'p-event'
 
 const unsupportedAddr = new Multiaddr('/ip4/127.0.0.1/tcp/9999')

test/dialing/resolver.spec.ts

@@ -7,11 +7,11 @@ import { codes as ErrorCodes } from '../../src/errors.js'
 import { createNode } from '../utils/creators/peer.js'
 import { createBaseOptions } from '../utils/base-options.browser.js'
 import { MULTIADDRS_WEBSOCKETS } from '../fixtures/browser.js'
-import type { PeerId } from '@libp2p/interfaces/peer-id'
+import type { PeerId } from '@libp2p/interface-peer-id'
 import type { Libp2pNode } from '../../src/libp2p.js'
 import { Circuit } from '../../src/circuit/transport.js'
 import pDefer from 'p-defer'
-import { mockConnection, mockDuplex, mockMultiaddrConnection } from '@libp2p/interface-compliance-tests/mocks'
+import { mockConnection, mockDuplex, mockMultiaddrConnection } from '@libp2p/interface-mocks'
 import { peerIdFromString } from '@libp2p/peer-id'
 import { WebSockets } from '@libp2p/websockets'
 

test/fetch/fetch.node.ts

@@ -7,7 +7,7 @@ import { Mplex } from '@libp2p/mplex'
 import { NOISE } from '@chainsafe/libp2p-noise'
 import { createPeerId } from '../utils/creators/peer.js'
 import { codes } from '../../src/errors.js'
-import type { PeerId } from '@libp2p/interfaces/peer-id'
+import type { PeerId } from '@libp2p/interface-peer-id'
 
 async function createNode (peerId: PeerId) {
   return await createLibp2pNode({

test/fetch/index.spec.ts

@@ -4,9 +4,9 @@ import { expect } from 'aegir/chai'
 import sinon from 'sinon'
 import { FetchService } from '../../src/fetch/index.js'
 import Peers from '../fixtures/peers.js'
-import { mockRegistrar, mockUpgrader, connectionPair } from '@libp2p/interface-compliance-tests/mocks'
+import { mockRegistrar, mockUpgrader, connectionPair } from '@libp2p/interface-mocks'
 import { createFromJSON } from '@libp2p/peer-id-factory'
-import { Components } from '@libp2p/interfaces/components'
+import { Components } from '@libp2p/components'
 import { DefaultConnectionManager } from '../../src/connection-manager/index.js'
 import { start, stop } from '@libp2p/interfaces/startable'
 import { CustomEvent } from '@libp2p/interfaces/events'

test/identify/index.spec.ts

@@ -14,9 +14,9 @@ import { MemoryDatastore } from 'datastore-core/memory'
 import * as lp from 'it-length-prefixed'
 import drain from 'it-drain'
 import { pipe } from 'it-pipe'
-import { mockConnectionGater, mockRegistrar, mockUpgrader, connectionPair } from '@libp2p/interface-compliance-tests/mocks'
+import { mockConnectionGater, mockRegistrar, mockUpgrader, connectionPair } from '@libp2p/interface-mocks'
 import { createFromJSON } from '@libp2p/peer-id-factory'
-import { Components } from '@libp2p/interfaces/components'
+import { Components } from '@libp2p/components'
 import { PeerRecordUpdater } from '../../src/peer-record-updater.js'
 import {
   MULTICODEC_IDENTIFY,

test/identify/push.spec.ts

@@ -10,9 +10,9 @@ import { DefaultAddressManager } from '../../src/address-manager/index.js'
 import { MemoryDatastore } from 'datastore-core/memory'
 import drain from 'it-drain'
 import { pipe } from 'it-pipe'
-import { mockConnectionGater, mockRegistrar, mockUpgrader, connectionPair } from '@libp2p/interface-compliance-tests/mocks'
+import { mockConnectionGater, mockRegistrar, mockUpgrader, connectionPair } from '@libp2p/interface-mocks'
 import { createFromJSON } from '@libp2p/peer-id-factory'
-import { Components } from '@libp2p/interfaces/components'
+import { Components } from '@libp2p/components'
 import { PeerRecordUpdater } from '../../src/peer-record-updater.js'
 import {
   MULTICODEC_IDENTIFY,

test/identify/service.spec.ts

@@ -11,7 +11,7 @@ import { MULTIADDRS_WEBSOCKETS } from '../fixtures/browser.js'
 import { createFromJSON } from '@libp2p/peer-id-factory'
 import pWaitFor from 'p-wait-for'
 import { peerIdFromString } from '@libp2p/peer-id'
-import type { PeerId } from '@libp2p/interfaces/peer-id'
+import type { PeerId } from '@libp2p/interface-peer-id'
 import type { Libp2pNode } from '../../src/libp2p.js'
 import { pEvent } from 'p-event'
 

test/insecure/compliance.spec.ts

@@ -1,6 +1,6 @@
 /* eslint-env mocha */
 
-import suite from '@libp2p/interface-compliance-tests/connection-encrypter'
+import suite from '@libp2p/interface-connection-encrypter-compliance-tests'
 import { Plaintext } from '../../src/insecure/index.js'
 
 describe('plaintext compliance', () => {

test/insecure/plaintext.spec.ts

@@ -7,11 +7,11 @@ import { Plaintext } from '../../src/insecure/index.js'
 import {
   InvalidCryptoExchangeError,
   UnexpectedPeerError
-} from '@libp2p/interfaces/connection-encrypter/errors'
-import type { PeerId } from '@libp2p/interfaces/peer-id'
+} from '@libp2p/interface-connection-encrypter/errors'
+import type { PeerId } from '@libp2p/interface-peer-id'
 import { createFromJSON, createRSAPeerId } from '@libp2p/peer-id-factory'
-import type { ConnectionEncrypter } from '@libp2p/interfaces/connection-encrypter'
-import { mockMultiaddrConnPair } from '@libp2p/interface-compliance-tests/mocks'
+import type { ConnectionEncrypter } from '@libp2p/interface-connection-encrypter'
+import { mockMultiaddrConnPair } from '@libp2p/interface-mocks'
 import { Multiaddr } from '@multiformats/multiaddr'
 import { peerIdFromBytes } from '@libp2p/peer-id'
 

test/interop.ts

@@ -14,7 +14,7 @@ import { logger } from '@libp2p/logger'
 import { Mplex } from '@libp2p/mplex'
 import fs from 'fs'
 import { unmarshalPrivateKey } from '@libp2p/crypto/keys'
-import type { PeerId } from '@libp2p/interfaces/peer-id'
+import type { PeerId } from '@libp2p/interface-peer-id'
 import { peerIdFromKeys } from '@libp2p/peer-id'
 import { FloodSub } from '@libp2p/floodsub'
 

test/keychain/cms-interop.spec.ts

@@ -6,7 +6,7 @@ import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
 import { MemoryDatastore } from 'datastore-core/memory'
 import { KeyChain } from '../../src/keychain/index.js'
-import { Components } from '@libp2p/interfaces/components'
+import { Components } from '@libp2p/components'
 
 describe('cms interop', () => {
   const passPhrase = 'this is not a secure phrase'

test/keychain/keychain.spec.ts

@@ -9,9 +9,9 @@ import { Key } from 'interface-datastore/key'
 import { MemoryDatastore } from 'datastore-core/memory'
 import { KeyChain, KeyChainInit, KeyInfo } from '../../src/keychain/index.js'
 import { pbkdf2 } from '@libp2p/crypto'
-import { Components } from '@libp2p/interfaces/components'
+import { Components } from '@libp2p/components'
 import type { Datastore } from 'interface-datastore'
-import type { PeerId } from '@libp2p/interfaces/peer-id'
+import type { PeerId } from '@libp2p/interface-peer-id'
 import { createFromPrivKey } from '@libp2p/peer-id-factory'
 import { unmarshalPrivateKey } from '@libp2p/crypto/keys'
 

test/keychain/peerid.spec.ts

@@ -4,7 +4,7 @@ import { expect } from 'aegir/chai'
 import { base58btc } from 'multiformats/bases/base58'
 import { supportedKeys, unmarshalPrivateKey, unmarshalPublicKey } from '@libp2p/crypto/keys'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
-import type { PeerId } from '@libp2p/interfaces/peer-id'
+import type { PeerId } from '@libp2p/interface-peer-id'
 import { createFromPrivKey } from '@libp2p/peer-id-factory'
 
 const sample = {

test/metrics/index.spec.ts

@@ -14,7 +14,7 @@ import { createPeerId } from '../utils/creators/peer.js'
 import toBuffer from 'it-to-buffer'
 import { createEd25519PeerId } from '@libp2p/peer-id-factory'
 import { peerIdFromString } from '@libp2p/peer-id'
-import type { PeerId } from '@libp2p/interfaces/peer-id'
+import type { PeerId } from '@libp2p/interface-peer-id'
 
 describe('Metrics', () => {
   let peerId: PeerId
@@ -199,7 +199,7 @@ describe('Metrics', () => {
     })
 
     const bytes = randomBytes(1024)
-    const input = pushable<Uint8Array>()
+    const input = pushable()
 
     const deferredPromise = pipe(input, local, drain)
 

test/nat-manager/nat-manager.node.ts

@@ -4,13 +4,13 @@ import { expect } from 'aegir/chai'
 import { DefaultAddressManager } from '../../src/address-manager/index.js'
 import { DefaultTransportManager, FaultTolerance } from '../../src/transport-manager.js'
 import { TCP } from '@libp2p/tcp'
-import { mockUpgrader } from '@libp2p/interface-compliance-tests/mocks'
+import { mockUpgrader } from '@libp2p/interface-mocks'
 import { NatManager } from '../../src/nat-manager.js'
 import delay from 'delay'
 import Peers from '../fixtures/peers.js'
 import { codes } from '../../src/errors.js'
 import { createFromJSON } from '@libp2p/peer-id-factory'
-import { Components } from '@libp2p/interfaces/components'
+import { Components } from '@libp2p/components'
 import type { NatAPI } from '@achingbrain/nat-port-mapper'
 import { StubbedInstance, stubInterface } from 'ts-sinon'
 import { start, stop } from '@libp2p/interfaces/startable'

test/peer-discovery/index.node.ts

@@ -11,10 +11,10 @@ import { Multiaddr } from '@multiformats/multiaddr'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
 import { createBaseOptions } from '../utils/base-options.js'
 import { createPeerId } from '../utils/creators/peer.js'
-import type { PeerId } from '@libp2p/interfaces/peer-id'
+import type { PeerId } from '@libp2p/interface-peer-id'
 import { createLibp2pNode, Libp2pNode } from '../../src/libp2p.js'
 import { CustomEvent } from '@libp2p/interfaces/events'
-import type { PeerInfo } from '@libp2p/interfaces/peer-info'
+import type { PeerInfo } from '@libp2p/interface-peer-info'
 
 const listenAddr = new Multiaddr('/ip4/127.0.0.1/tcp/0')
 

test/peer-discovery/index.spec.ts

@@ -6,9 +6,9 @@ import defer from 'p-defer'
 import { Multiaddr } from '@multiformats/multiaddr'
 import { createBaseOptions } from '../utils/base-options.browser.js'
 import { createPeerId } from '../utils/creators/peer.js'
-import { isPeerId, PeerId } from '@libp2p/interfaces/peer-id'
+import { isPeerId, PeerId } from '@libp2p/interface-peer-id'
 import { createLibp2pNode, Libp2pNode } from '../../src/libp2p.js'
-import { mockConnection, mockDuplex, mockMultiaddrConnection } from '@libp2p/interface-compliance-tests/mocks'
+import { mockConnection, mockDuplex, mockMultiaddrConnection } from '@libp2p/interface-mocks'
 import type { Startable } from '@libp2p/interfaces/startable'
 
 describe('peer discovery', () => {

test/peer-routing/peer-routing.node.ts

@@ -16,11 +16,11 @@ import { createNode, createPeerId, populateAddressBooks } from '../utils/creator
 import type { Libp2pNode } from '../../src/libp2p.js'
 import { createBaseOptions } from '../utils/base-options.js'
 import { createRoutingOptions } from './utils.js'
-import type { PeerId } from '@libp2p/interfaces/peer-id'
+import type { PeerId } from '@libp2p/interface-peer-id'
 import { createEd25519PeerId } from '@libp2p/peer-id-factory'
-import { EventTypes, MessageType } from '@libp2p/interfaces/dht'
+import { EventTypes, MessageType } from '@libp2p/interface-dht'
 import { peerIdFromString } from '@libp2p/peer-id'
-import type { PeerInfo } from '@libp2p/interfaces/peer-info'
+import type { PeerInfo } from '@libp2p/interface-peer-info'
 import { KadDHT } from '@libp2p/kad-dht'
 
 describe('peer-routing', () => {

test/ping/index.spec.ts

@@ -4,9 +4,9 @@ import { expect } from 'aegir/chai'
 import sinon from 'sinon'
 import { PingService } from '../../src/ping/index.js'
 import Peers from '../fixtures/peers.js'
-import { mockRegistrar, mockUpgrader, connectionPair } from '@libp2p/interface-compliance-tests/mocks'
+import { mockRegistrar, mockUpgrader, connectionPair } from '@libp2p/interface-mocks'
 import { createFromJSON } from '@libp2p/peer-id-factory'
-import { Components } from '@libp2p/interfaces/components'
+import { Components } from '@libp2p/components'
 import { DefaultConnectionManager } from '../../src/connection-manager/index.js'
 import { start, stop } from '@libp2p/interfaces/startable'
 import { CustomEvent } from '@libp2p/interfaces/events'

test/pnet/index.spec.ts

@@ -5,7 +5,7 @@ import all from 'it-all'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { PreSharedKeyConnectionProtector, generateKey } from '../../src/pnet/index.js'
 import { INVALID_PSK } from '../../src/pnet/errors.js'
-import { mockMultiaddrConnPair } from '@libp2p/interface-compliance-tests/mocks'
+import { mockMultiaddrConnPair } from '@libp2p/interface-mocks'
 import { Multiaddr } from '@multiformats/multiaddr'
 import { createEd25519PeerId } from '@libp2p/peer-id-factory'
 

test/registrar/registrar.spec.ts

@@ -6,21 +6,21 @@ import { MemoryDatastore } from 'datastore-core/memory'
 import { createTopology } from '@libp2p/topology'
 import { PersistentPeerStore } from '@libp2p/peer-store'
 import { DefaultRegistrar } from '../../src/registrar.js'
-import { mockDuplex, mockMultiaddrConnection, mockUpgrader, mockConnection } from '@libp2p/interface-compliance-tests/mocks'
+import { mockDuplex, mockMultiaddrConnection, mockUpgrader, mockConnection } from '@libp2p/interface-mocks'
 import { createPeerId, createNode } from '../utils/creators/peer.js'
 import { createBaseOptions } from '../utils/base-options.browser.js'
-import type { Registrar } from '@libp2p/interfaces/registrar'
-import type { PeerId } from '@libp2p/interfaces/peer-id'
-import { Components } from '@libp2p/interfaces/components'
+import type { Registrar } from '@libp2p/interface-registrar'
+import type { PeerId } from '@libp2p/interface-peer-id'
+import { Components } from '@libp2p/components'
 import { createLibp2pNode, Libp2pNode } from '../../src/libp2p.js'
 import { createEd25519PeerId } from '@libp2p/peer-id-factory'
 import { CustomEvent } from '@libp2p/interfaces/events'
-import type { Connection } from '@libp2p/interfaces/connection'
+import type { Connection } from '@libp2p/interface-connection'
 import { DefaultConnectionManager } from '../../src/connection-manager/index.js'
 import { Plaintext } from '../../src/insecure/index.js'
 import { WebSockets } from '@libp2p/websockets'
 import { Mplex } from '@libp2p/mplex'
-import type { PeerProtocolsChangeData } from '@libp2p/interfaces/peer-store'
+import type { PeerProtocolsChangeData } from '@libp2p/interface-peer-store'
 
 const protocol = '/test/1.0.0'
 
@@ -238,12 +238,12 @@ describe('registrar', () => {
 
       const echoHandler = () => {}
       await libp2p.handle(['/echo/1.0.0', '/echo/1.0.1'], echoHandler)
-      expect(registrar.getHandler('/echo/1.0.0')).to.equal(echoHandler)
-      expect(registrar.getHandler('/echo/1.0.1')).to.equal(echoHandler)
+      expect(registrar.getHandler('/echo/1.0.0')).to.have.property('handler', echoHandler)
+      expect(registrar.getHandler('/echo/1.0.1')).to.have.property('handler', echoHandler)
 
       await libp2p.unhandle(['/echo/1.0.0'])
       expect(registrar.getProtocols()).to.not.have.any.keys(['/echo/1.0.0'])
-      expect(registrar.getHandler('/echo/1.0.1')).to.equal(echoHandler)
+      expect(registrar.getHandler('/echo/1.0.1')).to.have.property('handler', echoHandler)
     })
   })
 })

test/transports/transport-manager.node.ts

@@ -8,13 +8,13 @@ import { PersistentPeerStore } from '@libp2p/peer-store'
 import { PeerRecord } from '@libp2p/peer-record'
 import { TCP } from '@libp2p/tcp'
 import { Multiaddr } from '@multiformats/multiaddr'
-import { mockUpgrader } from '@libp2p/interface-compliance-tests/mocks'
+import { mockUpgrader } from '@libp2p/interface-mocks'
 import sinon from 'sinon'
 import Peers from '../fixtures/peers.js'
 import pWaitFor from 'p-wait-for'
-import type { PeerId } from '@libp2p/interfaces/peer-id'
+import type { PeerId } from '@libp2p/interface-peer-id'
 import { createFromJSON } from '@libp2p/peer-id-factory'
-import { Components } from '@libp2p/interfaces/components'
+import { Components } from '@libp2p/components'
 import { PeerRecordUpdater } from '../../src/peer-record-updater.js'
 
 const addrs = [

test/transports/transport-manager.spec.ts

@@ -8,13 +8,13 @@ import * as filters from '@libp2p/websockets/filters'
 import { NOISE } from '@chainsafe/libp2p-noise'
 import { DefaultAddressManager } from '../../src/address-manager/index.js'
 import { DefaultTransportManager, FaultTolerance } from '../../src/transport-manager.js'
-import { mockUpgrader } from '@libp2p/interface-compliance-tests/mocks'
+import { mockUpgrader } from '@libp2p/interface-mocks'
 import { MULTIADDRS_WEBSOCKETS } from '../fixtures/browser.js'
 import { codes as ErrorCodes } from '../../src/errors.js'
 import Peers from '../fixtures/peers.js'
-import { Components } from '@libp2p/interfaces/components'
+import { Components } from '@libp2p/components'
 import { createEd25519PeerId, createFromJSON } from '@libp2p/peer-id-factory'
-import type { PeerId } from '@libp2p/interfaces/peer-id'
+import type { PeerId } from '@libp2p/interface-peer-id'
 import { createLibp2pNode, Libp2pNode } from '../../src/libp2p.js'
 
 const listenAddr = new Multiaddr('/ip4/127.0.0.1/tcp/0')

test/upgrading/upgrader.spec.ts

@@ -14,16 +14,16 @@ import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import swarmKey from '../fixtures/swarm.key.js'
 import { DefaultUpgrader } from '../../src/upgrader.js'
 import { codes } from '../../src/errors.js'
-import { mockConnectionGater, mockMultiaddrConnPair, mockRegistrar, mockStream } from '@libp2p/interface-compliance-tests/mocks'
+import { mockConnectionGater, mockMultiaddrConnPair, mockRegistrar, mockStream } from '@libp2p/interface-mocks'
 import Peers from '../fixtures/peers.js'
-import type { Upgrader } from '@libp2p/interfaces/transport'
-import type { PeerId } from '@libp2p/interfaces/peer-id'
+import type { Upgrader } from '@libp2p/interface-transport'
+import type { PeerId } from '@libp2p/interface-peer-id'
 import { createFromJSON } from '@libp2p/peer-id-factory'
-import { Components } from '@libp2p/interfaces/components'
+import { Components } from '@libp2p/components'
 import { Plaintext } from '../../src/insecure/index.js'
-import type { ConnectionEncrypter, SecuredConnection } from '@libp2p/interfaces/connection-encrypter'
-import type { StreamMuxer, StreamMuxerFactory, StreamMuxerInit } from '@libp2p/interfaces/stream-muxer'
-import type { Stream } from '@libp2p/interfaces/connection'
+import type { ConnectionEncrypter, SecuredConnection } from '@libp2p/interface-connection-encrypter'
+import type { StreamMuxer, StreamMuxerFactory, StreamMuxerInit } from '@libp2p/interface-stream-muxer'
+import type { Stream } from '@libp2p/interface-connection'
 import pDefer from 'p-defer'
 import { createLibp2pNode, Libp2pNode } from '../../src/libp2p.js'
 import { pEvent } from 'p-event'
@@ -248,7 +248,7 @@ describe('Upgrader', () => {
     class OtherMuxerFactory implements StreamMuxerFactory {
       protocol = '/muxer-local'
 
-      createStreamMuxer (components: Components, init?: StreamMuxerInit): StreamMuxer {
+      createStreamMuxer (init?: StreamMuxerInit): StreamMuxer {
         return new OtherMuxer()
       }
     }

test/utils/creators/peer.ts

@@ -4,7 +4,7 @@ import { createBaseOptions } from '../base-options.browser.js'
 import { createEd25519PeerId, createFromJSON, createRSAPeerId } from '@libp2p/peer-id-factory'
 import { createLibp2pNode, Libp2pNode } from '../../../src/libp2p.js'
 import type { AddressesConfig, Libp2pOptions } from '../../../src/index.js'
-import type { PeerId } from '@libp2p/interfaces/peer-id'
+import type { PeerId } from '@libp2p/interface-peer-id'
 
 const listenAddr = new Multiaddr('/ip4/127.0.0.1/tcp/0')