chore: improve hasPeers()

waku-org · Oct 9, 2024 · b9bfaa2 · b9bfaa2
1 parent 874d835
commit b9bfaa2
Showing 1 changed file with 7 additions and 16 deletions.
diff --git a/packages/sdk/src/protocols/base_protocol.ts b/packages/sdk/src/protocols/base_protocol.ts
@@ -100,28 +100,19 @@ export class BaseProtocolSDK implements IBaseProtocolSDK {
       `Checking for peers. forceUseAllPeers: ${forceUseAllPeers}, maxAttempts: ${maxAttempts}`
     );
 
-    if (!forceUseAllPeers && this.connectedPeers.length > 0) {
-      this.log.debug(
-        `At least one peer connected (${this.connectedPeers.length}), not forcing use of all peers`
-      );
-      return true;
-    }
-
-    if (!forceUseAllPeers) {
-      await this.maintainPeers();
-      const hasPeers = this.connectedPeers.length > 0;
-      this.log.debug(
-        `After maintenance, connected peers: ${this.connectedPeers.length}`
-      );
-      return hasPeers;
-    }
-
     for (let attempts = 0; attempts < maxAttempts; attempts++) {
       this.log.debug(
         `Attempt ${attempts + 1}/${maxAttempts} to reach required number of peers`
       );
       await this.maintainPeers();
 
+      if (!forceUseAllPeers && this.connectedPeers.length > 0) {
+        this.log.debug(
+          `At least one peer connected (${this.connectedPeers.length}), not forcing use of all peers`
+        );
+        return true;
+      }
+
       if (this.connectedPeers.length >= this.numPeersToUse) {
         this.log.info(
           `Required number of peers (${this.numPeersToUse}) reached`