diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-03-05 22:07:59 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-03-05 22:08:19 +0100 |
| commit | 955fd23517bf4fd4facad2c7cd848bf01abc2baa (patch) | |
| tree | d5506dfbeae23efd6fd924ff060c2a460eca63a2 | |
| parent | 9a75902c568a5471d83854c63514b4d151c15f92 (diff) | |
| parent | 55f89da1a5048cf275c37bceef664e7c04831a35 (diff) | |
| download | bitcoin-955fd23517bf4fd4facad2c7cd848bf01abc2baa.tar.xz | |
Merge #12512: Don't test against the mempool min fee information in mempool_limit.py
55f89da1a Don't test against the mempool min fee information in mempool_limit.py (Ben Woosley)
Pull request description:
Because the right-hand side of this comparison can be influenced
externally, e.g. via the -maxmempool argument, the existing mempool state,
host memory usage, etc.
Called out by @MarcoFalke here: https://github.com/bitcoin/bitcoin/pull/12356#discussion_r170094948
Tree-SHA512: 1644cb8046a6953fb93423a5e51af4f5c7d00a35f10389fddd6a823dae6f31ab367b53af70b3b69161adb9c48f57cf4772db7f4610fd7aadd9c0e9b3da17e9f8
| -rwxr-xr-x | test/functional/mempool_limit.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/functional/mempool_limit.py b/test/functional/mempool_limit.py index 47f7efd3e7..5382fe439e 100755 --- a/test/functional/mempool_limit.py +++ b/test/functional/mempool_limit.py @@ -58,7 +58,7 @@ class MempoolLimitTest(BitcoinTestFramework): # specifically fund this tx with a fee < mempoolminfee, >= than minrelaytxfee txF = self.nodes[0].fundrawtransaction(tx, {'feeRate': relayfee}) txFS = self.nodes[0].signrawtransactionwithwallet(txF['hex']) - assert_raises_rpc_error(-26, "mempool min fee not met, 166 < 411 (code 66)", self.nodes[0].sendrawtransaction, txFS['hex']) + assert_raises_rpc_error(-26, "mempool min fee not met", self.nodes[0].sendrawtransaction, txFS['hex']) if __name__ == '__main__': MempoolLimitTest().main() |