From c44dece4867ea2d7212489b63046ce1966c13a07 Mon Sep 17 00:00:00 2001 From: Alexander Block Date: Fri, 21 Jun 2019 13:52:23 +0200 Subject: [PATCH] Disable DIP3 in multiple tests --- test/functional/assumevalid.py | 6 +++--- test/functional/bip65-cltv-p2p.py | 2 +- test/functional/bip9-softforks.py | 2 +- test/functional/bipdersig-p2p.py | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/test/functional/assumevalid.py b/test/functional/assumevalid.py index 8e301c4379..ed2a2cbc06 100755 --- a/test/functional/assumevalid.py +++ b/test/functional/assumevalid.py @@ -63,7 +63,7 @@ class AssumeValidTest(BitcoinTestFramework): # Start node0. We don't start the other nodes yet since # we need to pre-mine a block with an invalid transaction # signature so we can pass in the block hash as assumevalid. - self.nodes = [start_node(0, self.options.tmpdir)] + self.nodes = [start_node(0, self.options.tmpdir, ["-dip3params=9000:9000"])] def send_blocks_until_disconnected(self, node): """Keep sending blocks to the node until we're disconnected.""" @@ -163,14 +163,14 @@ class AssumeValidTest(BitcoinTestFramework): # Start node1 and node2 with assumevalid so they accept a block with a bad signature. self.nodes.append(start_node(1, self.options.tmpdir, - ["-assumevalid=" + hex(block102.sha256)])) + ["-assumevalid=" + hex(block102.sha256), "-dip3params=9000:9000"])) node1 = BaseNode() # connects to node1 connections.append(NodeConn('127.0.0.1', p2p_port(1), self.nodes[1], node1)) node1.add_connection(connections[1]) node1.wait_for_verack() self.nodes.append(start_node(2, self.options.tmpdir, - ["-assumevalid=" + hex(block102.sha256)])) + ["-assumevalid=" + hex(block102.sha256), "-dip3params=9000:9000"])) node2 = BaseNode() # connects to node2 connections.append(NodeConn('127.0.0.1', p2p_port(2), self.nodes[2], node2)) node2.add_connection(connections[2]) diff --git a/test/functional/bip65-cltv-p2p.py b/test/functional/bip65-cltv-p2p.py index 7a4f43280b..935b6522b6 100755 --- a/test/functional/bip65-cltv-p2p.py +++ b/test/functional/bip65-cltv-p2p.py @@ -38,7 +38,7 @@ class BIP65Test(ComparisonTestFramework): def __init__(self): super().__init__() self.num_nodes = 1 - self.extra_args = [['-whitelist=127.0.0.1', '-blockversion=3']] + self.extra_args = [['-whitelist=127.0.0.1', '-blockversion=3', '-dip3params=9000:9000']] def run_test(self): test = TestManager(self, self.options.tmpdir) diff --git a/test/functional/bip9-softforks.py b/test/functional/bip9-softforks.py index da7d1efa5d..e5ec1b31ce 100755 --- a/test/functional/bip9-softforks.py +++ b/test/functional/bip9-softforks.py @@ -31,7 +31,7 @@ class BIP9SoftForksTest(ComparisonTestFramework): def __init__(self): super().__init__() self.num_nodes = 1 - self.extra_args = [['-whitelist=127.0.0.1']] + self.extra_args = [['-whitelist=127.0.0.1', '-dip3params=9000:9000']] def run_test(self): self.test = TestManager(self, self.options.tmpdir) diff --git a/test/functional/bipdersig-p2p.py b/test/functional/bipdersig-p2p.py index b4b352dac6..450c483284 100755 --- a/test/functional/bipdersig-p2p.py +++ b/test/functional/bipdersig-p2p.py @@ -45,6 +45,7 @@ class BIP66Test(ComparisonTestFramework): def __init__(self): super().__init__() self.num_nodes = 1 + self.extra_args = [['-dip3params=9000:9000']] def run_test(self): test = TestManager(self, self.options.tmpdir)