From c9cc76dcaad85aa9441f18d38298f27a0ffd852a Mon Sep 17 00:00:00 2001 From: John Newbery Date: Mon, 3 Apr 2017 09:34:04 -0400 Subject: [tests] Remove is_network_split from funtional test cases --- test/functional/p2p-segwit.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'test/functional/p2p-segwit.py') diff --git a/test/functional/p2p-segwit.py b/test/functional/p2p-segwit.py index 1bd7c90956..335777b2ab 100755 --- a/test/functional/p2p-segwit.py +++ b/test/functional/p2p-segwit.py @@ -124,17 +124,13 @@ class SegWitTest(BitcoinTestFramework): super().__init__() self.setup_clean_chain = True self.num_nodes = 3 + self.extra_args = [["-whitelist=127.0.0.1"], ["-whitelist=127.0.0.1", "-acceptnonstdtxn=0"], ["-whitelist=127.0.0.1", "-bip9params=segwit:0:0"]] def setup_network(self): - self.nodes = [] - self.nodes.append(start_node(0, self.options.tmpdir, ["-whitelist=127.0.0.1"])) - # Start a node for testing IsStandard rules. - self.nodes.append(start_node(1, self.options.tmpdir, ["-whitelist=127.0.0.1", "-acceptnonstdtxn=0"])) + self.setup_nodes() connect_nodes(self.nodes[0], 1) - - # Disable segwit's bip9 parameter to simulate upgrading after activation. - self.nodes.append(start_node(2, self.options.tmpdir, ["-whitelist=127.0.0.1", "-bip9params=segwit:0:0"])) connect_nodes(self.nodes[0], 2) + self.sync_all() ''' Helpers ''' # Build a block on top of node0's tip. -- cgit v1.2.3