fix: spec tests

waku-org · Oct 8, 2024 · 9a9fade · 9a9fade
1 parent 571553e
commit 9a9fade
Show file tree

Hide file tree

Showing 8 changed files with 121 additions and 86 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -81,6 +81,7 @@
     "uuid": "^9.0.0"
   },
   "devDependencies": {
+    "@libp2p/peer-id": "^5.0.1",
     "@multiformats/multiaddr": "^12.0.0",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-json": "^6.0.0",

diff --git a/packages/core/src/lib/filterPeers.spec.ts b/packages/core/src/lib/filterPeers.spec.ts
@@ -1,16 +1,19 @@
+import { generateKeyPair } from "@libp2p/crypto/keys";
 import { Peer } from "@libp2p/interface";
 import type { Tag } from "@libp2p/interface";
-import { createSecp256k1PeerId } from "@libp2p/peer-id-factory";
+import { peerIdFromPrivateKey } from "@libp2p/peer-id";
 import { Tags } from "@waku/interfaces";
 import { expect } from "chai";
 
 import { filterPeersByDiscovery } from "./filterPeers.js";
 
 describe("filterPeersByDiscovery function", function () {
   it("should return all peers when numPeers is 0", async function () {
-    const peer1 = await createSecp256k1PeerId();
-    const peer2 = await createSecp256k1PeerId();
-    const peer3 = await createSecp256k1PeerId();
+    const [peer1, peer2, peer3] = await Promise.all([
+      generateKeyPair("secp256k1").then(peerIdFromPrivateKey),
+      generateKeyPair("secp256k1").then(peerIdFromPrivateKey),
+      generateKeyPair("secp256k1").then(peerIdFromPrivateKey)
+    ]);
 
     const mockPeers = [
       {
@@ -32,10 +35,12 @@ describe("filterPeersByDiscovery function", function () {
   });
 
   it("should return all non-bootstrap peers and no bootstrap peer when numPeers is 0 and maxBootstrapPeers is 0", async function () {
-    const peer1 = await createSecp256k1PeerId();
-    const peer2 = await createSecp256k1PeerId();
-    const peer3 = await createSecp256k1PeerId();
-    const peer4 = await createSecp256k1PeerId();
+    const [peer1, peer2, peer3, peer4] = await Promise.all([
+      generateKeyPair("secp256k1").then(peerIdFromPrivateKey),
+      generateKeyPair("secp256k1").then(peerIdFromPrivateKey),
+      generateKeyPair("secp256k1").then(peerIdFromPrivateKey),
+      generateKeyPair("secp256k1").then(peerIdFromPrivateKey)
+    ]);
 
     const mockPeers = [
       {
@@ -66,11 +71,13 @@ describe("filterPeersByDiscovery function", function () {
   });
 
   it("should return one bootstrap peer, and all non-boostrap peers, when numPeers is 0 & maxBootstrap is 1", async function () {
-    const peer1 = await createSecp256k1PeerId();
-    const peer2 = await createSecp256k1PeerId();
-    const peer3 = await createSecp256k1PeerId();
-    const peer4 = await createSecp256k1PeerId();
-    const peer5 = await createSecp256k1PeerId();
+    const [peer1, peer2, peer3, peer4, peer5] = await Promise.all([
+      generateKeyPair("secp256k1").then(peerIdFromPrivateKey),
+      generateKeyPair("secp256k1").then(peerIdFromPrivateKey),
+      generateKeyPair("secp256k1").then(peerIdFromPrivateKey),
+      generateKeyPair("secp256k1").then(peerIdFromPrivateKey),
+      generateKeyPair("secp256k1").then(peerIdFromPrivateKey)
+    ]);
 
     const mockPeers = [
       {
@@ -105,11 +112,13 @@ describe("filterPeersByDiscovery function", function () {
   });
 
   it("should return only bootstrap peers up to maxBootstrapPeers", async function () {
-    const peer1 = await createSecp256k1PeerId();
-    const peer2 = await createSecp256k1PeerId();
-    const peer3 = await createSecp256k1PeerId();
-    const peer4 = await createSecp256k1PeerId();
-    const peer5 = await createSecp256k1PeerId();
+    const [peer1, peer2, peer3, peer4, peer5] = await Promise.all([
+      generateKeyPair("secp256k1").then(peerIdFromPrivateKey),
+      generateKeyPair("secp256k1").then(peerIdFromPrivateKey),
+      generateKeyPair("secp256k1").then(peerIdFromPrivateKey),
+      generateKeyPair("secp256k1").then(peerIdFromPrivateKey),
+      generateKeyPair("secp256k1").then(peerIdFromPrivateKey)
+    ]);
 
     const mockPeers = [
       {

diff --git a/packages/discovery/src/dns/fetch_nodes.spec.ts b/packages/discovery/src/dns/fetch_nodes.spec.ts
@@ -1,4 +1,5 @@
-import { createSecp256k1PeerId } from "@libp2p/peer-id-factory";
+import { generateKeyPair } from "@libp2p/crypto/keys";
+import { peerIdFromPrivateKey } from "@libp2p/peer-id";
 import { multiaddr } from "@multiformats/multiaddr";
 import { ENR } from "@waku/enr";
 import { EnrCreator } from "@waku/enr";
@@ -8,7 +9,7 @@ import { expect } from "chai";
 import { fetchNodesUntilCapabilitiesFulfilled } from "./fetch_nodes.js";
 
 async function createEnr(waku2: Waku2): Promise<ENR> {
-  const peerId = await createSecp256k1PeerId();
+  const peerId = await generateKeyPair("secp256k1").then(peerIdFromPrivateKey);
   const enr = await EnrCreator.fromPeerId(peerId);
   enr.setLocationMultiaddr(multiaddr("/ip4/18.223.219.100/udp/9000"));
   enr.multiaddrs = [

diff --git a/packages/discovery/src/local-peer-cache/index.spec.ts b/packages/discovery/src/local-peer-cache/index.spec.ts
@@ -1,9 +1,9 @@
+import { generateKeyPair } from "@libp2p/crypto/keys";
 import type { IdentifyResult } from "@libp2p/interface";
 import { TypedEventEmitter } from "@libp2p/interface";
 import tests from "@libp2p/interface-compliance-tests/peer-discovery";
 import { prefixLogger } from "@libp2p/logger";
-import { createSecp256k1PeerId } from "@libp2p/peer-id-factory";
-import { createFromJSON } from "@libp2p/peer-id-factory";
+import { peerIdFromPrivateKey, peerIdFromString } from "@libp2p/peer-id";
 import { PersistentPeerStore } from "@libp2p/peer-store";
 import { multiaddr } from "@multiformats/multiaddr";
 import { Libp2pComponents } from "@waku/interfaces";
@@ -55,7 +55,7 @@ describe("Local Storage Discovery", function () {
     components = {
       peerStore: new PersistentPeerStore({
         events: new TypedEventEmitter(),
-        peerId: await createSecp256k1PeerId(),
+        peerId: await generateKeyPair("secp256k1").then(peerIdFromPrivateKey),
         datastore: new MemoryDatastore(),
         logger: prefixLogger("local_discovery.spec.ts")
       }),
@@ -103,9 +103,7 @@ describe("Local Storage Discovery", function () {
     it("should update peers in local storage on 'peer:identify' event", async () => {
       const newPeerIdentifyEvent = {
         detail: {
-          peerId: await createFromJSON({
-            id: mockPeers[1].id
-          }),
+          peerId: peerIdFromString(mockPeers[1].id.toString()),
           listenAddrs: [multiaddr(mockPeers[1].address)]
         }
       } as CustomEvent<IdentifyResult>;

diff --git a/packages/enr/src/decoder.ts b/packages/enr/src/decoder.ts
@@ -37,7 +37,7 @@ async function fromValues(values: Uint8Array[]): Promise<ENR> {
   }
   const _seq = decodeSeq(seq);
 
-  const enr = await ENR.create(obj, _seq, signature);
+  const enr = ENR.create(obj, _seq, signature);
   checkSignature(seq, kvs, enr, signature);
   return enr;
 }