foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-09 10:43:19 -05:00
Code Issues Activity

test: Add missing syncwithvalidationinterfacequeue

Browse source
This commit is contained in:
MacroFake 2022-09-14 16:56:52 +02:00
parent faa4916529
commit fa1ce96184
No known key found for this signature in database
GPG key ID: CE2B75697E69A548
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/wallet/wallet.cpp
View file

@ -882,7 +882,7 @@ bool CWallet::MarkReplaced(const uint256& originalHash, const uint256& newHash)
wtx.mapValue["replaced_by_txid"] = newHash.ToString(); 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()); RefreshMempoolStatus(wtx, chain());
WalletBatch batch(GetDatabase()); WalletBatch batch(GetDatabase());

4
test/functional/wallet_resendwallettransactions.py
View file

@ -89,6 +89,10 @@ class ResendWalletTransactionsTest(BitcoinTestFramework):
if txids == [child_txid, txid]: if txids == [child_txid, txid]:
break break
bumped = node.bumpfee(child_txid) 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) node.removeprunedfunds(child_txid)
child_txid = bumped["txid"] child_txid = bumped["txid"]
entry_time = node.getmempoolentry(child_txid)["time"] entry_time = node.getmempoolentry(child_txid)["time"]