From fa9a41b21cfa7a2f58ebe29aa8e8412a84ceaadb Mon Sep 17 00:00:00 2001 From: achingbrain Date: Tue, 4 Jan 2022 11:34:40 +0100 Subject: [PATCH 1/2] feat: update package names Publish typescript packages under the `@libp2p` org on npm --- packages/libp2p-connection/package.json | 10 +++++----- .../CHANGELOG.md | 0 .../LICENSE | 0 .../LICENSE-APACHE | 0 .../LICENSE-MIT | 0 .../README.md | 0 .../package.json | 16 ++++++++-------- .../src/connection/README.md | 0 .../src/connection/connection.ts | 0 .../src/connection/index.ts | 0 .../src/crypto/index.ts | 0 .../src/index.ts | 0 .../src/peer-discovery/index.ts | 0 .../src/pubsub/api.ts | 0 .../src/pubsub/connection-handlers.ts | 0 .../src/pubsub/emit-self.ts | 0 .../src/pubsub/index.ts | 0 .../src/pubsub/messages.ts | 0 .../src/pubsub/multiple-nodes.ts | 0 .../src/pubsub/two-nodes.ts | 0 .../src/pubsub/utils.ts | 0 .../src/record/index.ts | 0 .../src/stream-muxer/base-test.ts | 0 .../src/stream-muxer/close-test.ts | 0 .../src/stream-muxer/index.ts | 0 .../src/stream-muxer/mega-stress-test.ts | 0 .../src/stream-muxer/spawner.ts | 0 .../src/stream-muxer/stress-test.ts | 0 .../src/topology/multicodec-topology.ts | 0 .../src/topology/topology.ts | 0 .../src/transport/dial-test.ts | 0 .../src/transport/filter-test.ts | 0 .../src/transport/index.ts | 0 .../src/transport/listen-test.ts | 0 .../src/transport/utils/index.ts | 0 .../src/utils/peers.ts | 0 .../test/connection/index.spec.ts | 0 .../test/crypto/index.spec.ts | 0 .../test/crypto/mock-crypto.ts | 0 .../test/peer-discovery/index.spec.ts | 0 .../test/peer-discovery/mock-discovery.ts | 0 .../test/topology/mock-peer-store.ts | 0 .../test/topology/multicodec-topology.spec.ts | 0 .../test/topology/topology.spec.ts | 0 .../tsconfig.json | 0 packages/libp2p-interfaces/package.json | 4 ++-- packages/libp2p-peer-id-factory/package.json | 8 ++++---- packages/libp2p-peer-id/package.json | 6 +++--- packages/libp2p-pubsub/package.json | 12 ++++++------ packages/libp2p-topology/package.json | 6 +++--- 50 files changed, 31 insertions(+), 31 deletions(-) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/CHANGELOG.md (100%) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/LICENSE (100%) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/LICENSE-APACHE (100%) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/LICENSE-MIT (100%) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/README.md (100%) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/package.json (91%) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/src/connection/README.md (100%) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/src/connection/connection.ts (100%) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/src/connection/index.ts (100%) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/src/crypto/index.ts (100%) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/src/index.ts (100%) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/src/peer-discovery/index.ts (100%) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/src/pubsub/api.ts (100%) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/src/pubsub/connection-handlers.ts (100%) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/src/pubsub/emit-self.ts (100%) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/src/pubsub/index.ts (100%) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/src/pubsub/messages.ts (100%) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/src/pubsub/multiple-nodes.ts (100%) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/src/pubsub/two-nodes.ts (100%) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/src/pubsub/utils.ts (100%) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/src/record/index.ts (100%) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/src/stream-muxer/base-test.ts (100%) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/src/stream-muxer/close-test.ts (100%) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/src/stream-muxer/index.ts (100%) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/src/stream-muxer/mega-stress-test.ts (100%) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/src/stream-muxer/spawner.ts (100%) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/src/stream-muxer/stress-test.ts (100%) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/src/topology/multicodec-topology.ts (100%) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/src/topology/topology.ts (100%) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/src/transport/dial-test.ts (100%) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/src/transport/filter-test.ts (100%) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/src/transport/index.ts (100%) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/src/transport/listen-test.ts (100%) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/src/transport/utils/index.ts (100%) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/src/utils/peers.ts (100%) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/test/connection/index.spec.ts (100%) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/test/crypto/index.spec.ts (100%) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/test/crypto/mock-crypto.ts (100%) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/test/peer-discovery/index.spec.ts (100%) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/test/peer-discovery/mock-discovery.ts (100%) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/test/topology/mock-peer-store.ts (100%) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/test/topology/multicodec-topology.spec.ts (100%) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/test/topology/topology.spec.ts (100%) rename packages/{libp2p-interfaces-compliance-tests => libp2p-interface-compliance-tests}/tsconfig.json (100%) diff --git a/packages/libp2p-connection/package.json b/packages/libp2p-connection/package.json index b49a6cb26..3c4e0ca57 100644 --- a/packages/libp2p-connection/package.json +++ b/packages/libp2p-connection/package.json @@ -1,6 +1,6 @@ { - "name": "libp2p-connection", - "version": "0.3.1", + "name": "@libp2p/connection", + "version": "0.1.0", "description": "JS Libp2p connections", "type": "module", "files": [ @@ -43,13 +43,13 @@ }, "homepage": "https://github.com/libp2p/js-libp2p-interfaces/tree/master/packages/libp2p-connection#readme", "dependencies": { + "@libp2p/interfaces": "^0.1.0", "err-code": "^3.0.1", - "libp2p-interfaces": "^3.1.1", "multiaddr": "^10.0.1" }, "devDependencies": { - "aegir": "^36.0.0", - "libp2p-peer-id-factory": "^0.2.1" + "@libp2p/peer-id-factory": "^0.1.0", + "aegir": "^36.0.0" }, "exports": { ".": { diff --git a/packages/libp2p-interfaces-compliance-tests/CHANGELOG.md b/packages/libp2p-interface-compliance-tests/CHANGELOG.md similarity index 100% rename from packages/libp2p-interfaces-compliance-tests/CHANGELOG.md rename to packages/libp2p-interface-compliance-tests/CHANGELOG.md diff --git a/packages/libp2p-interfaces-compliance-tests/LICENSE b/packages/libp2p-interface-compliance-tests/LICENSE similarity index 100% rename from packages/libp2p-interfaces-compliance-tests/LICENSE rename to packages/libp2p-interface-compliance-tests/LICENSE diff --git a/packages/libp2p-interfaces-compliance-tests/LICENSE-APACHE b/packages/libp2p-interface-compliance-tests/LICENSE-APACHE similarity index 100% rename from packages/libp2p-interfaces-compliance-tests/LICENSE-APACHE rename to packages/libp2p-interface-compliance-tests/LICENSE-APACHE diff --git a/packages/libp2p-interfaces-compliance-tests/LICENSE-MIT b/packages/libp2p-interface-compliance-tests/LICENSE-MIT similarity index 100% rename from packages/libp2p-interfaces-compliance-tests/LICENSE-MIT rename to packages/libp2p-interface-compliance-tests/LICENSE-MIT diff --git a/packages/libp2p-interfaces-compliance-tests/README.md b/packages/libp2p-interface-compliance-tests/README.md similarity index 100% rename from packages/libp2p-interfaces-compliance-tests/README.md rename to packages/libp2p-interface-compliance-tests/README.md diff --git a/packages/libp2p-interfaces-compliance-tests/package.json b/packages/libp2p-interface-compliance-tests/package.json similarity index 91% rename from packages/libp2p-interfaces-compliance-tests/package.json rename to packages/libp2p-interface-compliance-tests/package.json index d13ebc484..334c4b4fc 100644 --- a/packages/libp2p-interfaces-compliance-tests/package.json +++ b/packages/libp2p-interface-compliance-tests/package.json @@ -1,6 +1,6 @@ { - "name": "libp2p-interfaces-compliance-tests", - "version": "3.1.1", + "name": "@libp2p/interface-compliance-tests", + "version": "0.1.0", "description": "Compliance tests for JS libp2p interfaces", "type": "module", "files": [ @@ -41,6 +41,12 @@ }, "homepage": "https://github.com/libp2p/js-libp2p-interfaces/tree/master/packages/libp2p-interfaces-compliance-tests#readme", "dependencies": { + "@libp2p/connection": "^0.1.0", + "@libp2p/interfaces": "^0.1.0", + "@libp2p/peer-id": "^0.1.0", + "@libp2p/peer-id-factory": "^0.1.0", + "@libp2p/pubsub": "^0.1.0", + "@libp2p/topology": "^0.1.0", "abort-controller": "^3.0.0", "abortable-iterator": "^3.0.0", "aegir": "^36.0.0", @@ -50,13 +56,7 @@ "it-goodbye": "^3.0.0", "it-pair": "^1.0.0", "it-pipe": "^1.1.0", - "libp2p-connection": "^0.3.1", "libp2p-crypto": "^0.21.0", - "libp2p-interfaces": "^3.1.1", - "libp2p-peer-id": "^0.2.0", - "libp2p-peer-id-factory": "^0.2.1", - "libp2p-pubsub": "^0.9.1", - "libp2p-topology": "^0.3.1", "multiaddr": "^10.0.0", "multiformats": "^9.4.10", "p-defer": "^3.0.0", diff --git a/packages/libp2p-interfaces-compliance-tests/src/connection/README.md b/packages/libp2p-interface-compliance-tests/src/connection/README.md similarity index 100% rename from packages/libp2p-interfaces-compliance-tests/src/connection/README.md rename to packages/libp2p-interface-compliance-tests/src/connection/README.md diff --git a/packages/libp2p-interfaces-compliance-tests/src/connection/connection.ts b/packages/libp2p-interface-compliance-tests/src/connection/connection.ts similarity index 100% rename from packages/libp2p-interfaces-compliance-tests/src/connection/connection.ts rename to packages/libp2p-interface-compliance-tests/src/connection/connection.ts diff --git a/packages/libp2p-interfaces-compliance-tests/src/connection/index.ts b/packages/libp2p-interface-compliance-tests/src/connection/index.ts similarity index 100% rename from packages/libp2p-interfaces-compliance-tests/src/connection/index.ts rename to packages/libp2p-interface-compliance-tests/src/connection/index.ts diff --git a/packages/libp2p-interfaces-compliance-tests/src/crypto/index.ts b/packages/libp2p-interface-compliance-tests/src/crypto/index.ts similarity index 100% rename from packages/libp2p-interfaces-compliance-tests/src/crypto/index.ts rename to packages/libp2p-interface-compliance-tests/src/crypto/index.ts diff --git a/packages/libp2p-interfaces-compliance-tests/src/index.ts b/packages/libp2p-interface-compliance-tests/src/index.ts similarity index 100% rename from packages/libp2p-interfaces-compliance-tests/src/index.ts rename to packages/libp2p-interface-compliance-tests/src/index.ts diff --git a/packages/libp2p-interfaces-compliance-tests/src/peer-discovery/index.ts b/packages/libp2p-interface-compliance-tests/src/peer-discovery/index.ts similarity index 100% rename from packages/libp2p-interfaces-compliance-tests/src/peer-discovery/index.ts rename to packages/libp2p-interface-compliance-tests/src/peer-discovery/index.ts diff --git a/packages/libp2p-interfaces-compliance-tests/src/pubsub/api.ts b/packages/libp2p-interface-compliance-tests/src/pubsub/api.ts similarity index 100% rename from packages/libp2p-interfaces-compliance-tests/src/pubsub/api.ts rename to packages/libp2p-interface-compliance-tests/src/pubsub/api.ts diff --git a/packages/libp2p-interfaces-compliance-tests/src/pubsub/connection-handlers.ts b/packages/libp2p-interface-compliance-tests/src/pubsub/connection-handlers.ts similarity index 100% rename from packages/libp2p-interfaces-compliance-tests/src/pubsub/connection-handlers.ts rename to packages/libp2p-interface-compliance-tests/src/pubsub/connection-handlers.ts diff --git a/packages/libp2p-interfaces-compliance-tests/src/pubsub/emit-self.ts b/packages/libp2p-interface-compliance-tests/src/pubsub/emit-self.ts similarity index 100% rename from packages/libp2p-interfaces-compliance-tests/src/pubsub/emit-self.ts rename to packages/libp2p-interface-compliance-tests/src/pubsub/emit-self.ts diff --git a/packages/libp2p-interfaces-compliance-tests/src/pubsub/index.ts b/packages/libp2p-interface-compliance-tests/src/pubsub/index.ts similarity index 100% rename from packages/libp2p-interfaces-compliance-tests/src/pubsub/index.ts rename to packages/libp2p-interface-compliance-tests/src/pubsub/index.ts diff --git a/packages/libp2p-interfaces-compliance-tests/src/pubsub/messages.ts b/packages/libp2p-interface-compliance-tests/src/pubsub/messages.ts similarity index 100% rename from packages/libp2p-interfaces-compliance-tests/src/pubsub/messages.ts rename to packages/libp2p-interface-compliance-tests/src/pubsub/messages.ts diff --git a/packages/libp2p-interfaces-compliance-tests/src/pubsub/multiple-nodes.ts b/packages/libp2p-interface-compliance-tests/src/pubsub/multiple-nodes.ts similarity index 100% rename from packages/libp2p-interfaces-compliance-tests/src/pubsub/multiple-nodes.ts rename to packages/libp2p-interface-compliance-tests/src/pubsub/multiple-nodes.ts diff --git a/packages/libp2p-interfaces-compliance-tests/src/pubsub/two-nodes.ts b/packages/libp2p-interface-compliance-tests/src/pubsub/two-nodes.ts similarity index 100% rename from packages/libp2p-interfaces-compliance-tests/src/pubsub/two-nodes.ts rename to packages/libp2p-interface-compliance-tests/src/pubsub/two-nodes.ts diff --git a/packages/libp2p-interfaces-compliance-tests/src/pubsub/utils.ts b/packages/libp2p-interface-compliance-tests/src/pubsub/utils.ts similarity index 100% rename from packages/libp2p-interfaces-compliance-tests/src/pubsub/utils.ts rename to packages/libp2p-interface-compliance-tests/src/pubsub/utils.ts diff --git a/packages/libp2p-interfaces-compliance-tests/src/record/index.ts b/packages/libp2p-interface-compliance-tests/src/record/index.ts similarity index 100% rename from packages/libp2p-interfaces-compliance-tests/src/record/index.ts rename to packages/libp2p-interface-compliance-tests/src/record/index.ts diff --git a/packages/libp2p-interfaces-compliance-tests/src/stream-muxer/base-test.ts b/packages/libp2p-interface-compliance-tests/src/stream-muxer/base-test.ts similarity index 100% rename from packages/libp2p-interfaces-compliance-tests/src/stream-muxer/base-test.ts rename to packages/libp2p-interface-compliance-tests/src/stream-muxer/base-test.ts diff --git a/packages/libp2p-interfaces-compliance-tests/src/stream-muxer/close-test.ts b/packages/libp2p-interface-compliance-tests/src/stream-muxer/close-test.ts similarity index 100% rename from packages/libp2p-interfaces-compliance-tests/src/stream-muxer/close-test.ts rename to packages/libp2p-interface-compliance-tests/src/stream-muxer/close-test.ts diff --git a/packages/libp2p-interfaces-compliance-tests/src/stream-muxer/index.ts b/packages/libp2p-interface-compliance-tests/src/stream-muxer/index.ts similarity index 100% rename from packages/libp2p-interfaces-compliance-tests/src/stream-muxer/index.ts rename to packages/libp2p-interface-compliance-tests/src/stream-muxer/index.ts diff --git a/packages/libp2p-interfaces-compliance-tests/src/stream-muxer/mega-stress-test.ts b/packages/libp2p-interface-compliance-tests/src/stream-muxer/mega-stress-test.ts similarity index 100% rename from packages/libp2p-interfaces-compliance-tests/src/stream-muxer/mega-stress-test.ts rename to packages/libp2p-interface-compliance-tests/src/stream-muxer/mega-stress-test.ts diff --git a/packages/libp2p-interfaces-compliance-tests/src/stream-muxer/spawner.ts b/packages/libp2p-interface-compliance-tests/src/stream-muxer/spawner.ts similarity index 100% rename from packages/libp2p-interfaces-compliance-tests/src/stream-muxer/spawner.ts rename to packages/libp2p-interface-compliance-tests/src/stream-muxer/spawner.ts diff --git a/packages/libp2p-interfaces-compliance-tests/src/stream-muxer/stress-test.ts b/packages/libp2p-interface-compliance-tests/src/stream-muxer/stress-test.ts similarity index 100% rename from packages/libp2p-interfaces-compliance-tests/src/stream-muxer/stress-test.ts rename to packages/libp2p-interface-compliance-tests/src/stream-muxer/stress-test.ts diff --git a/packages/libp2p-interfaces-compliance-tests/src/topology/multicodec-topology.ts b/packages/libp2p-interface-compliance-tests/src/topology/multicodec-topology.ts similarity index 100% rename from packages/libp2p-interfaces-compliance-tests/src/topology/multicodec-topology.ts rename to packages/libp2p-interface-compliance-tests/src/topology/multicodec-topology.ts diff --git a/packages/libp2p-interfaces-compliance-tests/src/topology/topology.ts b/packages/libp2p-interface-compliance-tests/src/topology/topology.ts similarity index 100% rename from packages/libp2p-interfaces-compliance-tests/src/topology/topology.ts rename to packages/libp2p-interface-compliance-tests/src/topology/topology.ts diff --git a/packages/libp2p-interfaces-compliance-tests/src/transport/dial-test.ts b/packages/libp2p-interface-compliance-tests/src/transport/dial-test.ts similarity index 100% rename from packages/libp2p-interfaces-compliance-tests/src/transport/dial-test.ts rename to packages/libp2p-interface-compliance-tests/src/transport/dial-test.ts diff --git a/packages/libp2p-interfaces-compliance-tests/src/transport/filter-test.ts b/packages/libp2p-interface-compliance-tests/src/transport/filter-test.ts similarity index 100% rename from packages/libp2p-interfaces-compliance-tests/src/transport/filter-test.ts rename to packages/libp2p-interface-compliance-tests/src/transport/filter-test.ts diff --git a/packages/libp2p-interfaces-compliance-tests/src/transport/index.ts b/packages/libp2p-interface-compliance-tests/src/transport/index.ts similarity index 100% rename from packages/libp2p-interfaces-compliance-tests/src/transport/index.ts rename to packages/libp2p-interface-compliance-tests/src/transport/index.ts diff --git a/packages/libp2p-interfaces-compliance-tests/src/transport/listen-test.ts b/packages/libp2p-interface-compliance-tests/src/transport/listen-test.ts similarity index 100% rename from packages/libp2p-interfaces-compliance-tests/src/transport/listen-test.ts rename to packages/libp2p-interface-compliance-tests/src/transport/listen-test.ts diff --git a/packages/libp2p-interfaces-compliance-tests/src/transport/utils/index.ts b/packages/libp2p-interface-compliance-tests/src/transport/utils/index.ts similarity index 100% rename from packages/libp2p-interfaces-compliance-tests/src/transport/utils/index.ts rename to packages/libp2p-interface-compliance-tests/src/transport/utils/index.ts diff --git a/packages/libp2p-interfaces-compliance-tests/src/utils/peers.ts b/packages/libp2p-interface-compliance-tests/src/utils/peers.ts similarity index 100% rename from packages/libp2p-interfaces-compliance-tests/src/utils/peers.ts rename to packages/libp2p-interface-compliance-tests/src/utils/peers.ts diff --git a/packages/libp2p-interfaces-compliance-tests/test/connection/index.spec.ts b/packages/libp2p-interface-compliance-tests/test/connection/index.spec.ts similarity index 100% rename from packages/libp2p-interfaces-compliance-tests/test/connection/index.spec.ts rename to packages/libp2p-interface-compliance-tests/test/connection/index.spec.ts diff --git a/packages/libp2p-interfaces-compliance-tests/test/crypto/index.spec.ts b/packages/libp2p-interface-compliance-tests/test/crypto/index.spec.ts similarity index 100% rename from packages/libp2p-interfaces-compliance-tests/test/crypto/index.spec.ts rename to packages/libp2p-interface-compliance-tests/test/crypto/index.spec.ts diff --git a/packages/libp2p-interfaces-compliance-tests/test/crypto/mock-crypto.ts b/packages/libp2p-interface-compliance-tests/test/crypto/mock-crypto.ts similarity index 100% rename from packages/libp2p-interfaces-compliance-tests/test/crypto/mock-crypto.ts rename to packages/libp2p-interface-compliance-tests/test/crypto/mock-crypto.ts diff --git a/packages/libp2p-interfaces-compliance-tests/test/peer-discovery/index.spec.ts b/packages/libp2p-interface-compliance-tests/test/peer-discovery/index.spec.ts similarity index 100% rename from packages/libp2p-interfaces-compliance-tests/test/peer-discovery/index.spec.ts rename to packages/libp2p-interface-compliance-tests/test/peer-discovery/index.spec.ts diff --git a/packages/libp2p-interfaces-compliance-tests/test/peer-discovery/mock-discovery.ts b/packages/libp2p-interface-compliance-tests/test/peer-discovery/mock-discovery.ts similarity index 100% rename from packages/libp2p-interfaces-compliance-tests/test/peer-discovery/mock-discovery.ts rename to packages/libp2p-interface-compliance-tests/test/peer-discovery/mock-discovery.ts diff --git a/packages/libp2p-interfaces-compliance-tests/test/topology/mock-peer-store.ts b/packages/libp2p-interface-compliance-tests/test/topology/mock-peer-store.ts similarity index 100% rename from packages/libp2p-interfaces-compliance-tests/test/topology/mock-peer-store.ts rename to packages/libp2p-interface-compliance-tests/test/topology/mock-peer-store.ts diff --git a/packages/libp2p-interfaces-compliance-tests/test/topology/multicodec-topology.spec.ts b/packages/libp2p-interface-compliance-tests/test/topology/multicodec-topology.spec.ts similarity index 100% rename from packages/libp2p-interfaces-compliance-tests/test/topology/multicodec-topology.spec.ts rename to packages/libp2p-interface-compliance-tests/test/topology/multicodec-topology.spec.ts diff --git a/packages/libp2p-interfaces-compliance-tests/test/topology/topology.spec.ts b/packages/libp2p-interface-compliance-tests/test/topology/topology.spec.ts similarity index 100% rename from packages/libp2p-interfaces-compliance-tests/test/topology/topology.spec.ts rename to packages/libp2p-interface-compliance-tests/test/topology/topology.spec.ts diff --git a/packages/libp2p-interfaces-compliance-tests/tsconfig.json b/packages/libp2p-interface-compliance-tests/tsconfig.json similarity index 100% rename from packages/libp2p-interfaces-compliance-tests/tsconfig.json rename to packages/libp2p-interface-compliance-tests/tsconfig.json diff --git a/packages/libp2p-interfaces/package.json b/packages/libp2p-interfaces/package.json index 52d1e96b9..ee24297cd 100644 --- a/packages/libp2p-interfaces/package.json +++ b/packages/libp2p-interfaces/package.json @@ -1,6 +1,6 @@ { - "name": "libp2p-interfaces", - "version": "3.1.1", + "name": "@libp2p/interfaces", + "version": "0.1.0", "description": "Interfaces for JS Libp2p", "type": "module", "files": [ diff --git a/packages/libp2p-peer-id-factory/package.json b/packages/libp2p-peer-id-factory/package.json index 3bc1c3bbb..2c4b1f8b5 100644 --- a/packages/libp2p-peer-id-factory/package.json +++ b/packages/libp2p-peer-id-factory/package.json @@ -1,6 +1,6 @@ { - "name": "libp2p-peer-id-factory", - "version": "0.2.1", + "name": "@libp2p/peer-id-factory", + "version": "0.1.0", "description": "IPFS Peer Id implementation in Node.js", "type": "module", "types": "./dist/src/index.d.ts", @@ -68,9 +68,9 @@ "util": "^0.12.3" }, "dependencies": { + "@libp2p/interfaces": "^0.1.0", + "@libp2p/peer-id": "^0.1.0", "libp2p-crypto": "^0.21.0", - "libp2p-interfaces": "^3.1.1", - "libp2p-peer-id": "^0.2.0", "multiformats": "^9.4.5", "protobufjs": "^6.10.2", "uint8arrays": "^3.0.0" diff --git a/packages/libp2p-peer-id/package.json b/packages/libp2p-peer-id/package.json index 5935bf1a8..e3d3f5d1d 100644 --- a/packages/libp2p-peer-id/package.json +++ b/packages/libp2p-peer-id/package.json @@ -1,6 +1,6 @@ { - "name": "libp2p-peer-id", - "version": "0.2.0", + "name": "@libp2p/peer-id", + "version": "0.1.0", "description": "IPFS Peer Id implementation in Node.js", "type": "module", "types": "./dist/src/index.d.ts", @@ -52,7 +52,7 @@ "aegir": "^36.0.1" }, "dependencies": { - "libp2p-interfaces": "^2.0.2", + "@libp2p/interfaces": "^0.1.0", "multiformats": "^9.4.5", "uint8arrays": "^3.0.0" } diff --git a/packages/libp2p-pubsub/package.json b/packages/libp2p-pubsub/package.json index 985514a3f..45cf5c8d6 100644 --- a/packages/libp2p-pubsub/package.json +++ b/packages/libp2p-pubsub/package.json @@ -1,6 +1,6 @@ { - "name": "libp2p-pubsub", - "version": "0.9.1", + "name": "@libp2p/pubsub", + "version": "0.1.0", "description": "libp2p pubsub base class", "type": "module", "files": [ @@ -53,16 +53,16 @@ }, "homepage": "https://github.com/libp2p/js-libp2p-interfaces/tree/master/packages/libp2p-pubsub#readme", "dependencies": { + "@libp2p/interfaces": "^0.1.0", + "@libp2p/peer-id": "^0.1.0", + "@libp2p/peer-id-factory": "^0.1.0", + "@libp2p/topology": "^0.1.0", "debug": "^4.3.2", "err-code": "^3.0.1", "iso-random-stream": "^2.0.0", "it-length-prefixed": "^5.0.3", "it-pipe": "^1.1.0", "libp2p-crypto": "^0.21.0", - "libp2p-interfaces": "^3.1.1", - "libp2p-peer-id": "^0.2.0", - "libp2p-peer-id-factory": "^0.2.1", - "libp2p-topology": "^0.3.1", "multiaddr": "^10.0.1", "multiformats": "^9.4.10", "p-queue": "^7.1.0", diff --git a/packages/libp2p-topology/package.json b/packages/libp2p-topology/package.json index 91da64c1a..e065d371f 100644 --- a/packages/libp2p-topology/package.json +++ b/packages/libp2p-topology/package.json @@ -1,6 +1,6 @@ { - "name": "libp2p-topology", - "version": "0.3.1", + "name": "@libp2p/topology", + "version": "0.1.0", "description": "libp2p network topology", "type": "module", "files": [ @@ -38,8 +38,8 @@ }, "homepage": "https://github.com/libp2p/js-libp2p-interfaces/tree/master/packages/libp2p-topography#readme", "dependencies": { + "@libp2p/interfaces": "^0.1.0", "err-code": "^3.0.1", - "libp2p-interfaces": "^3.1.1", "multiaddr": "^10.0.1" }, "devDependencies": { From 74086932009a83855dca60aa20f6e017a6a28e9c Mon Sep 17 00:00:00 2001 From: achingbrain Date: Tue, 4 Jan 2022 11:47:47 +0100 Subject: [PATCH 2/2] chore: update package names --- packages/libp2p-connection/README.md | 2 +- packages/libp2p-connection/src/index.ts | 8 ++++---- packages/libp2p-connection/test/index.spec.ts | 4 ++-- .../src/connection/connection.ts | 2 +- .../src/connection/index.ts | 2 +- .../src/crypto/index.ts | 8 ++++---- .../src/peer-discovery/index.ts | 4 ++-- .../src/pubsub/api.ts | 4 ++-- .../src/pubsub/connection-handlers.ts | 4 ++-- .../src/pubsub/emit-self.ts | 4 ++-- .../src/pubsub/index.ts | 4 ++-- .../src/pubsub/messages.ts | 10 +++++----- .../src/pubsub/multiple-nodes.ts | 4 ++-- .../src/pubsub/two-nodes.ts | 4 ++-- .../src/record/index.ts | 2 +- .../src/stream-muxer/base-test.ts | 2 +- .../src/stream-muxer/close-test.ts | 4 ++-- .../src/stream-muxer/index.ts | 2 +- .../src/stream-muxer/mega-stress-test.ts | 2 +- .../src/stream-muxer/spawner.ts | 2 +- .../src/stream-muxer/stress-test.ts | 2 +- .../src/topology/multicodec-topology.ts | 6 +++--- .../src/topology/topology.ts | 6 +++--- .../src/transport/dial-test.ts | 4 ++-- .../src/transport/filter-test.ts | 2 +- .../src/transport/index.ts | 2 +- .../src/transport/listen-test.ts | 4 ++-- .../src/transport/utils/index.ts | 10 +++++----- .../test/connection/index.spec.ts | 6 +++--- .../test/crypto/mock-crypto.ts | 6 +++--- .../test/peer-discovery/mock-discovery.ts | 2 +- .../test/topology/mock-peer-store.ts | 6 +++--- .../test/topology/multicodec-topology.spec.ts | 2 +- .../test/topology/topology.spec.ts | 2 +- packages/libp2p-peer-id-factory/README.md | 2 +- packages/libp2p-peer-id-factory/src/index.ts | 6 +++--- packages/libp2p-peer-id-factory/test/index.spec.ts | 2 +- packages/libp2p-peer-id/README.md | 2 +- packages/libp2p-pubsub/README.md | 2 +- packages/libp2p-pubsub/src/index.ts | 12 ++++++------ packages/libp2p-pubsub/src/message/sign.ts | 6 +++--- packages/libp2p-pubsub/src/peer-streams.ts | 4 ++-- packages/libp2p-pubsub/src/utils.ts | 4 ++-- packages/libp2p-pubsub/test/instance.spec.ts | 4 ++-- packages/libp2p-pubsub/test/lifesycle.spec.ts | 6 +++--- packages/libp2p-pubsub/test/message.spec.ts | 4 ++-- packages/libp2p-pubsub/test/pubsub.spec.ts | 2 +- packages/libp2p-pubsub/test/sign.spec.ts | 6 +++--- packages/libp2p-pubsub/test/topic-validators.spec.ts | 2 +- packages/libp2p-pubsub/test/utils/index.ts | 6 +++--- packages/libp2p-topology/README.md | 4 ++-- packages/libp2p-topology/src/index.ts | 6 +++--- packages/libp2p-topology/src/multicodec-topology.ts | 10 +++++----- 53 files changed, 114 insertions(+), 114 deletions(-) diff --git a/packages/libp2p-connection/README.md b/packages/libp2p-connection/README.md index de787b177..fa99846e7 100644 --- a/packages/libp2p-connection/README.md +++ b/packages/libp2p-connection/README.md @@ -15,7 +15,7 @@ npm i libp2p-connection ``` ```javascript -import { Connection } from 'libp2p-connection' +import { Connection } from '@libp2p/connection' const connection = new Connection({ ... }) const stream = connection.newStream([ '/my-protocol/v1.0.0' ]) diff --git a/packages/libp2p-connection/src/index.ts b/packages/libp2p-connection/src/index.ts index f71da7494..0c1fd0183 100644 --- a/packages/libp2p-connection/src/index.ts +++ b/packages/libp2p-connection/src/index.ts @@ -1,9 +1,9 @@ import type { Multiaddr } from 'multiaddr' import errCode from 'err-code' -import { OPEN, CLOSING, CLOSED } from 'libp2p-interfaces/connection/status' -import type { MuxedStream } from 'libp2p-interfaces/stream-muxer' -import type { ConnectionStat, StreamData } from 'libp2p-interfaces/connection' -import type { PeerId } from 'libp2p-interfaces/peer-id' +import { OPEN, CLOSING, CLOSED } from '@libp2p/interfaces/connection/status' +import type { MuxedStream } from '@libp2p/interfaces/stream-muxer' +import type { ConnectionStat, StreamData } from '@libp2p/interfaces/connection' +import type { PeerId } from '@libp2p/interfaces/peer-id' const connectionSymbol = Symbol.for('@libp2p/interface-connection/connection') diff --git a/packages/libp2p-connection/test/index.spec.ts b/packages/libp2p-connection/test/index.spec.ts index 3faa839fe..1389b7ce7 100644 --- a/packages/libp2p-connection/test/index.spec.ts +++ b/packages/libp2p-connection/test/index.spec.ts @@ -1,9 +1,9 @@ import { Connection } from '../src/index.js' -import * as PeerIdFactory from 'libp2p-peer-id-factory' +import * as PeerIdFactory from '@libp2p/peer-id-factory' // @ts-expect-error no types import pair from 'it-pair' import { Multiaddr } from 'multiaddr' -import type { MuxedStream } from 'libp2p-interfaces/stream-muxer' +import type { MuxedStream } from '@libp2p/interfaces/stream-muxer' const peers = [{ id: 'QmNMMAqSxPetRS1cVMmutW5BCN1qQQyEr4u98kUvZjcfEw', diff --git a/packages/libp2p-interface-compliance-tests/src/connection/connection.ts b/packages/libp2p-interface-compliance-tests/src/connection/connection.ts index 2830fc05b..6d19a4c93 100644 --- a/packages/libp2p-interface-compliance-tests/src/connection/connection.ts +++ b/packages/libp2p-interface-compliance-tests/src/connection/connection.ts @@ -1,7 +1,7 @@ import { expect } from 'aegir/utils/chai.js' import sinon from 'sinon' import type { TestSetup } from '../index.js' -import type { Connection } from 'libp2p-interfaces/connection' +import type { Connection } from '@libp2p/interfaces/connection' export default (test: TestSetup) => { describe('connection', () => { diff --git a/packages/libp2p-interface-compliance-tests/src/connection/index.ts b/packages/libp2p-interface-compliance-tests/src/connection/index.ts index cfeb617e2..0832ca5da 100644 --- a/packages/libp2p-interface-compliance-tests/src/connection/index.ts +++ b/packages/libp2p-interface-compliance-tests/src/connection/index.ts @@ -1,6 +1,6 @@ import connectionSuite from './connection.js' import type { TestSetup } from '../index.js' -import type { Connection } from 'libp2p-interfaces/connection' +import type { Connection } from '@libp2p/interfaces/connection' export default (test: TestSetup) => { connectionSuite(test) diff --git a/packages/libp2p-interface-compliance-tests/src/crypto/index.ts b/packages/libp2p-interface-compliance-tests/src/crypto/index.ts index 15c91db71..06761f6de 100644 --- a/packages/libp2p-interface-compliance-tests/src/crypto/index.ts +++ b/packages/libp2p-interface-compliance-tests/src/crypto/index.ts @@ -2,14 +2,14 @@ import { expect } from 'aegir/utils/chai.js' // @ts-expect-error no types import duplexPair from 'it-pair/duplex.js' import { pipe } from 'it-pipe' -import * as PeerIdFactory from 'libp2p-peer-id-factory' +import * as PeerIdFactory from '@libp2p/peer-id-factory' import { collect } from 'streaming-iterables' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' import peers from '../utils/peers.js' -import { UnexpectedPeerError } from 'libp2p-interfaces/crypto/errors' +import { UnexpectedPeerError } from '@libp2p/interfaces/crypto/errors' import type { TestSetup } from '../index.js' -import type { Crypto } from 'libp2p-interfaces/crypto' -import type { PeerId } from 'libp2p-interfaces/peer-id' +import type { Crypto } from '@libp2p/interfaces/crypto' +import type { PeerId } from '@libp2p/interfaces/peer-id' export default (common: TestSetup) => { describe('interface-crypto compliance tests', () => { diff --git a/packages/libp2p-interface-compliance-tests/src/peer-discovery/index.ts b/packages/libp2p-interface-compliance-tests/src/peer-discovery/index.ts index 74651b237..da45b76ea 100644 --- a/packages/libp2p-interface-compliance-tests/src/peer-discovery/index.ts +++ b/packages/libp2p-interface-compliance-tests/src/peer-discovery/index.ts @@ -3,8 +3,8 @@ import { Multiaddr } from 'multiaddr' import delay from 'delay' import pDefer from 'p-defer' import type { TestSetup } from '../index.js' -import type { PeerDiscovery } from 'libp2p-interfaces/peer-discovery' -import type { Startable } from 'libp2p-interfaces' +import type { PeerDiscovery } from '@libp2p/interfaces/peer-discovery' +import type { Startable } from '@libp2p/interfaces' export default (common: TestSetup) => { describe('interface-peer-discovery compliance tests', () => { diff --git a/packages/libp2p-interface-compliance-tests/src/pubsub/api.ts b/packages/libp2p-interface-compliance-tests/src/pubsub/api.ts index 0f58453be..19c178d6d 100644 --- a/packages/libp2p-interface-compliance-tests/src/pubsub/api.ts +++ b/packages/libp2p-interface-compliance-tests/src/pubsub/api.ts @@ -4,8 +4,8 @@ import pDefer from 'p-defer' import pWaitFor from 'p-wait-for' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' import type { TestSetup } from '../index.js' -import type { PubSub, Message } from 'libp2p-interfaces/pubsub' -import type { Startable } from 'libp2p-interfaces' +import type { PubSub, Message } from '@libp2p/interfaces/pubsub' +import type { Startable } from '@libp2p/interfaces' const topic = 'foo' const data = uint8ArrayFromString('bar') diff --git a/packages/libp2p-interface-compliance-tests/src/pubsub/connection-handlers.ts b/packages/libp2p-interface-compliance-tests/src/pubsub/connection-handlers.ts index 706bd3558..5e4ecf517 100644 --- a/packages/libp2p-interface-compliance-tests/src/pubsub/connection-handlers.ts +++ b/packages/libp2p-interface-compliance-tests/src/pubsub/connection-handlers.ts @@ -6,8 +6,8 @@ import { toString as uint8ArrayToString } from 'uint8arrays/to-string' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' import { expectSet } from './utils.js' import type { TestSetup } from '../index.js' -import type { PubSub, Message } from 'libp2p-interfaces/pubsub' -import type { Startable } from 'libp2p-interfaces' +import type { PubSub, Message } from '@libp2p/interfaces/pubsub' +import type { Startable } from '@libp2p/interfaces' export default (common: TestSetup) => { describe('pubsub connection handlers', () => { diff --git a/packages/libp2p-interface-compliance-tests/src/pubsub/emit-self.ts b/packages/libp2p-interface-compliance-tests/src/pubsub/emit-self.ts index b1f010c88..abd7cc837 100644 --- a/packages/libp2p-interface-compliance-tests/src/pubsub/emit-self.ts +++ b/packages/libp2p-interface-compliance-tests/src/pubsub/emit-self.ts @@ -2,8 +2,8 @@ import { expect } from 'aegir/utils/chai.js' import sinon from 'sinon' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' import type { TestSetup } from '../index.js' -import type { PubSub, PubsubOptions } from 'libp2p-interfaces/pubsub' -import type { Startable } from 'libp2p-interfaces' +import type { PubSub, PubsubOptions } from '@libp2p/interfaces/pubsub' +import type { Startable } from '@libp2p/interfaces' const topic = 'foo' const data = uint8ArrayFromString('bar') diff --git a/packages/libp2p-interface-compliance-tests/src/pubsub/index.ts b/packages/libp2p-interface-compliance-tests/src/pubsub/index.ts index b7712ce94..3847fe307 100644 --- a/packages/libp2p-interface-compliance-tests/src/pubsub/index.ts +++ b/packages/libp2p-interface-compliance-tests/src/pubsub/index.ts @@ -5,8 +5,8 @@ import connectionHandlersTest from './connection-handlers.js' import twoNodesTest from './two-nodes.js' import multipleNodesTest from './multiple-nodes.js' import type { TestSetup } from '../index.js' -import type { PubSub } from 'libp2p-interfaces/pubsub' -import type { Startable } from 'libp2p-interfaces' +import type { PubSub } from '@libp2p/interfaces/pubsub' +import type { Startable } from '@libp2p/interfaces' export default (common: TestSetup) => { describe('interface-pubsub compliance tests', () => { diff --git a/packages/libp2p-interface-compliance-tests/src/pubsub/messages.ts b/packages/libp2p-interface-compliance-tests/src/pubsub/messages.ts index 7f6d83441..35f945c77 100644 --- a/packages/libp2p-interface-compliance-tests/src/pubsub/messages.ts +++ b/packages/libp2p-interface-compliance-tests/src/pubsub/messages.ts @@ -1,12 +1,12 @@ import { expect } from 'aegir/utils/chai.js' import sinon from 'sinon' -import * as PeerIdFactory from 'libp2p-peer-id-factory' +import * as PeerIdFactory from '@libp2p/peer-id-factory' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import * as utils from 'libp2p-pubsub/utils' -import { PeerStreams } from 'libp2p-pubsub/peer-streams' +import * as utils from '@libp2p/pubsub/utils' +import { PeerStreams } from '@libp2p/pubsub/peer-streams' import type { TestSetup } from '../index.js' -import type { PubSub } from 'libp2p-interfaces/pubsub' -import type { Startable } from 'libp2p-interfaces' +import type { PubSub } from '@libp2p/interfaces/pubsub' +import type { Startable } from '@libp2p/interfaces' const topic = 'foo' const data = uint8ArrayFromString('bar') diff --git a/packages/libp2p-interface-compliance-tests/src/pubsub/multiple-nodes.ts b/packages/libp2p-interface-compliance-tests/src/pubsub/multiple-nodes.ts index 4dcef88e7..814b2926b 100644 --- a/packages/libp2p-interface-compliance-tests/src/pubsub/multiple-nodes.ts +++ b/packages/libp2p-interface-compliance-tests/src/pubsub/multiple-nodes.ts @@ -8,8 +8,8 @@ import { toString as uint8ArrayToString } from 'uint8arrays/to-string' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' import { expectSet } from './utils.js' import type { TestSetup } from '../index.js' -import type { PubSub, Message } from 'libp2p-interfaces/pubsub' -import type { Startable } from 'libp2p-interfaces' +import type { PubSub, Message } from '@libp2p/interfaces/pubsub' +import type { Startable } from '@libp2p/interfaces' export default (common: TestSetup) => { describe('pubsub with multiple nodes', function () { diff --git a/packages/libp2p-interface-compliance-tests/src/pubsub/two-nodes.ts b/packages/libp2p-interface-compliance-tests/src/pubsub/two-nodes.ts index 4580669f9..39779a1df 100644 --- a/packages/libp2p-interface-compliance-tests/src/pubsub/two-nodes.ts +++ b/packages/libp2p-interface-compliance-tests/src/pubsub/two-nodes.ts @@ -6,12 +6,12 @@ import pWaitFor from 'p-wait-for' import { toString as uint8ArrayToString } from 'uint8arrays/to-string' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' import type { TestSetup } from '../index.js' -import type { PubSub, Message } from 'libp2p-interfaces/pubsub' +import type { PubSub, Message } from '@libp2p/interfaces/pubsub' import { first, expectSet } from './utils.js' -import type { Startable } from 'libp2p-interfaces' +import type { Startable } from '@libp2p/interfaces' const topic = 'foo' diff --git a/packages/libp2p-interface-compliance-tests/src/record/index.ts b/packages/libp2p-interface-compliance-tests/src/record/index.ts index fca4dea13..a5729a4c6 100644 --- a/packages/libp2p-interface-compliance-tests/src/record/index.ts +++ b/packages/libp2p-interface-compliance-tests/src/record/index.ts @@ -1,6 +1,6 @@ import { expect } from 'aegir/utils/chai.js' import type { TestSetup } from '../index.js' -import type { Record } from 'libp2p-interfaces/record' +import type { Record } from '@libp2p/interfaces/record' export default (test: TestSetup) => { describe('record', () => { diff --git a/packages/libp2p-interface-compliance-tests/src/stream-muxer/base-test.ts b/packages/libp2p-interface-compliance-tests/src/stream-muxer/base-test.ts index 625bd0802..93588c914 100644 --- a/packages/libp2p-interface-compliance-tests/src/stream-muxer/base-test.ts +++ b/packages/libp2p-interface-compliance-tests/src/stream-muxer/base-test.ts @@ -5,7 +5,7 @@ import { pipe } from 'it-pipe' import { collect, map, consume } from 'streaming-iterables' import defer from 'p-defer' import type { TestSetup } from '../index.js' -import type { Muxer, MuxerOptions, MuxedStream } from 'libp2p-interfaces/stream-muxer' +import type { Muxer, MuxerOptions, MuxedStream } from '@libp2p/interfaces/stream-muxer' import { isValidTick } from '../transport/utils/index.js' function close (stream: MuxedStream) { diff --git a/packages/libp2p-interface-compliance-tests/src/stream-muxer/close-test.ts b/packages/libp2p-interface-compliance-tests/src/stream-muxer/close-test.ts index 6b3b1b931..fa78d4793 100644 --- a/packages/libp2p-interface-compliance-tests/src/stream-muxer/close-test.ts +++ b/packages/libp2p-interface-compliance-tests/src/stream-muxer/close-test.ts @@ -7,8 +7,8 @@ import { source, duplex } from 'abortable-iterator' import AbortController from 'abort-controller' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' import type { TestSetup } from '../index.js' -import type { Muxer, MuxerOptions } from 'libp2p-interfaces/stream-muxer' -import type { Connection } from 'libp2p-interfaces/connection' +import type { Muxer, MuxerOptions } from '@libp2p/interfaces/stream-muxer' +import type { Connection } from '@libp2p/interfaces/connection' async function pause (ms: number) { return await new Promise(resolve => setTimeout(resolve, ms)) diff --git a/packages/libp2p-interface-compliance-tests/src/stream-muxer/index.ts b/packages/libp2p-interface-compliance-tests/src/stream-muxer/index.ts index f48a61a02..f330a0931 100644 --- a/packages/libp2p-interface-compliance-tests/src/stream-muxer/index.ts +++ b/packages/libp2p-interface-compliance-tests/src/stream-muxer/index.ts @@ -3,7 +3,7 @@ import closeTest from './close-test.js' import stressTest from './stress-test.js' import megaStressTest from './mega-stress-test.js' import type { TestSetup } from '../index.js' -import type { Muxer } from 'libp2p-interfaces/stream-muxer' +import type { Muxer } from '@libp2p/interfaces/stream-muxer' export default (common: TestSetup) => { describe('interface-stream-muxer', () => { diff --git a/packages/libp2p-interface-compliance-tests/src/stream-muxer/mega-stress-test.ts b/packages/libp2p-interface-compliance-tests/src/stream-muxer/mega-stress-test.ts index b4195d4f1..085e29c7d 100644 --- a/packages/libp2p-interface-compliance-tests/src/stream-muxer/mega-stress-test.ts +++ b/packages/libp2p-interface-compliance-tests/src/stream-muxer/mega-stress-test.ts @@ -1,6 +1,6 @@ import spawn from './spawner' import type { TestSetup } from '../index.js' -import type { Muxer, MuxerOptions } from 'libp2p-interfaces/stream-muxer' +import type { Muxer, MuxerOptions } from '@libp2p/interfaces/stream-muxer' export default (common: TestSetup) => { const createMuxer = async (opts?: MuxerOptions) => await common.setup(opts) diff --git a/packages/libp2p-interface-compliance-tests/src/stream-muxer/spawner.ts b/packages/libp2p-interface-compliance-tests/src/stream-muxer/spawner.ts index 396ade719..1fd3f7d1f 100644 --- a/packages/libp2p-interface-compliance-tests/src/stream-muxer/spawner.ts +++ b/packages/libp2p-interface-compliance-tests/src/stream-muxer/spawner.ts @@ -4,7 +4,7 @@ import pair from 'it-pair/duplex.js' import { pipe } from 'it-pipe' import pLimit from 'p-limit' import { collect, consume } from 'streaming-iterables' -import type { Muxer, MuxerOptions } from 'libp2p-interfaces/stream-muxer' +import type { Muxer, MuxerOptions } from '@libp2p/interfaces/stream-muxer' export default async (createMuxer: (options?: MuxerOptions) => Promise, nStreams: number, nMsg: number, limit?: number) => { const [dialerSocket, listenerSocket] = pair() diff --git a/packages/libp2p-interface-compliance-tests/src/stream-muxer/stress-test.ts b/packages/libp2p-interface-compliance-tests/src/stream-muxer/stress-test.ts index b1623fc86..86d0f623a 100644 --- a/packages/libp2p-interface-compliance-tests/src/stream-muxer/stress-test.ts +++ b/packages/libp2p-interface-compliance-tests/src/stream-muxer/stress-test.ts @@ -1,6 +1,6 @@ import spawn from './spawner' import type { TestSetup } from '../index.js' -import type { Muxer, MuxerOptions } from 'libp2p-interfaces/stream-muxer' +import type { Muxer, MuxerOptions } from '@libp2p/interfaces/stream-muxer' export default (common: TestSetup) => { const createMuxer = async (opts?: MuxerOptions) => await common.setup(opts) diff --git a/packages/libp2p-interface-compliance-tests/src/topology/multicodec-topology.ts b/packages/libp2p-interface-compliance-tests/src/topology/multicodec-topology.ts index 163629b26..2e6750ea2 100644 --- a/packages/libp2p-interface-compliance-tests/src/topology/multicodec-topology.ts +++ b/packages/libp2p-interface-compliance-tests/src/topology/multicodec-topology.ts @@ -1,10 +1,10 @@ import { expect } from 'aegir/utils/chai.js' import sinon from 'sinon' -import * as PeerIdFactory from 'libp2p-peer-id-factory' +import * as PeerIdFactory from '@libp2p/peer-id-factory' import peers from '../utils/peers.js' import type { TestSetup } from '../index.js' -import type { MulticodecTopology } from 'libp2p-interfaces/topology' -import type { PeerId } from 'libp2p-interfaces/peer-id' +import type { MulticodecTopology } from '@libp2p/interfaces/topology' +import type { PeerId } from '@libp2p/interfaces/peer-id' export default (test: TestSetup) => { describe('multicodec topology', () => { diff --git a/packages/libp2p-interface-compliance-tests/src/topology/topology.ts b/packages/libp2p-interface-compliance-tests/src/topology/topology.ts index bba922a7b..648c0f812 100644 --- a/packages/libp2p-interface-compliance-tests/src/topology/topology.ts +++ b/packages/libp2p-interface-compliance-tests/src/topology/topology.ts @@ -1,10 +1,10 @@ import { expect } from 'aegir/utils/chai.js' import sinon from 'sinon' -import * as PeerIdFactory from 'libp2p-peer-id-factory' +import * as PeerIdFactory from '@libp2p/peer-id-factory' import peers from '../utils/peers.js' import type { TestSetup } from '../index.js' -import type { Topology } from 'libp2p-interfaces/topology' -import type { PeerId } from 'libp2p-interfaces/peer-id' +import type { Topology } from '@libp2p/interfaces/topology' +import type { PeerId } from '@libp2p/interfaces/peer-id' export default (test: TestSetup) => { describe('topology', () => { diff --git a/packages/libp2p-interface-compliance-tests/src/transport/dial-test.ts b/packages/libp2p-interface-compliance-tests/src/transport/dial-test.ts index b376dbfc6..f6e1db7d7 100644 --- a/packages/libp2p-interface-compliance-tests/src/transport/dial-test.ts +++ b/packages/libp2p-interface-compliance-tests/src/transport/dial-test.ts @@ -5,10 +5,10 @@ import goodbye from 'it-goodbye' import { collect } from 'streaming-iterables' import { pipe } from 'it-pipe' import AbortController from 'abort-controller' -import { AbortError } from 'libp2p-interfaces/errors' +import { AbortError } from '@libp2p/interfaces/errors' import sinon from 'sinon' import type { TestSetup } from '../index.js' -import type { Transport, Listener } from 'libp2p-interfaces/transport' +import type { Transport, Listener } from '@libp2p/interfaces/transport' import type { TransportTestFixtures, SetupArgs, Connector } from './index.js' import type { Multiaddr } from 'multiaddr' diff --git a/packages/libp2p-interface-compliance-tests/src/transport/filter-test.ts b/packages/libp2p-interface-compliance-tests/src/transport/filter-test.ts index 9bec6d6a6..bcff1602c 100644 --- a/packages/libp2p-interface-compliance-tests/src/transport/filter-test.ts +++ b/packages/libp2p-interface-compliance-tests/src/transport/filter-test.ts @@ -1,7 +1,7 @@ import { expect } from 'aegir/utils/chai.js' import { mockUpgrader } from './utils/index.js' import type { TestSetup } from '../index.js' -import type { Transport } from 'libp2p-interfaces/transport' +import type { Transport } from '@libp2p/interfaces/transport' import type { TransportTestFixtures, SetupArgs } from './index.js' import type { Multiaddr } from 'multiaddr' diff --git a/packages/libp2p-interface-compliance-tests/src/transport/index.ts b/packages/libp2p-interface-compliance-tests/src/transport/index.ts index 6641c2464..dccc00e66 100644 --- a/packages/libp2p-interface-compliance-tests/src/transport/index.ts +++ b/packages/libp2p-interface-compliance-tests/src/transport/index.ts @@ -2,7 +2,7 @@ import dial from './dial-test.js' import listen from './listen-test.js' import filter from './filter-test.js' import type { TestSetup } from '../index.js' -import type { Transport, Upgrader } from 'libp2p-interfaces/transport' +import type { Transport, Upgrader } from '@libp2p/interfaces/transport' import type { Multiaddr } from 'multiaddr' export interface Connector { diff --git a/packages/libp2p-interface-compliance-tests/src/transport/listen-test.ts b/packages/libp2p-interface-compliance-tests/src/transport/listen-test.ts index da09caeec..5926e1029 100644 --- a/packages/libp2p-interface-compliance-tests/src/transport/listen-test.ts +++ b/packages/libp2p-interface-compliance-tests/src/transport/listen-test.ts @@ -7,10 +7,10 @@ import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' import { isValidTick, mockUpgrader } from './utils/index.js' import defer from 'p-defer' import type { TestSetup } from '../index.js' -import type { Transport } from 'libp2p-interfaces/transport' +import type { Transport } from '@libp2p/interfaces/transport' import type { TransportTestFixtures, SetupArgs } from './index.js' import type { Multiaddr } from 'multiaddr' -import type { Connection } from 'libp2p-interfaces/connection' +import type { Connection } from '@libp2p/interfaces/connection' export default (common: TestSetup) => { describe('listen', () => { diff --git a/packages/libp2p-interface-compliance-tests/src/transport/utils/index.ts b/packages/libp2p-interface-compliance-tests/src/transport/utils/index.ts index efd63c2f9..2ebfafd2f 100644 --- a/packages/libp2p-interface-compliance-tests/src/transport/utils/index.ts +++ b/packages/libp2p-interface-compliance-tests/src/transport/utils/index.ts @@ -1,11 +1,11 @@ import { expect } from 'aegir/utils/chai.js' -import type { Upgrader, MultiaddrConnection } from 'libp2p-interfaces/transport' -import type { Connection, StreamData } from 'libp2p-interfaces/connection' -import type { MuxedStream } from 'libp2p-interfaces/stream-muxer' +import type { Upgrader, MultiaddrConnection } from '@libp2p/interfaces/transport' +import type { Connection, StreamData } from '@libp2p/interfaces/connection' +import type { MuxedStream } from '@libp2p/interfaces/stream-muxer' // @ts-expect-error no types import pair from 'it-pair' -import { PeerId } from 'libp2p-peer-id' -import * as PeerIdFactory from 'libp2p-peer-id-factory' +import { PeerId } from '@libp2p/peer-id' +import * as PeerIdFactory from '@libp2p/peer-id-factory' /** * A tick is considered valid if it happened between now * and `ms` milliseconds ago diff --git a/packages/libp2p-interface-compliance-tests/test/connection/index.spec.ts b/packages/libp2p-interface-compliance-tests/test/connection/index.spec.ts index dd9ad42ca..36f3abc23 100644 --- a/packages/libp2p-interface-compliance-tests/test/connection/index.spec.ts +++ b/packages/libp2p-interface-compliance-tests/test/connection/index.spec.ts @@ -1,11 +1,11 @@ import tests from '../../src/connection/index.js' -import { Connection } from 'libp2p-connection' +import { Connection } from '@libp2p/connection' import peers from '../../src/utils/peers.js' -import * as PeerIdFactory from 'libp2p-peer-id-factory' +import * as PeerIdFactory from '@libp2p/peer-id-factory' import { Multiaddr } from 'multiaddr' // @ts-expect-error no types import pair from 'it-pair' -import type { MuxedStream } from 'libp2p-interfaces/stream-muxer' +import type { MuxedStream } from '@libp2p/interfaces/stream-muxer' describe('compliance tests', () => { tests({ diff --git a/packages/libp2p-interface-compliance-tests/test/crypto/mock-crypto.ts b/packages/libp2p-interface-compliance-tests/test/crypto/mock-crypto.ts index 7e4bef75b..4ff4bffb7 100644 --- a/packages/libp2p-interface-compliance-tests/test/crypto/mock-crypto.ts +++ b/packages/libp2p-interface-compliance-tests/test/crypto/mock-crypto.ts @@ -1,11 +1,11 @@ -import { PeerId } from 'libp2p-peer-id' +import { PeerId } from '@libp2p/peer-id' // @ts-expect-error no types import handshake from 'it-handshake' // @ts-expect-error no types import duplexPair from 'it-pair/duplex.js' import pipe from 'it-pipe' -import { UnexpectedPeerError } from 'libp2p-interfaces/crypto/errors' -import type { Crypto } from 'libp2p-interfaces/crypto' +import { UnexpectedPeerError } from '@libp2p/interfaces/crypto/errors' +import type { Crypto } from '@libp2p/interfaces/crypto' import { Multiaddr } from 'multiaddr' // A basic transform that does nothing to the data diff --git a/packages/libp2p-interface-compliance-tests/test/peer-discovery/mock-discovery.ts b/packages/libp2p-interface-compliance-tests/test/peer-discovery/mock-discovery.ts index 5db442e10..4660c25db 100644 --- a/packages/libp2p-interface-compliance-tests/test/peer-discovery/mock-discovery.ts +++ b/packages/libp2p-interface-compliance-tests/test/peer-discovery/mock-discovery.ts @@ -1,6 +1,6 @@ import { EventEmitter } from 'events' import { Multiaddr } from 'multiaddr' -import * as PeerIdFactory from 'libp2p-peer-id-factory' +import * as PeerIdFactory from '@libp2p/peer-id-factory' interface MockDiscoveryOptions { discoveryDelay?: number diff --git a/packages/libp2p-interface-compliance-tests/test/topology/mock-peer-store.ts b/packages/libp2p-interface-compliance-tests/test/topology/mock-peer-store.ts index ee58862fe..a8d24abef 100644 --- a/packages/libp2p-interface-compliance-tests/test/topology/mock-peer-store.ts +++ b/packages/libp2p-interface-compliance-tests/test/topology/mock-peer-store.ts @@ -1,7 +1,7 @@ import { EventEmitter } from 'events' -import type { PeerId } from 'libp2p-interfaces/peer-id' -import type { PeerData } from 'libp2p-interfaces/peer-data' -import type { ProtoBook, PeerStore } from 'libp2p-interfaces/registrar' +import type { PeerId } from '@libp2p/interfaces/peer-id' +import type { PeerData } from '@libp2p/interfaces/peer-data' +import type { ProtoBook, PeerStore } from '@libp2p/interfaces/registrar' export class MockPeerStore extends EventEmitter implements PeerStore { public readonly peers: Map diff --git a/packages/libp2p-interface-compliance-tests/test/topology/multicodec-topology.spec.ts b/packages/libp2p-interface-compliance-tests/test/topology/multicodec-topology.spec.ts index 4462c1fda..7c3f793fa 100644 --- a/packages/libp2p-interface-compliance-tests/test/topology/multicodec-topology.spec.ts +++ b/packages/libp2p-interface-compliance-tests/test/topology/multicodec-topology.spec.ts @@ -1,6 +1,6 @@ import { EventEmitter } from 'events' import tests from '../../src/topology/multicodec-topology.js' -import { MulticodecTopology } from 'libp2p-topology/multicodec-topology' +import { MulticodecTopology } from '@libp2p/topology/multicodec-topology' import { MockPeerStore } from './mock-peer-store.js' describe('multicodec topology compliance tests', () => { diff --git a/packages/libp2p-interface-compliance-tests/test/topology/topology.spec.ts b/packages/libp2p-interface-compliance-tests/test/topology/topology.spec.ts index 97f2fb60a..cac6f5394 100644 --- a/packages/libp2p-interface-compliance-tests/test/topology/topology.spec.ts +++ b/packages/libp2p-interface-compliance-tests/test/topology/topology.spec.ts @@ -1,5 +1,5 @@ import tests from '../../src/topology/topology.js' -import { Topology } from 'libp2p-topology' +import { Topology } from '@libp2p/topology' describe('topology compliance tests', () => { tests({ diff --git a/packages/libp2p-peer-id-factory/README.md b/packages/libp2p-peer-id-factory/README.md index aaf630856..984db4654 100644 --- a/packages/libp2p-peer-id-factory/README.md +++ b/packages/libp2p-peer-id-factory/README.md @@ -21,7 +21,7 @@ The public key is a base64 encoded string of a protobuf containing an RSA DER bu # Example ```JavaScript -import { createEd25519PeerId } from 'libp2p-peer-id-factory' +import { createEd25519PeerId } from '@libp2p/peer-id-factory' const peerId = await createEd25519PeerId() console.log(id.toString()) diff --git a/packages/libp2p-peer-id-factory/src/index.ts b/packages/libp2p-peer-id-factory/src/index.ts index 336ae7f98..fcbee2e18 100644 --- a/packages/libp2p-peer-id-factory/src/index.ts +++ b/packages/libp2p-peer-id-factory/src/index.ts @@ -1,9 +1,9 @@ import { keys } from 'libp2p-crypto' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import { PeerId } from 'libp2p-peer-id' +import { PeerId } from '@libp2p/peer-id' import { PeerIdProto } from './proto.js' -import type { PublicKey, PrivateKey } from 'libp2p-interfaces/keys' -import type { RSAPeerId, Ed25519PeerId, Secp256k1PeerId } from 'libp2p-peer-id' +import type { PublicKey, PrivateKey } from '@libp2p/interfaces/keys' +import type { RSAPeerId, Ed25519PeerId, Secp256k1PeerId } from '@libp2p/peer-id' export const createEd25519PeerId = async (): Promise => { const key = await keys.generateKeyPair('Ed25519') diff --git a/packages/libp2p-peer-id-factory/test/index.spec.ts b/packages/libp2p-peer-id-factory/test/index.spec.ts index d2c59f963..1cd81b5a3 100644 --- a/packages/libp2p-peer-id-factory/test/index.spec.ts +++ b/packages/libp2p-peer-id-factory/test/index.spec.ts @@ -11,7 +11,7 @@ import { base58btc } from 'multiformats/bases/base58' import { identity } from 'multiformats/hashes/identity' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' import { toString as uint8ArrayToString } from 'uint8arrays/to-string' -import { PeerId } from 'libp2p-peer-id' +import { PeerId } from '@libp2p/peer-id' import * as PeerIdFactory from '../src/index.js' import util from 'util' import testId from './fixtures/sample-id.js' diff --git a/packages/libp2p-peer-id/README.md b/packages/libp2p-peer-id/README.md index d7474c1e7..2ff405693 100644 --- a/packages/libp2p-peer-id/README.md +++ b/packages/libp2p-peer-id/README.md @@ -17,7 +17,7 @@ A basic implementation of a peer id # Example ```JavaScript -import { PeerId } from 'libp2p-peer-id' +import { PeerId } from '@libp2p/peer-id' const id = new PeerId(...) diff --git a/packages/libp2p-pubsub/README.md b/packages/libp2p-pubsub/README.md index 48d297ac6..62e61dabe 100644 --- a/packages/libp2p-pubsub/README.md +++ b/packages/libp2p-pubsub/README.md @@ -15,7 +15,7 @@ npm i libp2p-pubsub ``` ```javascript -import { PubsubBaseProtocol } from 'libp2p-pubsub' +import { PubsubBaseProtocol } from '@libp2p/pubsub' class MyPubsubImplementation extends PubsubBaseProtocol { // .. extra methods here diff --git a/packages/libp2p-pubsub/src/index.ts b/packages/libp2p-pubsub/src/index.ts index 5e0da384f..631bbbce6 100644 --- a/packages/libp2p-pubsub/src/index.ts +++ b/packages/libp2p-pubsub/src/index.ts @@ -3,21 +3,21 @@ import { EventEmitter } from 'events' import errcode from 'err-code' import { pipe } from 'it-pipe' import Queue from 'p-queue' -import { MulticodecTopology } from 'libp2p-topology/multicodec-topology' +import { MulticodecTopology } from '@libp2p/topology/multicodec-topology' import { codes } from './errors.js' import { RPC, IRPC } from './message/rpc.js' import { PeerStreams } from './peer-streams.js' import * as utils from './utils.js' -import type { PeerId } from 'libp2p-interfaces/peer-id' -import type { Registrar, IncomingStreamEvent } from 'libp2p-interfaces/registrar' -import type { Connection } from 'libp2p-interfaces/connection' +import type { PeerId } from '@libp2p/interfaces/peer-id' +import type { Registrar, IncomingStreamEvent } from '@libp2p/interfaces/registrar' +import type { Connection } from '@libp2p/interfaces/connection' import type BufferList from 'bl' import { signMessage, verifySignature } from './message/sign.js' -import type { PubSub, Message, StrictNoSign, StrictSign, PubsubOptions } from 'libp2p-interfaces/pubsub' -import type { Startable } from 'libp2p-interfaces' +import type { PubSub, Message, StrictNoSign, StrictSign, PubsubOptions } from '@libp2p/interfaces/pubsub' +import type { Startable } from '@libp2p/interfaces' export interface TopicValidator { (topic: string, message: Message): Promise } diff --git a/packages/libp2p-pubsub/src/message/sign.ts b/packages/libp2p-pubsub/src/message/sign.ts index cfd0e1a40..6c33d49af 100644 --- a/packages/libp2p-pubsub/src/message/sign.ts +++ b/packages/libp2p-pubsub/src/message/sign.ts @@ -1,11 +1,11 @@ -import * as PeerIdFactory from 'libp2p-peer-id-factory' +import * as PeerIdFactory from '@libp2p/peer-id-factory' import { RPC } from './rpc.js' import { concat as uint8ArrayConcat } from 'uint8arrays/concat' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' import { normalizeOutRpcMessage } from '../utils.js' -import { PeerId } from 'libp2p-peer-id' +import { PeerId } from '@libp2p/peer-id' import { keys } from 'libp2p-crypto' -import type { Message } from 'libp2p-interfaces/pubsub' +import type { Message } from '@libp2p/interfaces/pubsub' export const SignPrefix = uint8ArrayFromString('libp2p-pubsub:') diff --git a/packages/libp2p-pubsub/src/peer-streams.ts b/packages/libp2p-pubsub/src/peer-streams.ts index 684bbf4e7..64d90afd2 100644 --- a/packages/libp2p-pubsub/src/peer-streams.ts +++ b/packages/libp2p-pubsub/src/peer-streams.ts @@ -5,8 +5,8 @@ import pushable from 'it-pushable' import { pipe } from 'it-pipe' import { source as abortable } from 'abortable-iterator' import AbortController from 'abort-controller' -import type { PeerId } from 'libp2p-interfaces/peer-id' -import type { MuxedStream } from 'libp2p-interfaces/stream-muxer' +import type { PeerId } from '@libp2p/interfaces/peer-id' +import type { MuxedStream } from '@libp2p/interfaces/stream-muxer' const log = Object.assign(debug('libp2p-pubsub:peer-streams'), { error: debug('libp2p-pubsub:peer-streams:err') diff --git a/packages/libp2p-pubsub/src/utils.ts b/packages/libp2p-pubsub/src/utils.ts index f03c4feb9..cf02d45da 100644 --- a/packages/libp2p-pubsub/src/utils.ts +++ b/packages/libp2p-pubsub/src/utils.ts @@ -1,9 +1,9 @@ import { randomBytes } from 'iso-random-stream' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import { PeerId } from 'libp2p-peer-id' +import { PeerId } from '@libp2p/peer-id' import { sha256 } from 'multiformats/hashes/sha2' import type * as RPC from './message/rpc.js' -import type { Message } from 'libp2p-interfaces/pubsub' +import type { Message } from '@libp2p/interfaces/pubsub' /** * Generate a random sequence number diff --git a/packages/libp2p-pubsub/test/instance.spec.ts b/packages/libp2p-pubsub/test/instance.spec.ts index 6c29ab8f6..a2362d6fb 100644 --- a/packages/libp2p-pubsub/test/instance.spec.ts +++ b/packages/libp2p-pubsub/test/instance.spec.ts @@ -4,8 +4,8 @@ import { createPeerId, mockRegistrar } from './utils/index.js' -import type { PeerId } from 'libp2p-interfaces/peer-id' -import type { Message } from 'libp2p-interfaces/pubsub' +import type { PeerId } from '@libp2p/interfaces/peer-id' +import type { Message } from '@libp2p/interfaces/pubsub' class PubsubProtocol extends PubsubBaseProtocol { async _publish (message: Message): Promise { diff --git a/packages/libp2p-pubsub/test/lifesycle.spec.ts b/packages/libp2p-pubsub/test/lifesycle.spec.ts index 6e76b3ac6..c1f61e355 100644 --- a/packages/libp2p-pubsub/test/lifesycle.spec.ts +++ b/packages/libp2p-pubsub/test/lifesycle.spec.ts @@ -7,9 +7,9 @@ import { PubsubImplementation, ConnectionPair } from './utils/index.js' -import type { PeerId } from 'libp2p-interfaces/peer-id' -import type { Registrar } from 'libp2p-interfaces/registrar' -import type { Message } from 'libp2p-interfaces/pubsub' +import type { PeerId } from '@libp2p/interfaces/peer-id' +import type { Registrar } from '@libp2p/interfaces/registrar' +import type { Message } from '@libp2p/interfaces/pubsub' class PubsubProtocol extends PubsubBaseProtocol { async _publish (message: Message): Promise { diff --git a/packages/libp2p-pubsub/test/message.spec.ts b/packages/libp2p-pubsub/test/message.spec.ts index a4f6d26fc..ea1befcf7 100644 --- a/packages/libp2p-pubsub/test/message.spec.ts +++ b/packages/libp2p-pubsub/test/message.spec.ts @@ -7,8 +7,8 @@ import { createPeerId, mockRegistrar } from './utils/index.js' -import type { PeerId } from 'libp2p-interfaces/peer-id' -import type { Message } from 'libp2p-interfaces/pubsub' +import type { PeerId } from '@libp2p/interfaces/peer-id' +import type { Message } from '@libp2p/interfaces/pubsub' class PubsubProtocol extends PubsubBaseProtocol { async _publish (message: Message): Promise { diff --git a/packages/libp2p-pubsub/test/pubsub.spec.ts b/packages/libp2p-pubsub/test/pubsub.spec.ts index 3739cd2d7..6fc9cdfc7 100644 --- a/packages/libp2p-pubsub/test/pubsub.spec.ts +++ b/packages/libp2p-pubsub/test/pubsub.spec.ts @@ -11,7 +11,7 @@ import { mockRegistrar, PubsubImplementation } from './utils/index.js' -import type { PeerId } from 'libp2p-interfaces/peer-id' +import type { PeerId } from '@libp2p/interfaces/peer-id' const protocol = '/pubsub/1.0.0' const topic = 'test-topic' diff --git a/packages/libp2p-pubsub/test/sign.spec.ts b/packages/libp2p-pubsub/test/sign.spec.ts index 5b0216881..ec99277d4 100644 --- a/packages/libp2p-pubsub/test/sign.spec.ts +++ b/packages/libp2p-pubsub/test/sign.spec.ts @@ -7,11 +7,11 @@ import { SignPrefix, verifySignature } from '../src/message/sign.js' -import * as PeerIdFactory from 'libp2p-peer-id-factory' +import * as PeerIdFactory from '@libp2p/peer-id-factory' import { randomSeqno } from '../src/utils.js' import { keys } from 'libp2p-crypto' -import type { Message } from 'libp2p-interfaces/pubsub' -import type { PeerId } from 'libp2p-interfaces/peer-id' +import type { Message } from '@libp2p/interfaces/pubsub' +import type { PeerId } from '@libp2p/interfaces/peer-id' describe('message signing', () => { let peerId: PeerId diff --git a/packages/libp2p-pubsub/test/topic-validators.spec.ts b/packages/libp2p-pubsub/test/topic-validators.spec.ts index b9d91013f..1fda8d197 100644 --- a/packages/libp2p-pubsub/test/topic-validators.spec.ts +++ b/packages/libp2p-pubsub/test/topic-validators.spec.ts @@ -2,7 +2,7 @@ import { expect } from 'aegir/utils/chai.js' import sinon from 'sinon' import pWaitFor from 'p-wait-for' import errCode from 'err-code' -import * as PeerIdFactory from 'libp2p-peer-id-factory' +import * as PeerIdFactory from '@libp2p/peer-id-factory' import { equals as uint8ArrayEquals } from 'uint8arrays/equals' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' import { PeerStreams } from '../src/peer-streams.js' diff --git a/packages/libp2p-pubsub/test/utils/index.ts b/packages/libp2p-pubsub/test/utils/index.ts index 33a08d489..db57524cd 100644 --- a/packages/libp2p-pubsub/test/utils/index.ts +++ b/packages/libp2p-pubsub/test/utils/index.ts @@ -1,10 +1,10 @@ // @ts-expect-error no types import DuplexPair from 'it-pair/duplex.js' -import * as PeerIdFactory from 'libp2p-peer-id-factory' +import * as PeerIdFactory from '@libp2p/peer-id-factory' import { PubsubBaseProtocol } from '../../src/index.js' import { RPC, IRPC } from '../../src/message/rpc.js' -import type { Registrar } from 'libp2p-interfaces/registrar' -import type { PeerId } from 'libp2p-interfaces/peer-id' +import type { Registrar } from '@libp2p/interfaces/registrar' +import type { PeerId } from '@libp2p/interfaces/peer-id' export const createPeerId = async () => { const peerId = await PeerIdFactory.createEd25519PeerId() diff --git a/packages/libp2p-topology/README.md b/packages/libp2p-topology/README.md index 5ab1a2d9b..16b400832 100644 --- a/packages/libp2p-topology/README.md +++ b/packages/libp2p-topology/README.md @@ -15,8 +15,8 @@ npm i libp2p-connection ``` ```javascript -import { Topology } from 'libp2p-topology' -import { MulticodecTopology } from 'libp2p-topology/multicodec-topology' +import { Topology } from '@libp2p/topology' +import { MulticodecTopology } from '@libp2p/topology/multicodec-topology' const topology = new Topology({ ... }) const multicodecTopology = new MulticodecTopology({ ... }) diff --git a/packages/libp2p-topology/src/index.ts b/packages/libp2p-topology/src/index.ts index b465a5dc6..65e56bddf 100644 --- a/packages/libp2p-topology/src/index.ts +++ b/packages/libp2p-topology/src/index.ts @@ -1,6 +1,6 @@ -import type { PeerId } from 'libp2p-interfaces/peer-id' -import type { TopologyOptions, onConnectHandler, onDisconnectHandler } from 'libp2p-interfaces/topology' -import type { Registrar } from 'libp2p-interfaces/registrar' +import type { PeerId } from '@libp2p/interfaces/peer-id' +import type { TopologyOptions, onConnectHandler, onDisconnectHandler } from '@libp2p/interfaces/topology' +import type { Registrar } from '@libp2p/interfaces/registrar' const noop = () => {} const topologySymbol = Symbol.for('@libp2p/js-interfaces/topology') diff --git a/packages/libp2p-topology/src/multicodec-topology.ts b/packages/libp2p-topology/src/multicodec-topology.ts index 256755bb8..dbe3c493b 100644 --- a/packages/libp2p-topology/src/multicodec-topology.ts +++ b/packages/libp2p-topology/src/multicodec-topology.ts @@ -1,9 +1,9 @@ import { Topology } from './index.js' -import type { PeerId } from 'libp2p-interfaces/peer-id' -import type { PeerData } from 'libp2p-interfaces/peer-data' -import type { Connection } from 'libp2p-interfaces/connection' -import type { Registrar } from 'libp2p-interfaces/registrar' -import type { MulticodecTopologyOptions } from 'libp2p-interfaces/topology' +import type { PeerId } from '@libp2p/interfaces/peer-id' +import type { PeerData } from '@libp2p/interfaces/peer-data' +import type { Connection } from '@libp2p/interfaces/connection' +import type { Registrar } from '@libp2p/interfaces/registrar' +import type { MulticodecTopologyOptions } from '@libp2p/interfaces/topology' interface ChangeProtocolsEvent { peerId: PeerId