From f32d93c71b8bb6b90231685d04040cf4e2c3688a Mon Sep 17 00:00:00 2001
From: Danish Arora <danisharora099@gmail.com>
Date: Tue, 6 Aug 2024 13:31:53 +0700
Subject: [PATCH] chore: choose peers from the connected pool, instead of
 dialing them

---
 packages/core/src/lib/base_protocol.ts      | 12 +++++++-----
 packages/sdk/src/protocols/base_protocol.ts | 16 +++++++++-------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/packages/core/src/lib/base_protocol.ts b/packages/core/src/lib/base_protocol.ts
index eec9bdce82..eeb73e9200 100644
--- a/packages/core/src/lib/base_protocol.ts
+++ b/packages/core/src/lib/base_protocol.ts
@@ -23,6 +23,12 @@ type GetPeersOptions = {
   maxBootstrapPeers: number;
 };
 
+const DEFAULT_GET_PEERS_OPTIONS: GetPeersOptions = {
+  prioritizeLatency: true,
+  maxBootstrapPeers: 1,
+  numPeers: 0
+};
+
 /**
  * A class with predefined helpers, to be used as a base to implement Waku
  * Protocols.
@@ -90,11 +96,7 @@ export class BaseProtocol implements IBaseProtocolCore {
   * @returns A list of peers that support the protocol sorted by latency.
   */
   public async getPeers(
-    options: GetPeersOptions = {
-      prioritizeLatency: true,
-      maxBootstrapPeers: 1,
-      numPeers: 0
-    }
+    options: GetPeersOptions = DEFAULT_GET_PEERS_OPTIONS
   ): Promise<Peer[]> {
     const { maxBootstrapPeers, numPeers, prioritizeLatency } = options;
 
diff --git a/packages/sdk/src/protocols/base_protocol.ts b/packages/sdk/src/protocols/base_protocol.ts
index 8b6343a895..e5418b47b8 100644
--- a/packages/sdk/src/protocols/base_protocol.ts
+++ b/packages/sdk/src/protocols/base_protocol.ts
@@ -198,11 +198,6 @@ export class BaseProtocolSDK implements IBaseProtocolSDK {
     this.log.info(`Finding and adding ${numPeers} new peers`);
     try {
       const additionalPeers = await this.findAdditionalPeers(numPeers);
-      const dials = additionalPeers.map((peer) =>
-        this.connectionManager.attemptDial(peer.id)
-      );
-
-      await Promise.all(dials);
 
       const updatedPeers = [...this.peers, ...additionalPeers];
       this.updatePeers(updatedPeers);
@@ -227,10 +222,17 @@ export class BaseProtocolSDK implements IBaseProtocolSDK {
   private async findAdditionalPeers(numPeers: number): Promise<Peer[]> {
     this.log.info(`Finding ${numPeers} additional peers`);
     try {
-      let newPeers = await this.core.allPeers();
+      let newPeers = await this.core.getPeers({
+        maxBootstrapPeers: 0,
+        numPeers: 0
+      });
 
       if (newPeers.length === 0) {
-        this.log.warn("No new peers found.");
+        this.log.warn("No new peers found, trying with bootstrap peers");
+        newPeers = await this.core.getPeers({
+          maxBootstrapPeers: numPeers,
+          numPeers: 0
+        });
       }
 
       newPeers = newPeers