From b09e3e080d8b39648ace9c3dfccb0e127fbe5d75 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Tue, 14 Mar 2017 10:13:03 +0100 Subject: [PATCH] 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 --- qa/rpc-tests/getblocktemplate_longpoll.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/qa/rpc-tests/getblocktemplate_longpoll.py b/qa/rpc-tests/getblocktemplate_longpoll.py index afb8cb6660d01..8f25197d78025 100644 --- a/qa/rpc-tests/getblocktemplate_longpoll.py +++ b/qa/rpc-tests/getblocktemplate_longpoll.py @@ -62,7 +62,9 @@ def run_test(self): 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())