Skip to content

Commit faa4916

Browse files
author
MacroFake
committed
test/doc: Remove unused syncwithvalidationinterfacequeue
See bitcoin/bitcoin#25768 (comment) Also fix doc typo from bitcoin/bitcoin#25768 (comment)
1 parent a8c3590 commit faa4916

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/wallet/wallet.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1920,7 +1920,7 @@ std::set<uint256> CWallet::GetTxConflicts(const CWalletTx& wtx) const
19201920
// The `force` option results in all unconfirmed transactions being submitted to
19211921
// the mempool. This does not necessarily result in those transactions being relayed,
19221922
// that depends on the `relay` option. Periodic rebroadcast uses the pattern
1923-
// relay=true force=false (also the default values), while loading into the mempool
1923+
// relay=true force=false, while loading into the mempool
19241924
// (on start, or after import) uses relay=false force=true.
19251925
void CWallet::ResubmitWalletTransactions(bool relay, bool force)
19261926
{

test/functional/wallet_resendwallettransactions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,13 @@ def run_test(self):
9898
block = create_block(int(node.getbestblockhash(), 16), create_coinbase(node.getblockcount() + 1), block_time)
9999
block.solve()
100100
node.submitblock(block.serialize().hex())
101+
# Set correct m_best_block_time, which is used in ResubmitWalletTransactions
101102
node.syncwithvalidationinterfacequeue()
102103

103104
# Evict these txs from the mempool
104105
evict_time = block_time + 60 * 60 * DEFAULT_MEMPOOL_EXPIRY_HOURS + 5
105106
node.setmocktime(evict_time)
106107
indep_send = node.send(outputs=[{node.getnewaddress(): 1}], options={"inputs": [indep_utxo]})
107-
node.syncwithvalidationinterfacequeue()
108108
node.getmempoolentry(indep_send["txid"])
109109
assert_raises_rpc_error(-5, "Transaction not in mempool", node.getmempoolentry, txid)
110110
assert_raises_rpc_error(-5, "Transaction not in mempool", node.getmempoolentry, child_txid)

0 commit comments

Comments
 (0)