diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2017-10-11 20:25:18 -0700 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2017-11-06 19:29:20 -0800 |
| commit | d618458184742b15a7ab0349127ede7a2946a182 (patch) | |
| tree | 5c08e3162c6ac3f53dd8362fe0ae1b505c5186ad /test/functional/p2p-segwit.py | |
| parent | 4bd89210a1484d00abba27c50ac4c07dcc05c2e0 (diff) | |
| download | bitcoin-d618458184742b15a7ab0349127ede7a2946a182.tar.xz | |
Have SegWit active by default
Diffstat (limited to 'test/functional/p2p-segwit.py')
| -rwxr-xr-x | test/functional/p2p-segwit.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/functional/p2p-segwit.py b/test/functional/p2p-segwit.py index f803367668..49de1a6e87 100755 --- a/test/functional/p2p-segwit.py +++ b/test/functional/p2p-segwit.py @@ -111,7 +111,8 @@ class SegWitTest(BitcoinTestFramework): def set_test_params(self): 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", "-vbparams=segwit:0:0"]] + # This test tests SegWit both pre and post-activation, so use the normal BIP9 activation. + self.extra_args = [["-whitelist=127.0.0.1", "-vbparams=segwit:0:999999999999"], ["-whitelist=127.0.0.1", "-acceptnonstdtxn=0", "-vbparams=segwit:0:999999999999"], ["-whitelist=127.0.0.1", "-vbparams=segwit:0:0"]] def setup_network(self): self.setup_nodes() @@ -1493,7 +1494,7 @@ class SegWitTest(BitcoinTestFramework): # Restart with the new binary self.stop_node(node_id) - self.start_node(node_id, extra_args=[]) + self.start_node(node_id, extra_args=["-vbparams=segwit:0:999999999999"]) connect_nodes(self.nodes[0], node_id) sync_blocks(self.nodes) |