Skip to content

Commit 64156ad

Browse files
author
MarcoFalke
committed
Merge #19893: test: Remove or explain syncwithvalidationinterfacequeue
fa6af31 test: Document why syncwithvalidationinterfacequeue is needed in tests (MarcoFalke) fa135a1 Revert "test: Add missing sync_all to wallet_balance test" (MarcoFalke) Pull request description: syncwithvalidationinterfacequeue is a hidden test-only RPC, so it should not be used when it is not needed. Thus, either remove it or explain why it is needed. ACKs for top commit: fjahr: Code review ACK fa6af31 Tree-SHA512: de30db4ab521184091ee5beeab02989138cf7cf05088f766a2fb106151b239310b63d5380cb79e2a072f72c5ae9513aecae8eb9c1c7be713771585c3cb04d63a
2 parents 9385549 + fa6af31 commit 64156ad

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

test/functional/wallet_balance.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,8 +263,6 @@ def test_balances(*, fee_node_1=0):
263263
self.log.info('Put txs back into mempool of node 1 (not node 0)')
264264
self.nodes[0].invalidateblock(block_reorg)
265265
self.nodes[1].invalidateblock(block_reorg)
266-
self.sync_blocks()
267-
self.nodes[0].syncwithvalidationinterfacequeue()
268266
assert_equal(self.nodes[0].getbalance(minconf=0), 0) # wallet txs not in the mempool are untrusted
269267
self.nodes[0].generatetoaddress(1, ADDRESS_WATCHONLY)
270268
assert_equal(self.nodes[0].getbalance(minconf=0), 0) # wallet txs not in the mempool are untrusted

test/functional/wallet_importmulti.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def run_test(self):
6464
self.nodes[0].generate(1)
6565
self.nodes[1].generate(1)
6666
timestamp = self.nodes[1].getblock(self.nodes[1].getbestblockhash())['mediantime']
67-
self.nodes[1].syncwithvalidationinterfacequeue()
67+
self.nodes[1].syncwithvalidationinterfacequeue() # Sync the timestamp to the wallet, so that importmulti works
6868

6969
node0_address1 = self.nodes[0].getaddressinfo(self.nodes[0].getnewaddress())
7070

test/functional/wallet_resendwallettransactions.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ def run_test(self):
5050
block.solve()
5151
node.submitblock(ToHex(block))
5252

53+
# Set correct m_best_block_time, which is used in ResendWalletTransactions
5354
node.syncwithvalidationinterfacequeue()
5455
now = int(time.time())
5556

0 commit comments

Comments
 (0)