From cadfaf4d0cb24f2fde1f801e8d3253864769493f Mon Sep 17 00:00:00 2001
From: achingbrain <alex@achingbrain.net>
Date: Wed, 10 May 2023 09:25:42 +0100
Subject: [PATCH] chore: fix e2e tests

---
 package-lock.json | 79 +++++++++++------------------------------------
 package.json      |  4 +--
 src/index.ts      | 14 +++++++--
 3 files changed, 31 insertions(+), 66 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6009a5d7..02ec2fbd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -39,10 +39,10 @@
         "@dapplion/benchmark": "^0.2.2",
         "@libp2p/floodsub": "^7.0.1",
         "@libp2p/interface-libp2p": "^3.1.0",
-        "@libp2p/interface-mocks": "^12.0.0",
+        "@libp2p/interface-mocks": "^12.0.1",
         "@libp2p/interface-pubsub-compliance-tests": "^5.0.0",
         "@libp2p/peer-id-factory": "^2.0.0",
-        "@libp2p/peer-store": "^8.1.0",
+        "@libp2p/peer-store": "^8.1.2",
         "@types/node": "^17.0.21",
         "@typescript-eslint/eslint-plugin": "^3.0.2",
         "@typescript-eslint/parser": "^3.0.2",
@@ -2886,9 +2886,9 @@
       }
     },
     "node_modules/@libp2p/interface-compliance-tests/node_modules/@types/node": {
-      "version": "18.16.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.16.6.tgz",
-      "integrity": "sha512-N7KINmeB8IN3vRR8dhgHEp+YpWvGFcpDoh5XZ8jB5a00AdFKCKEyyGTOPTddUf4JqU1ZKTVxkOxakDvchNVI2Q==",
+      "version": "18.16.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.16.7.tgz",
+      "integrity": "sha512-MFg7ua/bRtnA1hYE3pVyWxGd/r7aMqjNOdHvlSsXV3n8iaeGKkOaPzpJh6/ovf4bEXWcojkeMJpTsq3mzXW4IQ==",
       "dev": true
     },
     "node_modules/@libp2p/interface-compliance-tests/node_modules/@typescript-eslint/eslint-plugin": {
@@ -3896,23 +3896,6 @@
         "npm": ">=7.0.0"
       }
     },
-    "node_modules/@libp2p/interface-dht": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@libp2p/interface-dht/-/interface-dht-2.0.3.tgz",
-      "integrity": "sha512-JAKbHvw3egaSeB7CHOf6PF/dLNim4kzAiXX+0IEz2lln8L32/Xf1T7KNOF/RSbSYqO9b7Xxc/b2fuSfyaMwwMQ==",
-      "dev": true,
-      "dependencies": {
-        "@libp2p/interface-peer-discovery": "^2.0.0",
-        "@libp2p/interface-peer-id": "^2.0.0",
-        "@libp2p/interface-peer-info": "^1.0.0",
-        "@libp2p/interfaces": "^3.0.0",
-        "multiformats": "^11.0.0"
-      },
-      "engines": {
-        "node": ">=16.0.0",
-        "npm": ">=7.0.0"
-      }
-    },
     "node_modules/@libp2p/interface-keychain": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/@libp2p/interface-keychain/-/interface-keychain-2.0.5.tgz",
@@ -3974,9 +3957,9 @@
       }
     },
     "node_modules/@libp2p/interface-mocks": {
-      "version": "12.0.0",
-      "resolved": "https://registry.npmjs.org/@libp2p/interface-mocks/-/interface-mocks-12.0.0.tgz",
-      "integrity": "sha512-aTJ9d3wkY/tYehMGnTobm21isT2VsacIE6W+Nop+s7eDi4O/8cB+47eFnwuxTeNm7tOXro3UbtU7hPQ5k/w9Aw==",
+      "version": "12.0.1",
+      "resolved": "https://registry.npmjs.org/@libp2p/interface-mocks/-/interface-mocks-12.0.1.tgz",
+      "integrity": "sha512-GO8EXT70oOt4oBXaeNLdLxmvrIR0CFOH5kBNCkVo9rolE3diCX6j3HCU5UQ7+aXeZp3pGF/E6B/CcJa2iswN/g==",
       "dev": true,
       "dependencies": {
         "@libp2p/interface-connection": "^5.0.0",
@@ -4394,9 +4377,9 @@
       }
     },
     "node_modules/@libp2p/interface-pubsub-compliance-tests/node_modules/@types/node": {
-      "version": "18.16.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.16.6.tgz",
-      "integrity": "sha512-N7KINmeB8IN3vRR8dhgHEp+YpWvGFcpDoh5XZ8jB5a00AdFKCKEyyGTOPTddUf4JqU1ZKTVxkOxakDvchNVI2Q==",
+      "version": "18.16.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.16.7.tgz",
+      "integrity": "sha512-MFg7ua/bRtnA1hYE3pVyWxGd/r7aMqjNOdHvlSsXV3n8iaeGKkOaPzpJh6/ovf4bEXWcojkeMJpTsq3mzXW4IQ==",
       "dev": true
     },
     "node_modules/@libp2p/interface-pubsub-compliance-tests/node_modules/@typescript-eslint/eslint-plugin": {
@@ -5507,13 +5490,13 @@
       }
     },
     "node_modules/@libp2p/peer-store": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@libp2p/peer-store/-/peer-store-8.1.0.tgz",
-      "integrity": "sha512-N8F1f52mrKOjT69v2RKosu9JuxIcHJTEFMyQF51UykeynnEzyW6YrIhUgcvFaSMi9WYQH29y2OHSab3fFw5bdQ==",
+      "version": "8.1.2",
+      "resolved": "https://registry.npmjs.org/@libp2p/peer-store/-/peer-store-8.1.2.tgz",
+      "integrity": "sha512-NosqQs6roWPi7m2fqTixYV0t4yOa07AV3ZdzzdVSddqrZvV3frKw6pZOgJ37e8uuoCh+bK/uyFB8NdbXKh1GJw==",
       "dev": true,
       "dependencies": {
         "@libp2p/crypto": "^1.0.15",
-        "@libp2p/interface-libp2p": "^2.0.0",
+        "@libp2p/interface-libp2p": "^3.1.0",
         "@libp2p/interface-peer-id": "^2.0.0",
         "@libp2p/interface-peer-store": "^2.0.1",
         "@libp2p/interfaces": "^3.2.0",
@@ -5533,32 +5516,6 @@
         "npm": ">=7.0.0"
       }
     },
-    "node_modules/@libp2p/peer-store/node_modules/@libp2p/interface-libp2p": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@libp2p/interface-libp2p/-/interface-libp2p-2.0.0.tgz",
-      "integrity": "sha512-vuAVQjvFEj+TMdj6LLRPiNGwpcY8zabPZCZ4HAPJ7NzOroBEWp4VIoSaTBncXAbUzAE3HRoBmXQhfvk7qPocVg==",
-      "dev": true,
-      "dependencies": {
-        "@libp2p/interface-connection": "^5.0.0",
-        "@libp2p/interface-content-routing": "^2.0.0",
-        "@libp2p/interface-dht": "^2.0.0",
-        "@libp2p/interface-keychain": "^2.0.0",
-        "@libp2p/interface-metrics": "^4.0.0",
-        "@libp2p/interface-peer-id": "^2.0.0",
-        "@libp2p/interface-peer-info": "^1.0.0",
-        "@libp2p/interface-peer-routing": "^1.0.0",
-        "@libp2p/interface-peer-store": "^2.0.0",
-        "@libp2p/interface-pubsub": "^4.0.0",
-        "@libp2p/interface-registrar": "^2.0.0",
-        "@libp2p/interface-transport": "^4.0.0",
-        "@libp2p/interfaces": "^3.0.0",
-        "@multiformats/multiaddr": "^12.0.0"
-      },
-      "engines": {
-        "node": ">=16.0.0",
-        "npm": ">=7.0.0"
-      }
-    },
     "node_modules/@libp2p/pubsub": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/@libp2p/pubsub/-/pubsub-7.0.1.tgz",
@@ -7750,9 +7707,9 @@
       }
     },
     "node_modules/aegir/node_modules/@types/node": {
-      "version": "18.16.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.16.6.tgz",
-      "integrity": "sha512-N7KINmeB8IN3vRR8dhgHEp+YpWvGFcpDoh5XZ8jB5a00AdFKCKEyyGTOPTddUf4JqU1ZKTVxkOxakDvchNVI2Q==",
+      "version": "18.16.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.16.7.tgz",
+      "integrity": "sha512-MFg7ua/bRtnA1hYE3pVyWxGd/r7aMqjNOdHvlSsXV3n8iaeGKkOaPzpJh6/ovf4bEXWcojkeMJpTsq3mzXW4IQ==",
       "dev": true
     },
     "node_modules/aegir/node_modules/@typescript-eslint/eslint-plugin": {
diff --git a/package.json b/package.json
index 0c52ed8d..3c1cec57 100644
--- a/package.json
+++ b/package.json
@@ -100,10 +100,10 @@
     "@dapplion/benchmark": "^0.2.2",
     "@libp2p/floodsub": "^7.0.1",
     "@libp2p/interface-libp2p": "^3.1.0",
-    "@libp2p/interface-mocks": "^12.0.0",
+    "@libp2p/interface-mocks": "^12.0.1",
     "@libp2p/interface-pubsub-compliance-tests": "^5.0.0",
     "@libp2p/peer-id-factory": "^2.0.0",
-    "@libp2p/peer-store": "^8.1.0",
+    "@libp2p/peer-store": "^8.1.2",
     "@types/node": "^17.0.21",
     "@typescript-eslint/eslint-plugin": "^3.0.2",
     "@typescript-eslint/parser": "^3.0.2",
diff --git a/src/index.ts b/src/index.ts
index 0ecc9a0a..80f41d45 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -78,7 +78,7 @@ import { InboundStream, OutboundStream } from './stream.js'
 import { Uint8ArrayList } from 'uint8arraylist'
 import { decodeRpc, DecodeRPCLimits, defaultDecodeRpcLimits } from './message/decodeRpc.js'
 import { ConnectionManager } from '@libp2p/interface-connection-manager'
-import { PeerStore } from '@libp2p/interface-peer-store'
+import { Peer, PeerStore } from '@libp2p/interface-peer-store'
 import { Multiaddr } from '@multiformats/multiaddr'
 import { multiaddrToIPStr } from './utils/multiaddr.js'
 
@@ -2428,11 +2428,19 @@ export class GossipSub extends EventEmitter<GossipsubEvents> implements PubSub<G
         // unsigned address records through PX anyways
         // Finding signed records in the DHT is not supported at the time of writing in js-libp2p
         const id = peerIdFromString(peerId)
-        const peerInfo = await this.components.peerStore.get(id)
+        let peerInfo: Peer | undefined
+
+        try {
+          peerInfo = await this.components.peerStore.get(id)
+        } catch (err: any) {
+          if (err.code !== 'ERR_NOT_FOUND') {
+            throw err
+          }
+        }
 
         return {
           peerID: id.toBytes(),
-          signedPeerRecord: peerInfo.peerRecordEnvelope
+          signedPeerRecord: peerInfo?.peerRecordEnvelope
         }
       })
     )