Browse Source

Remove extraneous LogPrint from fee estimation

Once priority estimation was removed, not all transactions in the mempool are tracked in the fee estimation mempool tracking.  So there is no error if a transaction is not found for removal.
0.14
Alex Morcos 8 years ago
parent
commit
4df44794c9
  1. 17
      src/policy/fees.cpp
  2. 2
      src/policy/fees.h

17
src/policy/fees.cpp

@ -281,19 +281,16 @@ void TxConfirmStats::removeTx(unsigned int entryHeight, unsigned int nBestSeenHe
} }
} }
void CBlockPolicyEstimator::removeTx(uint256 hash) bool CBlockPolicyEstimator::removeTx(uint256 hash)
{ {
std::map<uint256, TxStatsInfo>::iterator pos = mapMemPoolTxs.find(hash); std::map<uint256, TxStatsInfo>::iterator pos = mapMemPoolTxs.find(hash);
if (pos == mapMemPoolTxs.end()) { if (pos != mapMemPoolTxs.end()) {
LogPrint("estimatefee", "Blockpolicy error mempool tx %s not found for removeTx\n", feeStats.removeTx(pos->second.blockHeight, nBestSeenHeight, pos->second.bucketIndex);
hash.ToString().c_str());
return;
}
unsigned int entryHeight = pos->second.blockHeight;
unsigned int bucketIndex = pos->second.bucketIndex;
feeStats.removeTx(entryHeight, nBestSeenHeight, bucketIndex);
mapMemPoolTxs.erase(hash); mapMemPoolTxs.erase(hash);
return true;
} else {
return false;
}
} }
CBlockPolicyEstimator::CBlockPolicyEstimator(const CFeeRate& _minRelayFee) CBlockPolicyEstimator::CBlockPolicyEstimator(const CFeeRate& _minRelayFee)

2
src/policy/fees.h

@ -212,7 +212,7 @@ public:
void processTransaction(const CTxMemPoolEntry& entry, bool fCurrentEstimate); void processTransaction(const CTxMemPoolEntry& entry, bool fCurrentEstimate);
/** Remove a transaction from the mempool tracking stats*/ /** Remove a transaction from the mempool tracking stats*/
void removeTx(uint256 hash); bool removeTx(uint256 hash);
/** Return a feerate estimate */ /** Return a feerate estimate */
CFeeRate estimateFee(int confTarget); CFeeRate estimateFee(int confTarget);

Loading…
Cancel
Save