diff options
| author | Cristian Mircea Messel <mess110@gmail.com> | 2017-10-10 19:36:27 +0300 |
|---|---|---|
| committer | Cristian Mircea Messel <mess110@gmail.com> | 2017-10-11 23:39:47 +0300 |
| commit | 149dffd3b2a137d575ad19b8c0b13345efe3ada1 (patch) | |
| tree | ac8d63ea3fb651e0678619ef8a825d92a44f66b2 | |
| parent | 892809309c1bc370677241a715e57a2744f94323 (diff) | |
| download | bitcoin-149dffd3b2a137d575ad19b8c0b13345efe3ada1.tar.xz | |
[rpc] mempoolinfo should take ::minRelayTxFee into account
| -rw-r--r-- | src/rpc/blockchain.cpp | 2 | ||||
| -rwxr-xr-x | test/functional/wallet.py | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp index 68af376f35..874645f653 100644 --- 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 index 9d8ae50354..d0ca24119c 100755 --- a/test/functional/wallet.py +++ b/test/functional/wallet.py @@ -33,6 +33,9 @@ class WalletTest(BitcoinTestFramework): 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) |