From e968e1701ea2c61fcd648d0c62ac4f8535570367 Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Mon, 23 May 2016 03:51:35 -0700 Subject: [PATCH] stop requesting every tx in existence. --- lib/bcoin/peer.js | 5 ----- lib/bcoin/pool.js | 8 ++++++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/bcoin/peer.js b/lib/bcoin/peer.js index a1a2ddd3..2637b80a 100644 --- a/lib/bcoin/peer.js +++ b/lib/bcoin/peer.js @@ -235,11 +235,6 @@ Peer.prototype._init = function init() { if (self.pool.feeRate !== -1) self.setFeeRate(self.pool.feeRate); - // If we're fully synced, see - // what we missed out on. - if (self.pool.synced) - self.getMempool(); - // Finally we can let the pool know // that this peer is ready to go. self.ack = true; diff --git a/lib/bcoin/pool.js b/lib/bcoin/pool.js index c76fd72d..e0e1c6f1 100644 --- a/lib/bcoin/pool.js +++ b/lib/bcoin/pool.js @@ -313,8 +313,8 @@ Pool.prototype._init = function _init() { this.chain.on('full', function() { self._stopTimer(); self._stopInterval(); - if (!self.synced) - self.getMempool(); + if (!self.synced && self.peers.load) + self.peers.load.getMempool(); self.synced = true; self.emit('full'); bcoin.debug('Chain is fully synced (height=%d).', self.chain.height); @@ -557,8 +557,12 @@ Pool.prototype._addLoader = function _addLoader() { }); peer.once('ack', function() { + if (self.synced) + peer.getMempool(); + if (!self.syncing) return; + self._load(); });