diff --git a/test/functional/abc_feature_proof_cleanup.py b/test/functional/abc_feature_proof_cleanup.py --- a/test/functional/abc_feature_proof_cleanup.py +++ b/test/functional/abc_feature_proof_cleanup.py @@ -34,7 +34,6 @@ self.num_nodes = 1 self.extra_args = [[ '-avalanche=1', - '-avaproofstakeutxodustthreshold=1000000', '-avaproofstakeutxoconfirmations=1', # Get rid of the getdata delay penalty for inbounds '-whitelist=noban@127.0.0.1', diff --git a/test/functional/abc_p2p_avalanche_peer_discovery.py b/test/functional/abc_p2p_avalanche_peer_discovery.py --- a/test/functional/abc_p2p_avalanche_peer_discovery.py +++ b/test/functional/abc_p2p_avalanche_peer_discovery.py @@ -52,7 +52,6 @@ self.setup_clean_chain = True self.num_nodes = 1 self.extra_args = [['-avalanche=1', - '-avaproofstakeutxodustthreshold=1000000', '-avaproofstakeutxoconfirmations=3']] self.supports_cli = False diff --git a/test/functional/abc_p2p_avalanche_proof_voting.py b/test/functional/abc_p2p_avalanche_proof_voting.py --- a/test/functional/abc_p2p_avalanche_proof_voting.py +++ b/test/functional/abc_p2p_avalanche_proof_voting.py @@ -39,7 +39,6 @@ self.extra_args = [ [ '-avalanche=1', - '-avaproofstakeutxodustthreshold=1000000', '-avaproofstakeutxoconfirmations=2', f'-avalancheconflictingproofcooldown={self.conflicting_proof_cooldown}', f'-avalanchepeerreplacementcooldown={self.peer_replacement_cooldown}', @@ -311,7 +310,6 @@ def vote_tests(self, node): self.restart_node(0, extra_args=['-avalanche=1', - '-avaproofstakeutxodustthreshold=1000000', '-avaproofstakeutxoconfirmations=2', '-avacooldown=0', '-avalancheconflictingproofcooldown=0', @@ -485,7 +483,6 @@ # Restart the node with appropriate flags for this test self.restart_node(0, extra_args=[ '-avalanche=1', - '-avaproofstakeutxodustthreshold=1000000', '-avaproofstakeutxoconfirmations=2', '-avalancheconflictingproofcooldown=0', '-avacooldown=0', diff --git a/test/functional/abc_p2p_avalanche_quorum.py b/test/functional/abc_p2p_avalanche_quorum.py --- a/test/functional/abc_p2p_avalanche_quorum.py +++ b/test/functional/abc_p2p_avalanche_quorum.py @@ -31,7 +31,6 @@ self.min_avaproofs_node_count = 8 self.extra_args = [[ '-avalanche=1', - '-avaproofstakeutxodustthreshold=1000000', '-avaproofstakeutxoconfirmations=1', '-avacooldown=0', '-avatimeout=0', diff --git a/test/functional/abc_p2p_avalanche_voting.py b/test/functional/abc_p2p_avalanche_voting.py --- a/test/functional/abc_p2p_avalanche_voting.py +++ b/test/functional/abc_p2p_avalanche_voting.py @@ -25,7 +25,6 @@ self.extra_args = [ [ '-avalanche=1', - '-avaproofstakeutxodustthreshold=1000000', '-avaproofstakeutxoconfirmations=1', '-avacooldown=0', '-avaminquorumstake=0', diff --git a/test/functional/abc_p2p_compactproofs.py b/test/functional/abc_p2p_compactproofs.py --- a/test/functional/abc_p2p_compactproofs.py +++ b/test/functional/abc_p2p_compactproofs.py @@ -54,7 +54,6 @@ self.num_nodes = 2 self.extra_args = [[ '-avalanche=1', - '-avaproofstakeutxodustthreshold=1000000', '-avaproofstakeutxoconfirmations=1', '-avacooldown=0', ]] * self.num_nodes diff --git a/test/functional/abc_p2p_getavaaddr.py b/test/functional/abc_p2p_getavaaddr.py --- a/test/functional/abc_p2p_getavaaddr.py +++ b/test/functional/abc_p2p_getavaaddr.py @@ -87,7 +87,6 @@ self.extra_args = [ [ '-avalanche=1', - '-avaproofstakeutxodustthreshold=1000000', '-avaproofstakeutxoconfirmations=1', '-avacooldown=0', '-avaminquorumstake=0', diff --git a/test/functional/abc_p2p_proof_inventory.py b/test/functional/abc_p2p_proof_inventory.py --- a/test/functional/abc_p2p_proof_inventory.py +++ b/test/functional/abc_p2p_proof_inventory.py @@ -54,7 +54,6 @@ self.num_nodes = 5 self.extra_args = [[ '-avalanche=1', - '-avaproofstakeutxodustthreshold=1000000', '-avaproofstakeutxoconfirmations=2', '-avacooldown=0', '-whitelist=noban@127.0.0.1', @@ -147,8 +146,7 @@ }] ) - self.restart_node( - 0, ['-avalanche=1', '-avaproofstakeutxodustthreshold=1000000']) + self.restart_node(0, ['-avalanche=1']) peer = node.add_p2p_connection(P2PInterface()) msg = msg_avaproof() diff --git a/test/functional/abc_rpc_addavalanchenode.py b/test/functional/abc_rpc_addavalanchenode.py --- a/test/functional/abc_rpc_addavalanchenode.py +++ b/test/functional/abc_rpc_addavalanchenode.py @@ -35,7 +35,6 @@ def set_test_params(self): self.num_nodes = 1 self.extra_args = [['-avalanche=1', - '-avaproofstakeutxodustthreshold=1000000', '-avaproofstakeutxoconfirmations=1', '-avacooldown=0']] diff --git a/test/functional/abc_rpc_avalancheproof.py b/test/functional/abc_rpc_avalancheproof.py --- a/test/functional/abc_rpc_avalancheproof.py +++ b/test/functional/abc_rpc_avalancheproof.py @@ -58,8 +58,6 @@ self.setup_clean_chain = True self.num_nodes = 2 self.extra_args = [['-avalanche=1', - '-avaproofstakeutxodustthreshold={}'.format( - PROOF_DUST_THRESHOLD), '-avaproofstakeutxoconfirmations=1', '-avalancheconflictingproofcooldown=0', '-avacooldown=0']] * self.num_nodes diff --git a/test/functional/abc_rpc_getavalancheinfo.py b/test/functional/abc_rpc_getavalancheinfo.py --- a/test/functional/abc_rpc_getavalancheinfo.py +++ b/test/functional/abc_rpc_getavalancheinfo.py @@ -33,7 +33,6 @@ '-avacooldown=0', '-avaminquorumstake=250000000', '-avaminquorumconnectedstakeratio=0.9', - '-avaproofstakeutxodustthreshold=1000000', '-avaminavaproofsnodecount=0', ]] diff --git a/test/functional/abc_rpc_getavalanchepeerinfo.py b/test/functional/abc_rpc_getavalanchepeerinfo.py --- a/test/functional/abc_rpc_getavalanchepeerinfo.py +++ b/test/functional/abc_rpc_getavalanchepeerinfo.py @@ -25,7 +25,6 @@ self.setup_clean_chain = True self.num_nodes = 1 self.extra_args = [['-avalanche=1', - '-avaproofstakeutxodustthreshold=1000000', '-avaproofstakeutxoconfirmations=1', '-avacooldown=0']] diff --git a/test/functional/p2p_eviction.py b/test/functional/p2p_eviction.py --- a/test/functional/p2p_eviction.py +++ b/test/functional/p2p_eviction.py @@ -66,7 +66,6 @@ # avalanche availability score self.extra_args = [["-maxconnections=188", "-avalanche=1", - "-avaproofstakeutxodustthreshold=1000000", "-avaproofstakeutxoconfirmations=1", "-maxavalancheoutbound=16"]] 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 @@ -126,7 +126,6 @@ def set_test_params(self): self.num_nodes = 2 self.extra_args = [['-avalanche=1', - '-avaproofstakeutxodustthreshold=1000000', '-avaproofstakeutxoconfirmations=1', '-avacooldown=0']] * self.num_nodes diff --git a/test/functional/rpc_net.py b/test/functional/rpc_net.py --- a/test/functional/rpc_net.py +++ b/test/functional/rpc_net.py @@ -46,11 +46,9 @@ self.setup_clean_chain = True self.num_nodes = 2 self.extra_args = [["-avalanche=1", - "-avaproofstakeutxodustthreshold=1000000", "-avaproofstakeutxoconfirmations=1", "-minrelaytxfee=10"], ["-avalanche=1", - "-avaproofstakeutxodustthreshold=1000000", "-avaproofstakeutxoconfirmations=1", "-minrelaytxfee=5"]] self.supports_cli = False 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 @@ -115,6 +115,9 @@ "-debugexclude=leveldb", "-uacomment=" + self.name, "-noprinttoconsole", + # Set the Avalanche stake dust threshold low so that tests do not + # need to combine coinbase UTXOs in order to stake. + "-avaproofstakeutxodustthreshold=1000000", ] if use_valgrind: