remove zmergetoaddress from experimental state in rpc-tests

This commit is contained in:
Alfredo Garcia 2019-11-06 10:57:10 -03:00
parent cbf1a85013
commit 01998bdc9e
4 changed files with 5 additions and 10 deletions

View File

@ -41,12 +41,12 @@ class MergeToAddressHelper:
initialize_chain_clean(test.options.tmpdir, 4)
def setup_network(self, test, additional_args=[]):
args = ['-debug=zrpcunsafe', '-experimentalfeatures', '-zmergetoaddress']
args = ['-debug=zrpcunsafe']
args += additional_args
test.nodes = []
test.nodes.append(start_node(0, test.options.tmpdir, args))
test.nodes.append(start_node(1, test.options.tmpdir, args))
args2 = ['-debug=zrpcunsafe', '-experimentalfeatures', '-zmergetoaddress', '-mempooltxinputlimit=7']
args2 = ['-debug=zrpcunsafe', '-mempooltxinputlimit=7']
args2 += additional_args
test.nodes.append(start_node(2, test.options.tmpdir, args2))
connect_nodes_bi(test.nodes, 0, 1)

View File

@ -14,9 +14,7 @@ from mergetoaddress_helper import assert_mergetoaddress_exception
class MergeToAddressMixedNotes(BitcoinTestFramework):
def setup_nodes(self):
return start_nodes(4, self.options.tmpdir, [[
'-experimentalfeatures', '-zmergetoaddress'
]] * 4)
return start_nodes(4, self.options.tmpdir)
def setup_chain(self):
print("Initializing test directory " + self.options.tmpdir)

View File

@ -27,8 +27,7 @@ class WalletChangeAddressesTest(BitcoinTestFramework):
args = [
'-nuparams=5ba81b19:1', # Overwinter
'-nuparams=76b809bb:1', # Sapling
'-txindex', # Avoid JSONRPC error: No information available about transaction
'-experimentalfeatures', '-zmergetoaddress',
'-txindex' # Avoid JSONRPC error: No information available about transaction
]
self.nodes = []
self.nodes.append(start_node(0, self.options.tmpdir, args))

View File

@ -20,9 +20,7 @@ from decimal import Decimal
class WalletSaplingTest(BitcoinTestFramework):
def setup_nodes(self):
return start_nodes(4, self.options.tmpdir, [[
'-experimentalfeatures', '-zmergetoaddress',
]] * 4)
return start_nodes(4, self.options.tmpdir)
def run_test(self):
# Sanity-check the test harness