aboutsummaryrefslogtreecommitdiff
path: root/test/functional/abandonconflict.py
diff options
context:
space:
mode:
authorJohn Newbery <john@johnnewbery.com>2017-04-03 09:34:04 -0400
committerJohn Newbery <john@johnnewbery.com>2017-05-02 13:31:54 -0400
commitc9cc76dcaad85aa9441f18d38298f27a0ffd852a (patch)
tree7f3a0bbb5ed9d64f4fe62a7e47abd2a8595a17eb /test/functional/abandonconflict.py
parent8f3e38477e30abd9dd0e24a4d612126117f7793c (diff)
downloadbitcoin-c9cc76dcaad85aa9441f18d38298f27a0ffd852a.tar.xz
[tests] Remove is_network_split from funtional test cases
Diffstat (limited to 'test/functional/abandonconflict.py')
-rwxr-xr-xtest/functional/abandonconflict.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/test/functional/abandonconflict.py b/test/functional/abandonconflict.py
index 887dbebd4f..0439d168de 100755
--- a/test/functional/abandonconflict.py
+++ b/test/functional/abandonconflict.py
@@ -20,12 +20,7 @@ class AbandonConflictTest(BitcoinTestFramework):
super().__init__()
self.num_nodes = 2
self.setup_clean_chain = False
-
- def setup_network(self):
- self.nodes = []
- self.nodes.append(start_node(0, self.options.tmpdir, ["-minrelaytxfee=0.00001"]))
- self.nodes.append(start_node(1, self.options.tmpdir))
- connect_nodes(self.nodes[0], 1)
+ self.extra_args = [["-minrelaytxfee=0.00001"], []]
def run_test(self):
self.nodes[1].generate(100)