refactor(core-p2p): Use acceptNewPeer() from discoverPeers()

acceptNewPeer() will call ping(), thus avoiding a peers without a state
in the list of peers.

After this change addPeer() is unused and has been removed.

Author: vasild

packages/core-p2p/__tests__/court/guard.test.ts

@@ -5,7 +5,6 @@ import { defaults } from "../../src/defaults";
 import { Peer } from "../../src/peer";
 import { setUp, tearDown } from "../__support__/setup";
 
-const CORE_ENV = process.env.CORE_ENV;
 let guard;
 let peerMock;
 
@@ -35,18 +34,14 @@ beforeEach(async () => {
 describe("Guard", () => {
     describe("isSuspended", () => {
         it("should return true", async () => {
-            process.env.CORE_ENV = "false";
             await guard.monitor.acceptNewPeer(peerMock);
-            process.env.CORE_ENV = CORE_ENV;
 
             expect(guard.isSuspended(peerMock)).toBe(true);
         });
 
         it("should return false because passed", async () => {
-            process.env.CORE_ENV = "false";
             await guard.monitor.acceptNewPeer(peerMock);
             guard.suspensions[peerMock.ip].until = dayjs().subtract(1, "minute");
-            process.env.CORE_ENV = CORE_ENV;
 
             expect(guard.isSuspended(peerMock)).toBe(false);
         });

packages/core-p2p/__tests__/monitor.test.ts

@@ -71,13 +71,9 @@ describe("Monitor", () => {
                 peerMock.headers,
             ]);
 
-            process.env.CORE_ENV = "false";
-
             await monitor.acceptNewPeer(peerMock);
 
             expect(monitor.peers[peerMock.ip]).toBeObject();
-
-            process.env.CORE_ENV = "test";
         });
     });
 

packages/core-p2p/src/monitor.ts

@@ -140,12 +140,7 @@ export class Monitor implements P2P.IMonitor {
             return;
         }
 
-        if (
-            !isValidPeer(peer) ||
-            this.guard.isSuspended(peer) ||
-            this.pendingPeers[peer.ip] ||
-            process.env.CORE_ENV === "test"
-        ) {
+        if (!isValidPeer(peer) || this.guard.isSuspended(peer) || this.pendingPeers[peer.ip]) {
             return;
         }
 
@@ -390,9 +385,7 @@ export class Monitor implements P2P.IMonitor {
                 const hisPeers = await peer.getPeers();
 
                 for (const p of hisPeers) {
-                    if (isValidPeer(p) && !this.getPeer(p.ip)) {
-                        this.addPeer(p);
-                    }
+                    this.acceptNewPeer(p);
                 }
             } catch (error) {
                 // Just try with the next peer from shuffledPeers.
@@ -769,35 +762,6 @@ export class Monitor implements P2P.IMonitor {
         }
     }
 
-    /**
-     * Add a new peer after it passes a few checks.
-     * @param  {Peer} peer
-     * @return {void}
-     */
-    private addPeer(peer) {
-        if (this.guard.isBlacklisted(peer)) {
-            return;
-        }
-
-        if (!this.guard.isValidVersion(peer)) {
-            return;
-        }
-
-        if (!this.guard.isValidNetwork(peer)) {
-            return;
-        }
-
-        if (!this.guard.isValidMilestoneHash(peer)) {
-            return;
-        }
-
-        if (!this.guard.isValidPort(peer)) {
-            return;
-        }
-
-        this.peers[peer.ip] = new Peer(peer.ip, peer.port);
-    }
-
     /**
      * Schedule the next update network status.
      * @param {Number} nextUpdateInSeconds