RanchiMall/fcoin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor refactor.

Browse Source
This commit is contained in:
Christopher Jeffrey 2016-02-19 21:48:06 -08:00
parent 28274cdba4
commit 48d7b95d61
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/bcoin/pool.js
View File

@ -80,8 +80,8 @@ function Pool(options) {
this.synced = false; this.synced = false;
this.load = { this.load = {
timeout: options.loadTimeout || 30000, timeout: options.loadTimeout || 40000,
interval: options.loadInterval || 5000 interval: options.loadInterval || 20000
}; };
this.requestTimeout = options.requestTimeout || 600000; this.requestTimeout = options.requestTimeout || 600000;
@ -628,7 +628,7 @@ Pool.prototype._handleInv = function _handleInv(hashes, peer) {
var i, hash; var i, hash;
// Ignore for now if we're still syncing // Ignore for now if we're still syncing
if (!this.chain.isFull()) if (!this.synced)
return; return;
for (i = 0; i < hashes.length; i++) { for (i = 0; i < hashes.length; i++) {
@ -706,10 +706,6 @@ Pool.prototype._handleBlock = function _handleBlock(block, peer, callback) {
}); });
}; };
Pool.prototype.isFull = function isFull() {
return this.chain.isFull();
};
Pool.prototype._load = function _load() { Pool.prototype._load = function _load() {
var self = this; var self = this;
var next; var next;
@ -793,7 +789,7 @@ Pool.prototype._createPeer = function _createPeer(options) {
self.emit('txs', txs, peer); self.emit('txs', txs, peer);
if (!self.options.spv) { if (!self.options.spv) {
if (!self.chain.isFull()) if (!self.synced)
return; return;
} }
@ -818,18 +814,20 @@ Pool.prototype._createPeer = function _createPeer(options) {
Pool.prototype._handleTX = function _handleTX(tx, peer, callback) { Pool.prototype._handleTX = function _handleTX(tx, peer, callback) {
var self = this; var self = this;
var requested, added; var requested, updated;
callback = utils.asyncify(callback); callback = utils.asyncify(callback);
requested = this.fulfill(tx); requested = this.fulfill(tx);
added = this.markTX(tx, 1); updated = this.markTX(tx, 1);
function addMempool(tx, peer, callback) { function addMempool(tx, peer, callback) {
if (!self.mempool) if (!self.mempool)
return callback(); return callback();
if (tx.ts !== 0) if (tx.ts !== 0)
return callback(); return callback();
self.mempool.addTX(tx, peer, callback); self.mempool.addTX(tx, peer, callback);
} }
@ -841,7 +839,7 @@ Pool.prototype._handleTX = function _handleTX(tx, peer, callback) {
if (err && self.synced) if (err && self.synced)
utils.debug('Mempool error: %s', err.message); utils.debug('Mempool error: %s', err.message);
if (added || tx.block) if (updated || tx.block)
self.emit('tx', tx, peer); self.emit('tx', tx, peer);
if (self.options.spv && tx.block) if (self.options.spv && tx.block)