From faa4916529699f9a057e2bf2459d957bcec1de84 Mon Sep 17 00:00:00 2001 From: MacroFake Date: Wed, 14 Sep 2022 10:38:33 +0200 Subject: test/doc: Remove unused syncwithvalidationinterfacequeue See https://github.com/bitcoin/bitcoin/pull/25768#discussion_r958562071 Also fix doc typo from https://github.com/bitcoin/bitcoin/pull/25768#discussion_r958571943 --- src/wallet/wallet.cpp | 2 +- test/functional/wallet_resendwallettransactions.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 784ea24b98..081a238c08 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -1920,7 +1920,7 @@ std::set CWallet::GetTxConflicts(const CWalletTx& wtx) const // The `force` option results in all unconfirmed transactions being submitted to // the mempool. This does not necessarily result in those transactions being relayed, // that depends on the `relay` option. Periodic rebroadcast uses the pattern -// relay=true force=false (also the default values), while loading into the mempool +// relay=true force=false, while loading into the mempool // (on start, or after import) uses relay=false force=true. void CWallet::ResubmitWalletTransactions(bool relay, bool force) { diff --git a/test/functional/wallet_resendwallettransactions.py b/test/functional/wallet_resendwallettransactions.py index 26df0841d8..52e0270f6c 100755 --- a/test/functional/wallet_resendwallettransactions.py +++ b/test/functional/wallet_resendwallettransactions.py @@ -98,13 +98,13 @@ class ResendWalletTransactionsTest(BitcoinTestFramework): block = create_block(int(node.getbestblockhash(), 16), create_coinbase(node.getblockcount() + 1), block_time) block.solve() node.submitblock(block.serialize().hex()) + # Set correct m_best_block_time, which is used in ResubmitWalletTransactions node.syncwithvalidationinterfacequeue() # Evict these txs from the mempool evict_time = block_time + 60 * 60 * DEFAULT_MEMPOOL_EXPIRY_HOURS + 5 node.setmocktime(evict_time) indep_send = node.send(outputs=[{node.getnewaddress(): 1}], options={"inputs": [indep_utxo]}) - node.syncwithvalidationinterfacequeue() node.getmempoolentry(indep_send["txid"]) assert_raises_rpc_error(-5, "Transaction not in mempool", node.getmempoolentry, txid) assert_raises_rpc_error(-5, "Transaction not in mempool", node.getmempoolentry, child_txid) -- cgit v1.2.3 From fa1ce96184a1815f453e64e14d77cb0025800be9 Mon Sep 17 00:00:00 2001 From: MacroFake Date: Wed, 14 Sep 2022 16:56:52 +0200 Subject: test: Add missing syncwithvalidationinterfacequeue --- src/wallet/wallet.cpp | 2 +- test/functional/wallet_resendwallettransactions.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 081a238c08..e4babd1262 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -882,7 +882,7 @@ bool CWallet::MarkReplaced(const uint256& originalHash, const uint256& newHash) wtx.mapValue["replaced_by_txid"] = newHash.ToString(); - // Refresh mempool status without waiting for transactionRemovedFromMempool + // Refresh mempool status without waiting for transactionRemovedFromMempool or transactionAddedToMempool RefreshMempoolStatus(wtx, chain()); WalletBatch batch(GetDatabase()); diff --git a/test/functional/wallet_resendwallettransactions.py b/test/functional/wallet_resendwallettransactions.py index 52e0270f6c..b3d02fbfc9 100755 --- a/test/functional/wallet_resendwallettransactions.py +++ b/test/functional/wallet_resendwallettransactions.py @@ -89,6 +89,10 @@ class ResendWalletTransactionsTest(BitcoinTestFramework): if txids == [child_txid, txid]: break bumped = node.bumpfee(child_txid) + # The scheduler queue creates a copy of the added tx after + # send/bumpfee and re-adds it to the wallet (undoing the next + # removeprunedfunds). So empty the scheduler queue: + node.syncwithvalidationinterfacequeue() node.removeprunedfunds(child_txid) child_txid = bumped["txid"] entry_time = node.getmempoolentry(child_txid)["time"] -- cgit v1.2.3