diff --git a/test/functional/abc_feature_minerfund.py b/test/functional/abc_feature_minerfund.py --- a/test/functional/abc_feature_minerfund.py +++ b/test/functional/abc_feature_minerfund.py @@ -30,6 +30,7 @@ self.extra_args = [[ '-enableminerfund', '-axionactivationtime={}'.format(AXION_ACTIVATION_TIME), + '-ecash' ]] def run_test(self): diff --git a/test/functional/abc_mining_basic.py b/test/functional/abc_mining_basic.py --- a/test/functional/abc_mining_basic.py +++ b/test/functional/abc_mining_basic.py @@ -33,6 +33,7 @@ self.extra_args = [[], [ '-enableminerfund', '-axionactivationtime={}'.format(AXION_ACTIVATION_TIME), + '-ecash' ], [ '-enableminerfund', '-usecashaddr=0', diff --git a/test/functional/abc_p2p_avalanche.py b/test/functional/abc_p2p_avalanche.py --- a/test/functional/abc_p2p_avalanche.py +++ b/test/functional/abc_p2p_avalanche.py @@ -135,7 +135,7 @@ self.setup_clean_chain = True self.num_nodes = 2 self.extra_args = [ - ['-enableavalanche=1', '-avacooldown=0'], + ['-enableavalanche=1', '-avacooldown=0', '-ecash'], ['-enableavalanche=1', '-avacooldown=0', '-noparkdeepreorg', '-maxreorgdepth=-1']] self.supports_cli = False self.rpc_timeout = 120 diff --git a/test/functional/feature_notifications.py b/test/functional/feature_notifications.py --- a/test/functional/feature_notifications.py +++ b/test/functional/feature_notifications.py @@ -48,11 +48,19 @@ # -alertnotify and -blocknotify on node0, walletnotify on node1 self.extra_args = [["-alertnotify=echo > {}".format( os.path.join(self.alertnotify_dir, '%s')), - "-blocknotify=echo > {}".format(os.path.join(self.blocknotify_dir, '%s'))], + "-blocknotify=echo > {}".format( + os.path.join(self.blocknotify_dir, '%s')), + "-ecash"], ["-blockversion=211", "-rescan", "-wallet={}".format(self.wallet), - "-walletnotify=echo > {}".format(os.path.join(self.walletnotify_dir, notify_outputname('%w', '%s')))]] + "-walletnotify=echo > {}".format( + os.path.join( + self.walletnotify_dir, + notify_outputname( + '%w', + '%s'))), + "-ecash"]] super().setup_network() def run_test(self): diff --git a/test/functional/interface_zmq.py b/test/functional/interface_zmq.py --- a/test/functional/interface_zmq.py +++ b/test/functional/interface_zmq.py @@ -20,6 +20,13 @@ return hash256(byte_str)[::-1] +def getRestartNodeArgs(address, services): + nodeRestartArgs = [ + "-zmqpub{}={}".format(sub.topic.decode(), address) for sub in services] + nodeRestartArgs.append('-ecash') + return nodeRestartArgs + + class ZMQSubscriber: def __init__(self, socket, topic): self.sequence = 0 @@ -42,6 +49,7 @@ class ZMQTest (BitcoinTestFramework): def set_test_params(self): self.num_nodes = 2 + self.extra_args = [[], ["-ecash"]] def skip_test_if_missing_module(self): self.skip_if_no_py3_zmq() @@ -79,8 +87,10 @@ rawblock = subs[2] rawtx = subs[3] - self.restart_node(0, ["-zmqpub{}={}".format(sub.topic.decode(), address) - for sub in [hashblock, hashtx, rawblock, rawtx]]) + self.restart_node( + 0, getRestartNodeArgs( + address, [ + hashblock, hashtx, rawblock, rawtx])) connect_nodes(self.nodes[0], self.nodes[1]) for socket in sockets: socket.connect(address) @@ -170,7 +180,7 @@ # Should only notify the tip if a reorg occurs self.restart_node( - 0, ['-zmqpub{}={}'.format(sub.topic.decode(), address) for sub in [hashblock, hashtx]]) + 0, getRestartNodeArgs(address, [hashblock, hashtx])) for socket in sockets: socket.connect(address) # Relax so that the subscriber is ready before publishing zmq messages diff --git a/test/functional/p2p_inv_download.py b/test/functional/p2p_inv_download.py --- a/test/functional/p2p_inv_download.py +++ b/test/functional/p2p_inv_download.py @@ -87,6 +87,7 @@ def set_test_params(self): self.setup_clean_chain = False self.num_nodes = 2 + self.extra_args = [['-ecash'], []] def test_data_requests(self, context): self.log.info( diff --git a/test/functional/rpc_createmultisig.py b/test/functional/rpc_createmultisig.py --- a/test/functional/rpc_createmultisig.py +++ b/test/functional/rpc_createmultisig.py @@ -24,6 +24,7 @@ self.setup_clean_chain = True self.num_nodes = 3 self.supports_cli = False + self.extra_args = [['-ecash']] * 3 def skip_test_if_missing_module(self): self.skip_if_no_wallet() diff --git a/test/functional/rpc_deriveaddresses.py b/test/functional/rpc_deriveaddresses.py --- a/test/functional/rpc_deriveaddresses.py +++ b/test/functional/rpc_deriveaddresses.py @@ -11,6 +11,7 @@ class DeriveaddressesTest(BitcoinTestFramework): def set_test_params(self): self.num_nodes = 1 + self.extra_args = [['-ecash']] def run_test(self): assert_raises_rpc_error(-5, "Missing checksum", diff --git a/test/functional/rpc_generateblock.py b/test/functional/rpc_generateblock.py --- a/test/functional/rpc_generateblock.py +++ b/test/functional/rpc_generateblock.py @@ -15,6 +15,7 @@ class GenerateBlockTest(BitcoinTestFramework): def set_test_params(self): self.num_nodes = 1 + self.extra_args = [['-ecash']] def skip_test_if_missing_module(self): self.skip_if_no_wallet() diff --git a/test/functional/rpc_invalidateblock.py b/test/functional/rpc_invalidateblock.py --- a/test/functional/rpc_invalidateblock.py +++ b/test/functional/rpc_invalidateblock.py @@ -17,7 +17,7 @@ def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 3 - self.extra_args = [["-noparkdeepreorg"], [], []] + self.extra_args = [["-noparkdeepreorg"], ['-ecash'], []] def setup_network(self): self.setup_nodes() diff --git a/test/functional/rpc_psbt.py b/test/functional/rpc_psbt.py --- a/test/functional/rpc_psbt.py +++ b/test/functional/rpc_psbt.py @@ -26,6 +26,7 @@ self.setup_clean_chain = False self.num_nodes = 3 self.supports_cli = False + self.extra_args = [['-ecash']] * 3 def skip_test_if_missing_module(self): self.skip_if_no_wallet() diff --git a/test/functional/test_framework/test_node.py b/test/functional/test_framework/test_node.py --- a/test/functional/test_framework/test_node.py +++ b/test/functional/test_framework/test_node.py @@ -108,7 +108,6 @@ "-debugexclude=leveldb", "-uacomment=" + self.name, "-noprinttoconsole", - "-ecash" ] if use_valgrind: diff --git a/test/functional/wallet_balance.py b/test/functional/wallet_balance.py --- a/test/functional/wallet_balance.py +++ b/test/functional/wallet_balance.py @@ -53,8 +53,8 @@ self.extra_args = [ # Limit mempool descendants as a hack to have wallet txs rejected # from the mempool - ['-limitdescendantcount=3'], - [], + ['-limitdescendantcount=3', '-ecash'], + ['-ecash'], ] def skip_test_if_missing_module(self): @@ -302,7 +302,7 @@ assert_equal(self.nodes[0].getbalance(minconf=0), 0) # Now confirm tx_orig - self.restart_node(1, ['-persistmempool=0']) + self.restart_node(1, ['-persistmempool=0', '-ecash']) connect_nodes(self.nodes[0], self.nodes[1]) self.sync_blocks() self.nodes[1].sendrawtransaction(tx_orig) diff --git a/test/functional/wallet_basic.py b/test/functional/wallet_basic.py --- a/test/functional/wallet_basic.py +++ b/test/functional/wallet_basic.py @@ -24,8 +24,11 @@ self.num_nodes = 4 self.setup_clean_chain = True self.extra_args = [ + ["-acceptnonstdtxn=1", "-ecash"], + ["-acceptnonstdtxn=1", "-ecash"], + ["-acceptnonstdtxn=1", "-ecash"], ["-acceptnonstdtxn=1"], - ] * self.num_nodes + ] self.supports_cli = False def skip_test_if_missing_module(self): diff --git a/test/functional/wallet_importdescriptors.py b/test/functional/wallet_importdescriptors.py --- a/test/functional/wallet_importdescriptors.py +++ b/test/functional/wallet_importdescriptors.py @@ -31,7 +31,7 @@ class ImportDescriptorsTest(BitcoinTestFramework): def set_test_params(self): self.num_nodes = 2 - self.extra_args = [[], ["-keypool=5"]] + self.extra_args = [["-ecash"], ["-keypool=5", "-ecash"]] self.setup_clean_chain = True def skip_test_if_missing_module(self): diff --git a/test/functional/wallet_importmulti.py b/test/functional/wallet_importmulti.py --- a/test/functional/wallet_importmulti.py +++ b/test/functional/wallet_importmulti.py @@ -37,6 +37,7 @@ def set_test_params(self): self.num_nodes = 2 self.setup_clean_chain = True + self.extra_args = [["-ecash"]] * 2 def skip_test_if_missing_module(self): self.skip_if_no_wallet()