[rpc] mempoolinfo should take ::minRelayTxFee into account

bitcoin · Oct 11, 2017 · 149dffd · 149dffd
1 parent 8928093
commit 149dffd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
@@ -1345,7 +1345,7 @@ UniValue mempoolInfoToJSON()
     ret.push_back(Pair("usage", (int64_t) mempool.DynamicMemoryUsage()));
     size_t maxmempool = gArgs.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(std::max(mempool.GetMinFee(maxmempool), ::minRelayTxFee).GetFeePerK())));
 
     return ret;
 }

diff --git a/test/functional/wallet.py b/test/functional/wallet.py
@@ -33,6 +33,9 @@ def run_test(self):
         assert_equal(len(self.nodes[1].listunspent()), 0)
         assert_equal(len(self.nodes[2].listunspent()), 0)
 
+        self.log.info("Check for mempoolminfee in getmempoolinfo")
+        assert_equal(self.nodes[0].getmempoolinfo()['mempoolminfee'], Decimal('0.00001000'))
+
         self.log.info("Mining blocks...")
 
         self.nodes[0].generate(1)