Remove extraneous LogPrint from fee estimation

morcos · random-zebra · commit 7be33e059881 · 2021-07-08T18:05:10.000+02:00
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.
diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp
@@ -280,19 +280,15 @@ 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);
-    if (pos == mapMemPoolTxs.end()) {
-        LogPrint(BCLog::ESTIMATEFEE, "Blockpolicy error mempool tx %s not found for removeTx\n",
-                 hash.ToString().c_str());
-        return;
+    if (pos != mapMemPoolTxs.end()) {
+        feeStats.removeTx(pos->second.blockHeight, nBestSeenHeight, pos->second.bucketIndex);
+        mapMemPoolTxs.erase(hash);
+        return true;
     }
-    unsigned int entryHeight = pos->second.blockHeight;
-    unsigned int bucketIndex = pos->second.bucketIndex;
-
-    feeStats.removeTx(entryHeight, nBestSeenHeight, bucketIndex);
-    mapMemPoolTxs.erase(hash);
+    return false;
 }
 
 CBlockPolicyEstimator::CBlockPolicyEstimator(const CFeeRate& _minRelayFee)
diff --git a/src/policy/fees.h b/src/policy/fees.h
@@ -214,7 +214,7 @@ class CBlockPolicyEstimator
     void processTransaction(const CTxMemPoolEntry& entry, bool fCurrentEstimate);
 
     /** Remove a transaction from the mempool tracking stats*/
-    void removeTx(uint256 hash);
+    bool removeTx(uint256 hash);
 
     /** Return a feerate estimate */
     CFeeRate estimateFee(int confTarget);

Original file line number	Diff line number	Diff line change
`@@ -280,19 +280,15 @@ void TxConfirmStats::removeTx(unsigned int entryHeight, unsigned int nBestSeenHe`
`280`	`280`	`}`
`281`	`281`	`}`
`282`	`282`
`283`		`-void CBlockPolicyEstimator::removeTx(uint256 hash)`
	`283`	`+bool CBlockPolicyEstimator::removeTx(uint256 hash)`
`284`	`284`	`{`
`285`	`285`	`std::map<uint256, TxStatsInfo>::iterator pos = mapMemPoolTxs.find(hash);`
`286`		`- if (pos == mapMemPoolTxs.end()) {`
`287`		`- LogPrint(BCLog::ESTIMATEFEE, "Blockpolicy error mempool tx %s not found for removeTx\n",`
`288`		`- hash.ToString().c_str());`
`289`		`- return;`
	`286`	`+ if (pos != mapMemPoolTxs.end()) {`
	`287`	`+ feeStats.removeTx(pos->second.blockHeight, nBestSeenHeight, pos->second.bucketIndex);`
	`288`	`+ mapMemPoolTxs.erase(hash);`
	`289`	`+ return true;`
`290`	`290`	`}`
`291`		`- unsigned int entryHeight = pos->second.blockHeight;`
`292`		`- unsigned int bucketIndex = pos->second.bucketIndex;`
`293`		`-`
`294`		`- feeStats.removeTx(entryHeight, nBestSeenHeight, bucketIndex);`
`295`		`- mapMemPoolTxs.erase(hash);`
	`291`	`+ return false;`
`296`	`292`	`}`
`297`	`293`
`298`	`294`	`CBlockPolicyEstimator::CBlockPolicyEstimator(const CFeeRate& _minRelayFee)`