Refactor Peers.prototype.getConsensus - Subtask #1008

logic/broadcaster.js

@@ -111,7 +111,7 @@ Broadcaster.prototype.getPeers = function (params, cb) {
 		}
 
 		if (self.consensus !== undefined && originalLimit === constants.maxPeers) {
-			self.consensus = modules.peers.getConsensus(null, peers);
+			self.consensus = modules.peers.getConsensus(peers);
 			library.logger.info(['Broadhash consensus now', self.consensus, '%'].join(' '));
 		}
 

modules/peers.js

@@ -305,29 +305,28 @@ __private.dbSave = function (cb) {
 	});
 };
 
-Peers.prototype.getConsensus = function (matched, active) {
-
+/**
+* Calculates consensus for as a ratio active to matched peers.
+* @param {Array<Peer>} active - Active peers (with connected state).
+* @param {Array<Peer>} matched - Peers with same as system broadhash.
+* @returns {number|undefined} - Consensus or undefined if config.forging.force = true.
+*/
+Peers.prototype.getConsensus = function (active, matched) {
 	if (library.config.forging.force) {
 		return undefined;
 	}
-
-	active = active || __private.getByFilter({state: Peer.STATE.CONNECTED, normalized: false});
-	matched = matched || __private.getMatched({broadhash: modules.system.getBroadhash()}, active);
-
-	active = active.slice(0, constants.maxPeers);
-	matched = matched.slice(0, constants.maxPeers);
-
-	var consensus = Math.round(matched.length / active.length * 100 * 1e2) / 100;
-
-	if (isNaN(consensus)) {
-		return 0;
-	}
-
-	return consensus;
+	active = active || library.logic.peers.list(true);
+	var broadhash = modules.system.getBroadhash();
+	matched = matched || active.filter(function (peer) {
+		return peer.broadhash === broadhash;
+	});
+	var activeCount = Math.min(active.length, constants.maxPeers);
+	var matchedCount = Math.min(matched.length, activeCount);
+	var consensus = +(matchedCount / activeCount * 100).toPrecision(2);
+	return isNaN(consensus) ? 0 : consensus;
 };
 
 // Public methods
-
 /**
  * Updates peer in peers list.
  * @param {peer} peer