chore: consolidate interface compliance tests and peer id

.release-please-manifest.json

@@ -1,13 +1,8 @@
 {
   "packages/crypto": "1.0.17",
+  "packages/interface":"3.2.0",
   "packages/interface-compliance-tests":"3.0.7",
-  "packages/interface-compliance-tests-connection":"2.0.9",
-  "packages/interface-compliance-tests-connection-encrypter":"5.0.1",
-  "packages/interface-compliance-tests-peer-discovery":"2.0.8",
-  "packages/interface-compliance-tests-stream-muxer":"7.0.3",
-  "packages/interface-compliance-tests-transport":"4.0.2",
-  "packages/interface-libp2p":"3.2.0",
-  "packages/interface-mocks":"12.0.1",
+  "packages/interface-internal":"0.0.1",
   "packages/interface-peer-id":"2.0.2",
   "packages/kad-dht": "9.3.6",
   "packages/keychain": "2.0.1",

.release-please.json

@@ -5,14 +5,9 @@
   "group-pull-request-title-pattern": "chore: release ${component}",
   "packages": {
     "packages/crypto": {},
+    "packages/interface": {},
     "packages/interface-compliance-tests": {},
-    "packages/interface-compliance-tests-connection": {},
-    "packages/interface-compliance-tests-connection-encrypter": {},
-    "packages/interface-compliance-tests-peer-discovery": {},
-    "packages/interface-compliance-tests-stream-muxer": {},
-    "packages/interface-compliance-tests-transport": {},
-    "packages/interface-libp2p": {},
-    "packages/interface-mocks": {},
+    "packages/interface-internal": {},
     "packages/interface-peer-id": {},
     "packages/kad-dht": {},
     "packages/keychain": {},

README.md

@@ -146,7 +146,7 @@ List of packages currently in existence for libp2p
 | ---------|---------|---------|---------|--------- |
 | **libp2p** |
 | [`libp2p`](//github.com/libp2p/js-libp2p) | [![npm](https://img.shields.io/npm/v/libp2p.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p/releases) | [![Deps](https://img.shields.io/librariesio/release/npm/libp2p?logo=Libraries.io&logoColor=white&style=flat-square)](//libraries.io/npm/libp2p) | [![GitHub CI](https://img.shields.io/github/actions/workflow/status/libp2p/js-libp2p/main.yml?branch=master&label=ci&style=flat-square)](//github.com/libp2p/js-libp2p/actions?query=branch%3Amaster+workflow%3Aci+) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p/branch/master/graph/badge.svg?style=flat-square)](https://codecov.io/gh/libp2p/js-libp2p) |
-| [`@libp2p/interface-libp2p`](//github.com/libp2p/js-libp2p-interfaces) | [![npm](https://img.shields.io/npm/v/%40libp2p%2Finterface-libp2p.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-interfaces/releases) | [![Deps](https://img.shields.io/librariesio/release/npm/%40libp2p%2Finterface-libp2p?logo=Libraries.io&logoColor=white&style=flat-square)](//libraries.io/npm/%40libp2p%2Finterface-libp2p) | [![GitHub CI](https://img.shields.io/github/actions/workflow/status/libp2p/js-libp2p-interfaces/js-test-and-release.yml?branch=master&label=ci&style=flat-square)](//github.com/libp2p/js-libp2p-interfaces/actions?query=branch%3Amaster+workflow%3Aci+) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-interfaces/branch/master/graph/badge.svg?style=flat-square)](https://codecov.io/gh/libp2p/js-libp2p-interfaces) |
+| [`@libp2p/interface`](//github.com/libp2p/js-libp2p-interfaces) | [![npm](https://img.shields.io/npm/v/%40libp2p%2Finterface-libp2p.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-interfaces/releases) | [![Deps](https://img.shields.io/librariesio/release/npm/%40libp2p%2Finterface-libp2p?logo=Libraries.io&logoColor=white&style=flat-square)](//libraries.io/npm/%40libp2p%2Finterface-libp2p) | [![GitHub CI](https://img.shields.io/github/actions/workflow/status/libp2p/js-libp2p-interfaces/js-test-and-release.yml?branch=master&label=ci&style=flat-square)](//github.com/libp2p/js-libp2p-interfaces/actions?query=branch%3Amaster+workflow%3Aci+) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-interfaces/branch/master/graph/badge.svg?style=flat-square)](https://codecov.io/gh/libp2p/js-libp2p-interfaces) |
 | **transports** |
 | [`@libp2p/tcp`](//github.com/libp2p/js-libp2p-tcp) | [![npm](https://img.shields.io/npm/v/%40libp2p%2Ftcp.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-tcp/releases) | [![Deps](https://img.shields.io/librariesio/release/npm/%40libp2p%2Ftcp?logo=Libraries.io&logoColor=white&style=flat-square)](//libraries.io/npm/%40libp2p%2Ftcp) | [![GitHub CI](https://img.shields.io/github/actions/workflow/status/libp2p/js-libp2p-tcp/js-test-and-release.yml?branch=master&label=ci&style=flat-square)](//github.com/libp2p/js-libp2p-tcp/actions?query=branch%3Amaster+workflow%3Aci+) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-tcp/branch/master/graph/badge.svg?style=flat-square)](https://codecov.io/gh/libp2p/js-libp2p-tcp) |
 | [`@libp2p/webrtc`](//github.com/libp2p/js-libp2p-webrtc) | [![npm](https://img.shields.io/npm/v/%40libp2p%2Fwebrtc.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-webrtc/releases) | [![Deps](https://img.shields.io/librariesio/release/npm/%40libp2p%2Fwebrtc?logo=Libraries.io&logoColor=white&style=flat-square)](//libraries.io/npm/%40libp2p%2Fwebrtc) | [![GitHub CI](https://img.shields.io/github/actions/workflow/status/libp2p/js-libp2p-webrtc/js-test-and-release.yml?branch=main&label=ci&style=flat-square)](//github.com/libp2p/js-libp2p-webrtc/actions?query=branch%3Amain+workflow%3Aci+) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-webrtc/branch/master/graph/badge.svg?style=flat-square)](https://codecov.io/gh/libp2p/js-libp2p-webrtc) |

doc/CONFIGURATION.md

@@ -788,7 +788,7 @@ import { tcp } from '@libp2p/tcp'
 import { mplex } from '@libp2p/mplex'
 import { yamux } from '@chainsafe/libp2p-yamux'
 import { noise } from '@chainsafe/libp2p-noise'
-import { FaultTolerance } from '@libp2p/interface-libp2p/transport'
+import { FaultTolerance } from '@libp2p/interface/transport'
 
 const node = await createLibp2p({
   transports: [

doc/METRICS.md

@@ -65,7 +65,7 @@ const node = await createLibp2p({
 To define component metrics first get a reference to the metrics object:
 
 ```ts
-import type { Metrics } from '@libp2p/interface-libp2p/metrics'
+import type { Metrics } from '@libp2p/interface/metrics'
 
 interface MyClassComponents {
   metrics: Metrics

packages/crypto/package.json

@@ -89,10 +89,10 @@
     "generate": "protons ./src/keys/keys.proto"
   },
   "dependencies": {
-    "@libp2p/interface-libp2p": "^3.2.0",
+    "@libp2p/interface": "~0.0.1",
     "@noble/ed25519": "^1.6.0",
     "@noble/secp256k1": "^1.5.4",
-    "multiformats": "^11.0.2",
+    "multiformats": "^12.0.1",
     "node-forge": "^1.1.0",
     "protons-runtime": "^5.0.0",
     "uint8arraylist": "^2.4.3",

packages/crypto/src/aes/cipher-mode.ts

@@ -1,4 +1,4 @@
-import { CodeError } from '@libp2p/interface-libp2p/errors'
+import { CodeError } from '@libp2p/interface/errors'
 
 const CIPHER_MODES = {
   16: 'aes-128-ctr',

packages/crypto/src/keys/ecdh-browser.ts

@@ -1,4 +1,4 @@
-import { CodeError } from '@libp2p/interface-libp2p/errors'
+import { CodeError } from '@libp2p/interface/errors'
 import { concat as uint8ArrayConcat } from 'uint8arrays/concat'
 import { equals as uint8ArrayEquals } from 'uint8arrays/equals'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'

packages/crypto/src/keys/ecdh.ts

@@ -1,5 +1,5 @@
 import crypto from 'crypto'
-import { CodeError } from '@libp2p/interface-libp2p/errors'
+import { CodeError } from '@libp2p/interface/errors'
 import type { ECDHKey, ECDHKeyPair } from './interface.js'
 
 const curves = {

packages/crypto/src/keys/ed25519-class.ts

@@ -1,4 +1,4 @@
-import { CodeError } from '@libp2p/interface-libp2p/errors'
+import { CodeError } from '@libp2p/interface/errors'
 import { base58btc } from 'multiformats/bases/base58'
 import { identity } from 'multiformats/hashes/identity'
 import { sha256 } from 'multiformats/hashes/sha2'

packages/crypto/src/keys/index.ts

@@ -1,6 +1,6 @@
 import 'node-forge/lib/asn1.js'
 import 'node-forge/lib/pbe.js'
-import { CodeError } from '@libp2p/interface-libp2p/errors'
+import { CodeError } from '@libp2p/interface/errors'
 // @ts-expect-error types are missing
 import forge from 'node-forge/lib/forge.js'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
@@ -11,7 +11,7 @@ import { keyStretcher } from './key-stretcher.js'
 import * as keysPBM from './keys.js'
 import * as RSA from './rsa-class.js'
 import * as Secp256k1 from './secp256k1-class.js'
-import type { PrivateKey, PublicKey } from '@libp2p/interface-libp2p/keys'
+import type { PrivateKey, PublicKey } from '@libp2p/interface/keys'
 
 export { keyStretcher }
 export { generateEphemeralKeyPair }

packages/crypto/src/keys/key-stretcher.ts

@@ -1,4 +1,4 @@
-import { CodeError } from '@libp2p/interface-libp2p/errors'
+import { CodeError } from '@libp2p/interface/errors'
 import { concat as uint8ArrayConcat } from 'uint8arrays/concat'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import * as hmac from '../hmac/index.js'

packages/crypto/src/keys/rsa-browser.ts

@@ -1,4 +1,4 @@
-import { CodeError } from '@libp2p/interface-libp2p/errors'
+import { CodeError } from '@libp2p/interface/errors'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
 import randomBytes from '../random-bytes.js'

packages/crypto/src/keys/rsa-class.ts

@@ -1,5 +1,5 @@
 
-import { CodeError } from '@libp2p/interface-libp2p/errors'
+import { CodeError } from '@libp2p/interface/errors'
 import { sha256 } from 'multiformats/hashes/sha2'
 // @ts-expect-error types are missing
 import forge from 'node-forge/lib/forge.js'

packages/crypto/src/keys/rsa-utils.ts

@@ -1,6 +1,6 @@
 import 'node-forge/lib/asn1.js'
 import 'node-forge/lib/rsa.js'
-import { CodeError } from '@libp2p/interface-libp2p/errors'
+import { CodeError } from '@libp2p/interface/errors'
 // @ts-expect-error types are missing
 import forge from 'node-forge/lib/forge.js'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'

packages/crypto/src/keys/rsa.ts

@@ -1,6 +1,6 @@
 import crypto from 'crypto'
 import { promisify } from 'util'
-import { CodeError } from '@libp2p/interface-libp2p/errors'
+import { CodeError } from '@libp2p/interface/errors'
 import randomBytes from '../random-bytes.js'
 import * as utils from './rsa-utils.js'
 import type { JWKKeyPair } from './interface.js'

packages/crypto/src/keys/secp256k1-class.ts

@@ -1,4 +1,4 @@
-import { CodeError } from '@libp2p/interface-libp2p/errors'
+import { CodeError } from '@libp2p/interface/errors'
 import { sha256 } from 'multiformats/hashes/sha2'
 import { equals as uint8ArrayEquals } from 'uint8arrays/equals'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'

packages/crypto/src/keys/secp256k1.ts

@@ -1,4 +1,4 @@
-import { CodeError } from '@libp2p/interface-libp2p/errors'
+import { CodeError } from '@libp2p/interface/errors'
 import * as secp from '@noble/secp256k1'
 import { sha256 } from 'multiformats/hashes/sha2'
 

packages/crypto/src/pbkdf2.ts

@@ -1,4 +1,4 @@
-import { CodeError } from '@libp2p/interface-libp2p/errors'
+import { CodeError } from '@libp2p/interface/errors'
 // @ts-expect-error types are missing
 import forgePbkdf2 from 'node-forge/lib/pbkdf2.js'
 // @ts-expect-error types are missing

packages/crypto/src/random-bytes.ts

@@ -1,4 +1,4 @@
-import { CodeError } from '@libp2p/interface-libp2p/errors'
+import { CodeError } from '@libp2p/interface/errors'
 import { utils } from '@noble/secp256k1'
 
 export default function randomBytes (length: number): Uint8Array {

packages/crypto/tsconfig.json

@@ -9,7 +9,7 @@
   ],
   "references": [
     {
-      "path": "../interface-libp2p"
+      "path": "../interface"
     }
   ]
 }