Fix RPC tests that depend upon -anchorconfirmations=1
This commit is contained in:
parent
af18ee1aba
commit
fefea8fe29
|
@ -12,7 +12,8 @@ from mergetoaddress_helper import assert_mergetoaddress_exception
|
||||||
|
|
||||||
class MergeToAddressMixedNotes(BitcoinTestFramework):
|
class MergeToAddressMixedNotes(BitcoinTestFramework):
|
||||||
def setup_nodes(self):
|
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):
|
def setup_chain(self):
|
||||||
print("Initializing test directory " + self.options.tmpdir)
|
print("Initializing test directory " + self.options.tmpdir)
|
||||||
|
|
|
@ -16,7 +16,7 @@ class MergeToAddressSapling (BitcoinTestFramework):
|
||||||
self.helper.setup_chain(self)
|
self.helper.setup_chain(self)
|
||||||
|
|
||||||
def setup_network(self, split=False):
|
def setup_network(self, split=False):
|
||||||
self.helper.setup_network(self)
|
self.helper.setup_network(self, ['-anchorconfirmations=1'])
|
||||||
|
|
||||||
def run_test(self):
|
def run_test(self):
|
||||||
self.helper.run_test(self)
|
self.helper.run_test(self)
|
||||||
|
|
|
@ -16,7 +16,7 @@ class MergeToAddressSprout (BitcoinTestFramework):
|
||||||
self.helper.setup_chain(self)
|
self.helper.setup_chain(self)
|
||||||
|
|
||||||
def setup_network(self, split=False):
|
def setup_network(self, split=False):
|
||||||
self.helper.setup_network(self)
|
self.helper.setup_network(self, ['-anchorconfirmations=1'])
|
||||||
|
|
||||||
def run_test(self):
|
def run_test(self):
|
||||||
self.helper.run_test(self)
|
self.helper.run_test(self)
|
||||||
|
|
|
@ -20,7 +20,9 @@ from test_framework.util import (
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
HAS_CANOPY = ['-nurejectoldversions=false',
|
HAS_CANOPY = [
|
||||||
|
'-nurejectoldversions=false',
|
||||||
|
'-anchorconfirmations=1',
|
||||||
nuparams(BLOSSOM_BRANCH_ID, 205),
|
nuparams(BLOSSOM_BRANCH_ID, 205),
|
||||||
nuparams(HEARTWOOD_BRANCH_ID, 210),
|
nuparams(HEARTWOOD_BRANCH_ID, 210),
|
||||||
nuparams(CANOPY_BRANCH_ID, 220),
|
nuparams(CANOPY_BRANCH_ID, 220),
|
||||||
|
|
Loading…
Reference in New Issue