From fa135a13b8ddaa117bd090ec43a3eab3a95755c1 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Sun, 6 Sep 2020 13:50:28 +0200 Subject: Revert "test: Add missing sync_all to wallet_balance test" This reverts commit fa815255c70d32809aac640db4a8762c7d71e8db. The underlying bug has been fixed in commit f77b1de16feee097a88e99d2ecdd4d84beb4f915. --- test/functional/wallet_balance.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'test') diff --git a/test/functional/wallet_balance.py b/test/functional/wallet_balance.py index e4989b4fea..8652328490 100755 --- a/test/functional/wallet_balance.py +++ b/test/functional/wallet_balance.py @@ -254,8 +254,6 @@ class WalletTest(BitcoinTestFramework): self.log.info('Put txs back into mempool of node 1 (not node 0)') self.nodes[0].invalidateblock(block_reorg) self.nodes[1].invalidateblock(block_reorg) - self.sync_blocks() - self.nodes[0].syncwithvalidationinterfacequeue() assert_equal(self.nodes[0].getbalance(minconf=0), 0) # wallet txs not in the mempool are untrusted self.nodes[0].generatetoaddress(1, ADDRESS_WATCHONLY) assert_equal(self.nodes[0].getbalance(minconf=0), 0) # wallet txs not in the mempool are untrusted -- cgit v1.2.3 From fa6af312277bb1b7e57d9b764d411c5b0873829f Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Sun, 6 Sep 2020 14:01:52 +0200 Subject: test: Document why syncwithvalidationinterfacequeue is needed in tests --- test/functional/wallet_importmulti.py | 2 +- test/functional/wallet_resendwallettransactions.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/test/functional/wallet_importmulti.py b/test/functional/wallet_importmulti.py index f7fdd6e908..30206349ae 100755 --- a/test/functional/wallet_importmulti.py +++ b/test/functional/wallet_importmulti.py @@ -64,7 +64,7 @@ class ImportMultiTest(BitcoinTestFramework): self.nodes[0].generate(1) self.nodes[1].generate(1) timestamp = self.nodes[1].getblock(self.nodes[1].getbestblockhash())['mediantime'] - self.nodes[1].syncwithvalidationinterfacequeue() + self.nodes[1].syncwithvalidationinterfacequeue() # Sync the timestamp to the wallet, so that importmulti works node0_address1 = self.nodes[0].getaddressinfo(self.nodes[0].getnewaddress()) diff --git a/test/functional/wallet_resendwallettransactions.py b/test/functional/wallet_resendwallettransactions.py index 1dcb12de08..3bfbcacd17 100755 --- a/test/functional/wallet_resendwallettransactions.py +++ b/test/functional/wallet_resendwallettransactions.py @@ -49,6 +49,7 @@ class ResendWalletTransactionsTest(BitcoinTestFramework): block.solve() node.submitblock(ToHex(block)) + # Set correct m_best_block_time, which is used in ResendWalletTransactions node.syncwithvalidationinterfacequeue() now = int(time.time()) -- cgit v1.2.3