aboutsummaryrefslogtreecommitdiff
path: root/test/functional/merkle_blocks.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/merkle_blocks.py
parent8f3e38477e30abd9dd0e24a4d612126117f7793c (diff)
downloadbitcoin-c9cc76dcaad85aa9441f18d38298f27a0ffd852a.tar.xz
[tests] Remove is_network_split from funtional test cases
Diffstat (limited to 'test/functional/merkle_blocks.py')
-rwxr-xr-xtest/functional/merkle_blocks.py11
1 files changed, 3 insertions, 8 deletions
diff --git a/test/functional/merkle_blocks.py b/test/functional/merkle_blocks.py
index 5963f2e7b6..06af72ef10 100755
--- a/test/functional/merkle_blocks.py
+++ b/test/functional/merkle_blocks.py
@@ -13,20 +13,15 @@ class MerkleBlockTest(BitcoinTestFramework):
super().__init__()
self.setup_clean_chain = True
self.num_nodes = 4
+ # Nodes 0/1 are "wallet" nodes, Nodes 2/3 are used for testing
+ self.extra_args = [[], [], [], ["-txindex"]]
def setup_network(self):
- self.nodes = []
- # Nodes 0/1 are "wallet" nodes
- self.nodes.append(start_node(0, self.options.tmpdir))
- self.nodes.append(start_node(1, self.options.tmpdir))
- # Nodes 2/3 are used for testing
- self.nodes.append(start_node(2, self.options.tmpdir))
- self.nodes.append(start_node(3, self.options.tmpdir, ["-txindex"]))
+ self.setup_nodes()
connect_nodes(self.nodes[0], 1)
connect_nodes(self.nodes[0], 2)
connect_nodes(self.nodes[0], 3)
- self.is_network_split = False
self.sync_all()
def run_test(self):