Browse Source

[rpc] mempoolinfo should take ::minRelayTxFee into account

0.16
Cristian Mircea Messel 7 years ago
parent
commit
149dffd3b2
  1. 2
      src/rpc/blockchain.cpp
  2. 3
      test/functional/wallet.py

2
src/rpc/blockchain.cpp

@ -1345,7 +1345,7 @@ UniValue mempoolInfoToJSON() @@ -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;
}

3
test/functional/wallet.py

@ -33,6 +33,9 @@ class WalletTest(BitcoinTestFramework): @@ -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)

Loading…
Cancel
Save