squash-or-nack: can CTxMemPool::GetMinFee use the global directly?

jtimon · jtimon · commit 30ac1d378c71 · 2015-12-01T17:08:17.000+01:00
diff --git a/src/main.cpp b/src/main.cpp
@@ -973,7 +973,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
             return state.DoS(0, false, REJECT_INSUFFICIENTFEE, "insufficient fee", false,
                 strprintf("%d < %d", nFees, txMinFee));
 
-        CAmount mempoolRejectFee = pool.GetMinFee(GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000).GetFee(nSize);
+        CAmount mempoolRejectFee = pool.GetMinFee().GetFee(nSize);
         if (mempoolRejectFee > 0 && nFees < mempoolRejectFee) {
             return state.DoS(0, false, REJECT_INSUFFICIENTFEE, "mempool min fee not met", false, strprintf("%d < %d", nFees, mempoolRejectFee));
         } else if (GetBoolArg("-relaypriority", DEFAULT_RELAYPRIORITY) && nFees < ::minRelayTxFee.GetFee(nSize) && !AllowFree(entry.GetPriority(chainActive.Height() + 1))) {
diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp
@@ -782,7 +782,7 @@ UniValue mempoolInfoToJSON()
     ret.push_back(Pair("usage", (int64_t) mempool.DynamicMemoryUsage()));
     size_t maxmempool = GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000;
     ret.push_back(Pair("maxmempool", (int64_t) maxmempool));
-    ret.push_back(Pair("mempoolminfee", ValueFromAmount(mempool.GetMinFee(maxmempool).GetFeePerK())));
+    ret.push_back(Pair("mempoolminfee", ValueFromAmount(mempool.GetMinFee().GetFeePerK())));
 
     return ret;
 }
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
@@ -714,7 +714,7 @@ CFeeRate CTxMemPool::estimateFee(int nBlocks) const
 CFeeRate CTxMemPool::estimateSmartFee(int nBlocks, int *answerFoundAtBlocks) const
 {
     LOCK(cs);
-    return minerPolicyEstimator->estimateSmartFee(nBlocks, answerFoundAtBlocks, GetMinFee(GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000).GetFeePerK());
+    return minerPolicyEstimator->estimateSmartFee(nBlocks, answerFoundAtBlocks, GetMinFee().GetFeePerK());
 }
 double CTxMemPool::estimatePriority(int nBlocks) const
 {
@@ -724,7 +724,7 @@ double CTxMemPool::estimatePriority(int nBlocks) const
 double CTxMemPool::estimateSmartPriority(int nBlocks, int *answerFoundAtBlocks) const
 {
     LOCK(cs);
-    return minerPolicyEstimator->estimateSmartPriority(nBlocks, answerFoundAtBlocks, GetMinFee(GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000).GetFeePerK());
+    return minerPolicyEstimator->estimateSmartPriority(nBlocks, answerFoundAtBlocks, GetMinFee().GetFeePerK());
 }
 
 bool
@@ -916,6 +916,11 @@ CFeeRate CTxMemPool::GetMinFee(size_t sizelimit) const {
     return std::max(CFeeRate(rollingMinimumFeeRate), minReasonableRelayFee);
 }
 
+CFeeRate CTxMemPool::GetMinFee() const
+{
+    return GetMinFee(GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000);
+}
+
 void CTxMemPool::trackPackageRemoved(const CFeeRate& rate) {
     AssertLockHeld(cs);
     if (rate.GetFeePerK() > rollingMinimumFeeRate) {
diff --git a/src/txmempool.h b/src/txmempool.h
@@ -443,6 +443,8 @@ class CTxMemPool
       *  takes the fee rate to go back down all the way to 0. When the feerate
       *  would otherwise be half of this, it is set to 0 instead.
       */
+    CFeeRate GetMinFee() const;
+    /** Additional version with sizelimit as parameter, useful for testing. */
     CFeeRate GetMinFee(size_t sizelimit) const;
 
     /** Remove transactions from the mempool until its dynamic size is <= sizelimit. */

Original file line number	Diff line number	Diff line change
`@@ -782,7 +782,7 @@ UniValue mempoolInfoToJSON()`
`782`	`782`	`ret.push_back(Pair("usage", (int64_t) mempool.DynamicMemoryUsage()));`
`783`	`783`	`size_t maxmempool = GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000;`
`784`	`784`	`ret.push_back(Pair("maxmempool", (int64_t) maxmempool));`
`785`		`- ret.push_back(Pair("mempoolminfee", ValueFromAmount(mempool.GetMinFee(maxmempool).GetFeePerK())));`
	`785`	`+ ret.push_back(Pair("mempoolminfee", ValueFromAmount(mempool.GetMinFee().GetFeePerK())));`
`786`	`786`
`787`	`787`	`return ret;`
`788`	`788`	`}`
Original file line number	Diff line number	Diff line change
`@@ -714,7 +714,7 @@ CFeeRate CTxMemPool::estimateFee(int nBlocks) const`
`714`	`714`	`CFeeRate CTxMemPool::estimateSmartFee(int nBlocks, int *answerFoundAtBlocks) const`
`715`	`715`	`{`
`716`	`716`	`LOCK(cs);`
`717`		`- return minerPolicyEstimator->estimateSmartFee(nBlocks, answerFoundAtBlocks, GetMinFee(GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000).GetFeePerK());`
	`717`	`+ return minerPolicyEstimator->estimateSmartFee(nBlocks, answerFoundAtBlocks, GetMinFee().GetFeePerK());`
`718`	`718`	`}`
`719`	`719`	`double CTxMemPool::estimatePriority(int nBlocks) const`
`720`	`720`	`{`
`@@ -724,7 +724,7 @@ double CTxMemPool::estimatePriority(int nBlocks) const`
`724`	`724`	`double CTxMemPool::estimateSmartPriority(int nBlocks, int *answerFoundAtBlocks) const`
`725`	`725`	`{`
`726`	`726`	`LOCK(cs);`
`727`		`- return minerPolicyEstimator->estimateSmartPriority(nBlocks, answerFoundAtBlocks, GetMinFee(GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000).GetFeePerK());`
	`727`	`+ return minerPolicyEstimator->estimateSmartPriority(nBlocks, answerFoundAtBlocks, GetMinFee().GetFeePerK());`
`728`	`728`	`}`
`729`	`729`
`730`	`730`	`bool`
`@@ -916,6 +916,11 @@ CFeeRate CTxMemPool::GetMinFee(size_t sizelimit) const {`
`916`	`916`	`return std::max(CFeeRate(rollingMinimumFeeRate), minReasonableRelayFee);`
`917`	`917`	`}`
`918`	`918`
	`919`	`+CFeeRate CTxMemPool::GetMinFee() const`
	`920`	`+{`
	`921`	`+ return GetMinFee(GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000);`
	`922`	`+}`
	`923`	`+`
`919`	`924`	`void CTxMemPool::trackPackageRemoved(const CFeeRate& rate) {`
`920`	`925`	`AssertLockHeld(cs);`
`921`	`926`	`if (rate.GetFeePerK() > rollingMinimumFeeRate) {`