aboutsummaryrefslogtreecommitdiff
path: root/test/functional/p2p-segwit.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/p2p-segwit.py
parent8f3e38477e30abd9dd0e24a4d612126117f7793c (diff)
downloadbitcoin-c9cc76dcaad85aa9441f18d38298f27a0ffd852a.tar.xz
[tests] Remove is_network_split from funtional test cases
Diffstat (limited to 'test/functional/p2p-segwit.py')
-rwxr-xr-xtest/functional/p2p-segwit.py10
1 files changed, 3 insertions, 7 deletions
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.