diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2017-05-02 20:02:55 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2017-05-02 20:03:03 +0200 |
| commit | dc8fc0c73bebbc1c48ac5540026030c9cc00ec23 (patch) | |
| tree | 7f3a0bbb5ed9d64f4fe62a7e47abd2a8595a17eb /test/functional/fundrawtransaction.py | |
| parent | 8f3e38477e30abd9dd0e24a4d612126117f7793c (diff) | |
| parent | c9cc76dcaad85aa9441f18d38298f27a0ffd852a (diff) | |
| download | bitcoin-dc8fc0c73bebbc1c48ac5540026030c9cc00ec23.tar.xz | |
Merge #10198: [tests] Remove is_network_split from functional test framework
c9cc76d [tests] Remove is_network_split from funtional test cases (John Newbery)
Tree-SHA512: a43ec63a7dc20cbe9048f8d3af755aef55e9247f605d6481e6d665112882a749af7514f29c83ca9d761421b8e0f7282e5b9f8fc471985d222de826da7cc80ccf
Diffstat (limited to 'test/functional/fundrawtransaction.py')
| -rwxr-xr-x | test/functional/fundrawtransaction.py | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/test/functional/fundrawtransaction.py b/test/functional/fundrawtransaction.py index e0ca94a6b3..9ddafeb611 100755 --- a/test/functional/fundrawtransaction.py +++ b/test/functional/fundrawtransaction.py @@ -23,15 +23,12 @@ class RawTransactionsTest(BitcoinTestFramework): self.num_nodes = 4 def setup_network(self, split=False): - self.nodes = start_nodes(self.num_nodes, self.options.tmpdir) + self.setup_nodes() - connect_nodes_bi(self.nodes,0,1) - connect_nodes_bi(self.nodes,1,2) - connect_nodes_bi(self.nodes,0,2) - connect_nodes_bi(self.nodes,0,3) - - self.is_network_split=False - self.sync_all() + connect_nodes_bi(self.nodes, 0, 1) + connect_nodes_bi(self.nodes, 1, 2) + connect_nodes_bi(self.nodes, 0, 2) + connect_nodes_bi(self.nodes, 0, 3) def run_test(self): min_relay_tx_fee = self.nodes[0].getnetworkinfo()['relayfee'] @@ -467,7 +464,6 @@ class RawTransactionsTest(BitcoinTestFramework): connect_nodes_bi(self.nodes,1,2) connect_nodes_bi(self.nodes,0,2) connect_nodes_bi(self.nodes,0,3) - self.is_network_split=False self.sync_all() # drain the keypool |