Merge pull request #1014 from LiskHQ/1008-refactor-peers-consensus-reuse

Remove consensus calculation from Peers.prototype.list - Subtask #1008
LiskArchive · Nov 22, 2017 · 0877380 · 0877380
2 parents 229e0ac + 5a584e8
commit 0877380
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/logic/broadcaster.js b/logic/broadcaster.js
@@ -105,14 +105,14 @@ Broadcaster.prototype.getPeers = function (params, cb) {
 
 	var originalLimit = params.limit;
 
-	modules.peers.list(params, function (err, peers, consensus) {
+	modules.peers.list(params, function (err, peers) {
 		if (err) {
 			return setImmediate(cb, err);
 		}
 
 		if (self.consensus !== undefined && originalLimit === constants.maxPeers) {
-			library.logger.info(['Broadhash consensus now', consensus, '%'].join(' '));
-			self.consensus = consensus;
+			self.consensus = modules.peers.getConsensus(null, peers);
+			library.logger.info(['Broadhash consensus now', self.consensus, '%'].join(' '));
 		}
 
 		return setImmediate(cb, null, peers);

diff --git a/modules/peers.js b/modules/peers.js
@@ -503,14 +503,7 @@ Peers.prototype.list = function (options, cb) {
 				return setImmediate(waterCb, null, peers);
 			}
 		}
-	], function (err, peers) {
-		// Calculate consensus
-		var consensus = Math.round(options.matched / peers.length * 100 * 1e2) / 1e2;
-		consensus = isNaN(consensus) ? 0 : consensus;
-
-		library.logger.debug(['Listing', peers.length, 'total peers'].join(' '));
-		return setImmediate(cb, err, peers, consensus);
-	});
+	], cb);
 };
 
 // Events