From 3b05bfe988bb616beb2b106c7f5c70c8251fd3c5 Mon Sep 17 00:00:00 2001 From: "fryorcraken.eth" Date: Sun, 11 Sep 2022 09:49:17 +1000 Subject: [PATCH] refact: getPeersForProtocol only needs the peer store --- src/lib/select_peer.ts | 7 +++---- src/lib/waku_filter/index.ts | 2 +- src/lib/waku_light_push/index.ts | 2 +- src/lib/waku_store/index.ts | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/lib/select_peer.ts b/src/lib/select_peer.ts index 13bde3627a..e712412815 100644 --- a/src/lib/select_peer.ts +++ b/src/lib/select_peer.ts @@ -1,5 +1,4 @@ -import { Peer } from "@libp2p/interface-peer-store"; -import { Libp2p } from "libp2p"; +import type { Peer, PeerStore } from "@libp2p/interface-peer-store"; /** * Returns a pseudo-random peer that supports the given protocol. @@ -18,11 +17,11 @@ export async function selectRandomPeer( * Returns the list of peers that supports the given protocol. */ export async function getPeersForProtocol( - libp2p: Libp2p, + peerStore: PeerStore, protocols: string[] ): Promise { const peers: Peer[] = []; - await libp2p.peerStore.forEach((peer) => { + await peerStore.forEach((peer) => { for (let i = 0; i < protocols.length; i++) { if (peer.protocols.includes(protocols[i])) { peers.push(peer); diff --git a/src/lib/waku_filter/index.ts b/src/lib/waku_filter/index.ts index bd3bc8e8c9..fdcf1abed5 100644 --- a/src/lib/waku_filter/index.ts +++ b/src/lib/waku_filter/index.ts @@ -272,7 +272,7 @@ export class WakuFilter { } async peers(): Promise { - return getPeersForProtocol(this.libp2p, [FilterCodec]); + return getPeersForProtocol(this.libp2p.peerStore, [FilterCodec]); } async randomPeer(): Promise { diff --git a/src/lib/waku_light_push/index.ts b/src/lib/waku_light_push/index.ts index a5a36bcce7..48e5b5a111 100644 --- a/src/lib/waku_light_push/index.ts +++ b/src/lib/waku_light_push/index.ts @@ -109,7 +109,7 @@ export class WakuLightPush { * peers. */ async peers(): Promise { - return getPeersForProtocol(this.libp2p, [LightPushCodec]); + return getPeersForProtocol(this.libp2p.peerStore, [LightPushCodec]); } /** diff --git a/src/lib/waku_store/index.ts b/src/lib/waku_store/index.ts index 2970fe0111..24fea200c6 100644 --- a/src/lib/waku_store/index.ts +++ b/src/lib/waku_store/index.ts @@ -312,7 +312,7 @@ export class WakuStore { codecs.push(codec); } - return getPeersForProtocol(this.libp2p, codecs); + return getPeersForProtocol(this.libp2p.peerStore, codecs); } /**