diff options
author | MarcoFalke <falke.marco@gmail.com> | 2017-03-14 10:13:03 +0100 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2017-03-14 10:13:23 +0100 |
commit | 857d1e171e051b254a617f27b39f6a551054cee2 (patch) | |
tree | 68ff616bc782c018063b4c548f0b015d346b653d | |
parent | cce056d72918a17ffd7a48373e6f651d025ddc05 (diff) | |
parent | 655df06fb67b558325d0301b7c543ea04bf2899b (diff) |
Merge #9977: QA: getblocktemplate_longpoll.py should always use >0 fee tx
655df06 QA: getblocktemplate_longpoll.py should always use >0 fee tx (Suhas Daftuar)
Tree-SHA512: 016647ba1408f8aaa3fc954835542354d54bf2391c4252c1c505101edbbe1cf8dd6a07060930109d0341f86360b9391dfef439999a93a5bae68fc901dace0b71
-rwxr-xr-x | qa/rpc-tests/getblocktemplate_longpoll.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/qa/rpc-tests/getblocktemplate_longpoll.py b/qa/rpc-tests/getblocktemplate_longpoll.py index dc17bbd7b3..bbe1dda5f7 100755 --- a/qa/rpc-tests/getblocktemplate_longpoll.py +++ b/qa/rpc-tests/getblocktemplate_longpoll.py @@ -61,7 +61,9 @@ class GetBlockTemplateLPTest(BitcoinTestFramework): thr = LongpollThread(self.nodes[0]) thr.start() # generate a random transaction and submit it - (txid, txhex, fee) = random_transaction(self.nodes, Decimal("1.1"), Decimal("0.0"), Decimal("0.001"), 20) + min_relay_fee = self.nodes[0].getnetworkinfo()["relayfee"] + # min_relay_fee is fee per 1000 bytes, which should be more than enough. + (txid, txhex, fee) = random_transaction(self.nodes, Decimal("1.1"), min_relay_fee, Decimal("0.001"), 20) # after one minute, every 10 seconds the mempool is probed, so in 80 seconds it should have returned thr.join(60 + 20) assert(not thr.is_alive()) |