From 9a42f86c2e9650fe30ef4f480cac4c26c74bc4ab Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Thu, 12 May 2016 03:05:34 -0700 Subject: [PATCH] more mempool work. --- lib/bcoin/mempool.js | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/lib/bcoin/mempool.js b/lib/bcoin/mempool.js index e0face39..9214f2ab 100644 --- a/lib/bcoin/mempool.js +++ b/lib/bcoin/mempool.js @@ -629,15 +629,8 @@ Mempool.prototype.addTX = function addTX(tx, callback, force) { if (err) return callback(err); - if (!tx.hasCoins()) { - if (self.getSize() > self.maxSize) { - return callback(new VerifyError(tx, - 'insufficientfee', - 'mempool full', - 0)); - } + if (!tx.hasCoins()) return self.storeOrphan(tx, callback); - } self.verify(tx, function(err) { if (err) @@ -774,7 +767,7 @@ Mempool.prototype.removeUnchecked = function removeUnchecked(tx, limit, callback Mempool.prototype.getMinRate = function getMinRate() { var now, halflife, exp; - if (!this.blockSinceBump || this.minFeeRate == 0) + if (!this.blockSinceBump || this.minFeeRate === 0) return this.minFeeRate; now = utils.now(); @@ -1663,7 +1656,7 @@ MempoolTX.fromRaw = function fromRaw(data, saveCoins) { MempoolTX.prototype.getPriority = function getPriority(height) { var heightDelta = Math.max(0, height - this.height); - var modSize = this.tx.getModifiedSize(); + var modSize = this.tx.getModifiedSize(this.size); var deltaPriority = new bn(heightDelta).mul(this.chainValue).divn(modSize); var result = this.priority.add(deltaPriority); if (result.cmpn(0) < 0)