diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -3290,56 +3290,6 @@ return NullUniValue; } -static UniValue resendwallettransactions(const Config &config, - const JSONRPCRequest &request) { - std::shared_ptr const wallet = GetWalletForJSONRPCRequest(request); - CWallet *const pwallet = wallet.get(); - - if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { - return NullUniValue; - } - - if (request.fHelp || request.params.size() != 0) { - throw std::runtime_error(RPCHelpMan{ - "resendwallettransactions", - "Immediately re-broadcast unconfirmed wallet transactions to all " - "peers.\n" - "Intended only for testing; the wallet code periodically " - "re-broadcasts\n", - {}, - RPCResult{ - "Returns an RPC error if -walletbroadcast is set to false.\n" - "Returns array of transaction ids that were re-broadcast.\n"}, - RPCExamples{""}, - } - .ToString()); - } - - if (!pwallet->chain().p2pEnabled()) { - throw JSONRPCError( - RPC_CLIENT_P2P_DISABLED, - "Error: Peer-to-peer functionality missing or disabled"); - } - - auto locked_chain = pwallet->chain().lock(); - LOCK(pwallet->cs_wallet); - - if (!pwallet->GetBroadcastTransactions()) { - throw JSONRPCError(RPC_WALLET_ERROR, "Error: Wallet transaction " - "broadcasting is disabled with " - "-walletbroadcast"); - } - - std::vector txids = - pwallet->ResendWalletTransactionsBefore(*locked_chain, GetTime()); - UniValue result(UniValue::VARR); - for (const uint256 &txid : txids) { - result.push_back(txid.ToString()); - } - - return result; -} - static UniValue listunspent(const Config &config, const JSONRPCRequest &request) { std::shared_ptr const wallet = GetWalletForJSONRPCRequest(request); @@ -4872,7 +4822,6 @@ // category name actor (function) argNames // ------------------- ------------------------ ---------------------- ---------- { "generating", "generate", generate, {"nblocks","maxtries"} }, - { "hidden", "resendwallettransactions", resendwallettransactions, {} }, { "rawtransactions", "fundrawtransaction", fundrawtransaction, {"hexstring","options"} }, { "wallet", "abandontransaction", abandontransaction, {"txid"} }, { "wallet", "addmultisigaddress", addmultisigaddress, {"nrequired","keys","label"} }, 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 @@ -16,7 +16,6 @@ connect_nodes_bi, count_bytes, sync_blocks, - sync_mempools, wait_until, ) @@ -228,23 +227,9 @@ node_0_bal = self.check_fee_amount(self.nodes[0].getbalance( ), node_0_bal + Decimal('10'), fee_per_byte, ctx.billable_size()) - # Test ResendWalletTransactions: - # Create a couple of transactions, then start up a fourth - # node (nodes[3]) and ask nodes[0] to rebroadcast. - # EXPECT: nodes[3] should have those transactions in its mempool. - txid1 = self.nodes[0].sendtoaddress(self.nodes[1].getnewaddress(), 1) - txid2 = self.nodes[1].sendtoaddress(self.nodes[0].getnewaddress(), 1) - sync_mempools(self.nodes[0:2]) - self.start_node(3, self.extra_args[3]) connect_nodes_bi(self.nodes[0], self.nodes[3]) - sync_blocks(self.nodes) - - relayed = self.nodes[0].resendwallettransactions() - assert_equal(set(relayed), {txid1, txid2}) - sync_mempools(self.nodes) - - assert txid1 in self.nodes[3].getrawmempool() + self.sync_all() # check if we can list zero value tx as available coins # 1. create rawtx