diff --git a/test/functional/wallet_bumpfee.py b/test/functional/wallet_bumpfee.py index 992f63ad423..b07425c1a26 100755 --- a/test/functional/wallet_bumpfee.py +++ b/test/functional/wallet_bumpfee.py @@ -32,7 +32,6 @@ from test_framework.util import ( find_vout_for_address, ) from test_framework.wallet import MiniWallet -from test_framework.wallet_util import WALLETRBF_DEPRECATION_WARNING WALLET_PASSPHRASE = "test" @@ -57,7 +56,6 @@ class BumpFeeTest(BitcoinTestFramework): # whitelist peers to speed up tx relay / mempool sync self.noban_tx_relay = True self.extra_args = [[ - "-walletrbf={}".format(i), "-mintxfee=0.00002", "-addresstype=bech32", ] for i in range(self.num_nodes)] @@ -117,8 +115,6 @@ class BumpFeeTest(BitcoinTestFramework): test_feerate_checks_replaced_outputs(self, rbf_node, peer_node) test_bumpfee_with_feerate_ignores_walletincrementalrelayfee(self, rbf_node, peer_node) - self.restart_node(1, [], expected_stderr=WALLETRBF_DEPRECATION_WARNING) - def test_invalid_parameters(self, rbf_node, peer_node, dest_address): self.log.info('Test invalid parameters') rbfid = spend_one_input(rbf_node, dest_address) @@ -463,7 +459,7 @@ def test_bumpfee_with_abandoned_descendant_succeeds(self, rbf_node, rbf_node_add assert bumped_result['txid'] in rbf_node.getrawmempool() assert parent_id not in rbf_node.getrawmempool() # Cleanup - self.restart_node(1, self.extra_args[1], expected_stderr=WALLETRBF_DEPRECATION_WARNING) + self.restart_node(1, self.extra_args[1]) rbf_node.walletpassphrase(WALLET_PASSPHRASE, WALLET_PASSPHRASE_TIMEOUT) self.connect_nodes(1, 0) self.clear_mempool() @@ -538,11 +534,11 @@ def test_maxtxfee_fails(self, rbf_node, dest_address): # size of bumped transaction (p2wpkh, 1 input, 2 outputs): 141 vbytes # expected bump fee of 141 vbytes * 0.00200000 BTC / 1000 vbytes = 0.00002820 BTC # which exceeds maxtxfee and is expected to raise - self.restart_node(1, ['-maxtxfee=0.000025'] + self.extra_args[1], expected_stderr=WALLETRBF_DEPRECATION_WARNING) + self.restart_node(1, ['-maxtxfee=0.000025'] + self.extra_args[1]) rbf_node.walletpassphrase(WALLET_PASSPHRASE, WALLET_PASSPHRASE_TIMEOUT) rbfid = spend_one_input(rbf_node, dest_address) assert_raises_rpc_error(-4, "Unable to create transaction. Fee exceeds maximum configured by user (e.g. -maxtxfee, maxfeerate)", rbf_node.bumpfee, rbfid) - self.restart_node(1, self.extra_args[1], expected_stderr=WALLETRBF_DEPRECATION_WARNING) + self.restart_node(1, self.extra_args[1]) rbf_node.walletpassphrase(WALLET_PASSPHRASE, WALLET_PASSPHRASE_TIMEOUT) self.connect_nodes(1, 0) self.clear_mempool()