diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-01-08 11:41:43 +0100 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-01-08 11:42:16 +0100 |
commit | 2eda47bc37bee37e409346e4c396d59925c06250 (patch) | |
tree | fd88cd5ac1ab7a525b32590801c76a6c6d539e43 /qa | |
parent | 83be8fda6da1054004dfb6ece124cab2a02f9796 (diff) | |
parent | 1eb1e65f092dc2b6e1067d2018440fbbd997fa5c (diff) |
Merge pull request #5613
1eb1e65 Fix smartfees test for change to relay policy (Suhas Daftuar)
Diffstat (limited to 'qa')
-rwxr-xr-x | qa/rpc-tests/smartfees.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qa/rpc-tests/smartfees.py b/qa/rpc-tests/smartfees.py index 924d160102..0c07ef8a53 100755 --- a/qa/rpc-tests/smartfees.py +++ b/qa/rpc-tests/smartfees.py @@ -16,20 +16,20 @@ class EstimateFeeTest(BitcoinTestFramework): def setup_network(self): self.nodes = [] self.nodes.append(start_node(0, self.options.tmpdir, - ["-debug=mempool", "-debug=estimatefee"])) + ["-debug=mempool", "-debug=estimatefee", "-relaypriority=0"])) # Node1 mines small-but-not-tiny blocks, and allows free transactions. # NOTE: the CreateNewBlock code starts counting block size at 1,000 bytes, # so blockmaxsize of 2,000 is really just 1,000 bytes (room enough for # 6 or 7 transactions) self.nodes.append(start_node(1, self.options.tmpdir, ["-blockprioritysize=1500", "-blockmaxsize=2000", - "-debug=mempool", "-debug=estimatefee"])) + "-debug=mempool", "-debug=estimatefee", "-relaypriority=0"])) connect_nodes(self.nodes[1], 0) # Node2 is a stingy miner, that # produces very small blocks (room for only 3 or so transactions) node2args = [ "-blockprioritysize=0", "-blockmaxsize=1500", - "-debug=mempool", "-debug=estimatefee"] + "-debug=mempool", "-debug=estimatefee", "-relaypriority=0"] self.nodes.append(start_node(2, self.options.tmpdir, node2args)) connect_nodes(self.nodes[2], 0) |