Merge pull request #3652 from LiskHQ/3643-seed_discovery

Discovery is too reliant on seed peers - Closes #3643
LiskArchive · May 17, 2019 · 8ac5068 · 8ac5068
2 parents 0312196 + 06b47a5
commit 8ac5068
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/elements/lisk-p2p/src/p2p.ts b/elements/lisk-p2p/src/p2p.ts
@@ -552,17 +552,15 @@ export class P2P extends EventEmitter {
 		this._peerPool.selectPeersAndConnect([...this._newPeers.values()]);
 	}
 
-	private async _startDiscovery(
-		knownPeers: ReadonlyArray<P2PDiscoveredPeerInfo> = [],
-	): Promise<void> {
+	private async _startDiscovery(): Promise<void> {
 		if (this._discoveryIntervalId) {
 			throw new Error('Discovery is already running');
 		}
 		this._discoveryIntervalId = setInterval(async () => {
-			await this._discoverPeers(knownPeers);
+			await this._discoverPeers([...this._triedPeers.values()]);
 		}, this._discoveryInterval);
 
-		await this._discoverPeers(knownPeers);
+		await this._discoverPeers([...this._triedPeers.values()]);
 	}
 
 	private _stopDiscovery(): void {
@@ -643,7 +641,7 @@ export class P2P extends EventEmitter {
 			}
 		});
 
-		await this._startDiscovery(seedPeerInfos);
+		await this._startDiscovery();
 	}
 
 	public async stop(): Promise<void> {

diff --git a/elements/lisk-p2p/test/integration/p2p.ts b/elements/lisk-p2p/test/integration/p2p.ts
@@ -136,7 +136,7 @@ describe('Integration tests for P2P library', () => {
 		describe('Peer discovery', () => {
 			it('should discover all peers in the network after a few cycles of discovery', async () => {
 				// Wait for a few cycles of discovery.
-				await wait(DISCOVERY_INTERVAL * 5);
+				await wait(DISCOVERY_INTERVAL * 7);
 
 				p2pNodeList.forEach(p2p => {
 					const { connectedPeers } = p2p.getNetworkStatus();