diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-04-24 11:09:59 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-04-24 11:12:16 +0200 |
commit | 34dd1a6d5e3610c2cbff76422d6a653b1acf5abc (patch) | |
tree | 6f1ec22159a7cd541303b924da194e89465565eb | |
parent | 896a9d026ccf75cb4a5c7809a92aa19b6f13fb87 (diff) | |
parent | 1accfbcf465db19a9482d2ba129a66ded316f46e (diff) |
Merge #13032: Output values for "min relay fee not met" error
1accfbc Output values for "min relay fee not met" error (Kristaps Kaupe)
Pull request description:
It is already done this way for "mempool min fee not met" error.
Tree-SHA512: 829db78ecc066cf93b8e93ff1aeb4e7b98883cf45f341d5be6e6b4dff4135f3f54fa49b3a6f12eb43f676a9ba54f981143c9887f786881e584370434a9566cfd
-rw-r--r-- | src/validation.cpp | 2 | ||||
-rwxr-xr-x | test/functional/mining_prioritisetransaction.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/validation.cpp b/src/validation.cpp index ab44e73d7c..bce8c4f9e9 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -729,7 +729,7 @@ static bool AcceptToMemoryPoolWorker(const CChainParams& chainparams, CTxMemPool // No transactions are allowed below minRelayTxFee except from disconnected blocks if (!bypass_limits && nModifiedFees < ::minRelayTxFee.GetFee(nSize)) { - return state.DoS(0, false, REJECT_INSUFFICIENTFEE, "min relay fee not met"); + return state.DoS(0, false, REJECT_INSUFFICIENTFEE, "min relay fee not met", false, strprintf("%d < %d", nModifiedFees, ::minRelayTxFee.GetFee(nSize))); } if (nAbsurdFee && nFees > nAbsurdFee) diff --git a/test/functional/mining_prioritisetransaction.py b/test/functional/mining_prioritisetransaction.py index e754dd31ad..b433f11aa5 100755 --- a/test/functional/mining_prioritisetransaction.py +++ b/test/functional/mining_prioritisetransaction.py @@ -120,7 +120,7 @@ class PrioritiseTransactionTest(BitcoinTestFramework): tx_id = self.nodes[0].decoderawtransaction(tx_hex)["txid"] # This will raise an exception due to min relay fee not being met - assert_raises_rpc_error(-26, "min relay fee not met (code 66)", self.nodes[0].sendrawtransaction, tx_hex) + assert_raises_rpc_error(-26, "min relay fee not met, 0 < 134 (code 66)", self.nodes[0].sendrawtransaction, tx_hex) assert(tx_id not in self.nodes[0].getrawmempool()) # This is a less than 1000-byte transaction, so just set the fee |