From eb02dbba3cd9f7294cd81e268cf85a1de7a71d02 Mon Sep 17 00:00:00 2001 From: Samuel Dobson Date: Wed, 6 Oct 2021 12:18:33 +1300 Subject: Use self.generate not node.generate throughout tests --- test/functional/interface_zmq.py | 2 +- test/functional/p2p_compactblocks_blocksonly.py | 2 +- test/functional/rpc_fundrawtransaction.py | 2 +- test/functional/rpc_psbt.py | 2 +- test/functional/wallet_send.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/functional/interface_zmq.py b/test/functional/interface_zmq.py index 4313b05f88..5a11a62ec4 100755 --- a/test/functional/interface_zmq.py +++ b/test/functional/interface_zmq.py @@ -583,7 +583,7 @@ class ZMQTest (BitcoinTestFramework): ], ipv6=True) # Generate 1 block in nodes[0] - self.nodes[0].generatetoaddress(1, ADDRESS_BCRT1_UNSPENDABLE) + self.generatetoaddress(self.nodes[0], 1, ADDRESS_BCRT1_UNSPENDABLE) # Should receive the same block hash assert_equal(self.nodes[0].getbestblockhash(), subscribers[0].receive().hex()) diff --git a/test/functional/p2p_compactblocks_blocksonly.py b/test/functional/p2p_compactblocks_blocksonly.py index 4073ec03a6..5f01fa4dfe 100755 --- a/test/functional/p2p_compactblocks_blocksonly.py +++ b/test/functional/p2p_compactblocks_blocksonly.py @@ -33,7 +33,7 @@ class P2PCompactBlocksBlocksOnly(BitcoinTestFramework): self.sync_all() def build_block_on_tip(self): - blockhash = self.nodes[2].generate(1)[0] + blockhash = self.generate(self.nodes[2], 1)[0] block_hex = self.nodes[2].getblock(blockhash=blockhash, verbosity=0) block = from_hex(CBlock(), block_hex) block.rehash() diff --git a/test/functional/rpc_fundrawtransaction.py b/test/functional/rpc_fundrawtransaction.py index 3b01506986..b8a6bbfa17 100755 --- a/test/functional/rpc_fundrawtransaction.py +++ b/test/functional/rpc_fundrawtransaction.py @@ -1010,7 +1010,7 @@ class RawTransactionsTest(BitcoinTestFramework): self.nodes[0].sendtoaddress(addr, 10) self.nodes[0].sendtoaddress(wallet.getnewaddress(), 10) - self.nodes[0].generate(6) + self.generate(self.nodes[0], 6) ext_utxo = self.nodes[0].listunspent(addresses=[addr])[0] # An external input without solving data should result in an error diff --git a/test/functional/rpc_psbt.py b/test/functional/rpc_psbt.py index 6b5b2c6a0f..44f62b1a94 100755 --- a/test/functional/rpc_psbt.py +++ b/test/functional/rpc_psbt.py @@ -627,7 +627,7 @@ class PSBTTest(BitcoinTestFramework): addr_info = self.nodes[0].getaddressinfo(addr) self.nodes[0].sendtoaddress(addr, 10) - self.nodes[0].generate(6) + self.generate(self.nodes[0], 6) ext_utxo = self.nodes[0].listunspent(addresses=[addr])[0] # An external input without solving data should result in an error diff --git a/test/functional/wallet_send.py b/test/functional/wallet_send.py index 7b23235945..a00e326fd4 100755 --- a/test/functional/wallet_send.py +++ b/test/functional/wallet_send.py @@ -502,7 +502,7 @@ class WalletSendTest(BitcoinTestFramework): self.nodes[0].sendtoaddress(addr, 10) self.nodes[0].sendtoaddress(ext_wallet.getnewaddress(), 10) - self.nodes[0].generate(6) + self.generate(self.nodes[0], 6) ext_utxo = ext_fund.listunspent(addresses=[addr])[0] # An external input without solving data should result in an error -- cgit v1.2.3 From 75a9305d455e234c6b63635d80b0f2aef902342e Mon Sep 17 00:00:00 2001 From: Samuel Dobson Date: Wed, 6 Oct 2021 12:19:04 +1300 Subject: Fix intermittent test failures due to missing sync_all --- test/functional/rpc_fundrawtransaction.py | 1 + test/functional/rpc_psbt.py | 1 + test/functional/wallet_send.py | 1 + 3 files changed, 3 insertions(+) diff --git a/test/functional/rpc_fundrawtransaction.py b/test/functional/rpc_fundrawtransaction.py index b8a6bbfa17..b0e46c6ca7 100755 --- a/test/functional/rpc_fundrawtransaction.py +++ b/test/functional/rpc_fundrawtransaction.py @@ -1011,6 +1011,7 @@ class RawTransactionsTest(BitcoinTestFramework): self.nodes[0].sendtoaddress(addr, 10) self.nodes[0].sendtoaddress(wallet.getnewaddress(), 10) self.generate(self.nodes[0], 6) + self.sync_all() ext_utxo = self.nodes[0].listunspent(addresses=[addr])[0] # An external input without solving data should result in an error diff --git a/test/functional/rpc_psbt.py b/test/functional/rpc_psbt.py index 44f62b1a94..b132ac3d31 100755 --- a/test/functional/rpc_psbt.py +++ b/test/functional/rpc_psbt.py @@ -628,6 +628,7 @@ class PSBTTest(BitcoinTestFramework): self.nodes[0].sendtoaddress(addr, 10) self.generate(self.nodes[0], 6) + self.sync_all() ext_utxo = self.nodes[0].listunspent(addresses=[addr])[0] # An external input without solving data should result in an error diff --git a/test/functional/wallet_send.py b/test/functional/wallet_send.py index a00e326fd4..c9daeabeb9 100755 --- a/test/functional/wallet_send.py +++ b/test/functional/wallet_send.py @@ -503,6 +503,7 @@ class WalletSendTest(BitcoinTestFramework): self.nodes[0].sendtoaddress(addr, 10) self.nodes[0].sendtoaddress(ext_wallet.getnewaddress(), 10) self.generate(self.nodes[0], 6) + self.sync_all() ext_utxo = ext_fund.listunspent(addresses=[addr])[0] # An external input without solving data should result in an error -- cgit v1.2.3