From fefea8fe29ddd84cbdf04e70cd103288ec4683c6 Mon Sep 17 00:00:00 2001 From: Kris Nuttycombe Date: Wed, 4 May 2022 18:00:34 -0600 Subject: [PATCH] Fix RPC tests that depend upon -anchorconfirmations=1 --- qa/rpc-tests/mergetoaddress_mixednotes.py | 3 ++- qa/rpc-tests/mergetoaddress_sapling.py | 2 +- qa/rpc-tests/mergetoaddress_sprout.py | 2 +- qa/rpc-tests/remove_sprout_shielding.py | 4 +++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/qa/rpc-tests/mergetoaddress_mixednotes.py b/qa/rpc-tests/mergetoaddress_mixednotes.py index fd772bfd1..59e01e5dd 100755 --- a/qa/rpc-tests/mergetoaddress_mixednotes.py +++ b/qa/rpc-tests/mergetoaddress_mixednotes.py @@ -12,7 +12,8 @@ from mergetoaddress_helper import assert_mergetoaddress_exception class MergeToAddressMixedNotes(BitcoinTestFramework): def setup_nodes(self): - return start_nodes(4, self.options.tmpdir) + self.num_nodes = 4 + return start_nodes(self.num_nodes, self.options.tmpdir, extra_args=[['-anchorconfirmations=1']] * self.num_nodes) def setup_chain(self): print("Initializing test directory " + self.options.tmpdir) diff --git a/qa/rpc-tests/mergetoaddress_sapling.py b/qa/rpc-tests/mergetoaddress_sapling.py index 9a4ca5412..80c6d9a17 100755 --- a/qa/rpc-tests/mergetoaddress_sapling.py +++ b/qa/rpc-tests/mergetoaddress_sapling.py @@ -16,7 +16,7 @@ class MergeToAddressSapling (BitcoinTestFramework): self.helper.setup_chain(self) def setup_network(self, split=False): - self.helper.setup_network(self) + self.helper.setup_network(self, ['-anchorconfirmations=1']) def run_test(self): self.helper.run_test(self) diff --git a/qa/rpc-tests/mergetoaddress_sprout.py b/qa/rpc-tests/mergetoaddress_sprout.py index 800d00365..5ca4b0e5f 100755 --- a/qa/rpc-tests/mergetoaddress_sprout.py +++ b/qa/rpc-tests/mergetoaddress_sprout.py @@ -16,7 +16,7 @@ class MergeToAddressSprout (BitcoinTestFramework): self.helper.setup_chain(self) def setup_network(self, split=False): - self.helper.setup_network(self) + self.helper.setup_network(self, ['-anchorconfirmations=1']) def run_test(self): self.helper.run_test(self) diff --git a/qa/rpc-tests/remove_sprout_shielding.py b/qa/rpc-tests/remove_sprout_shielding.py index 5d8411e6e..d5d001700 100755 --- a/qa/rpc-tests/remove_sprout_shielding.py +++ b/qa/rpc-tests/remove_sprout_shielding.py @@ -20,7 +20,9 @@ from test_framework.util import ( import logging -HAS_CANOPY = ['-nurejectoldversions=false', +HAS_CANOPY = [ + '-nurejectoldversions=false', + '-anchorconfirmations=1', nuparams(BLOSSOM_BRANCH_ID, 205), nuparams(HEARTWOOD_BRANCH_ID, 210), nuparams(CANOPY_BRANCH_ID, 220),