highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-04-22 14:35:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#23200: Fix intermittent failure in wallet_send.py and rpc_fundrawtransaction.py

Browse Source 
75a9305d455e234c6b63635d80b0f2aef902342e Fix intermittent test failures due to missing sync_all (Samuel Dobson)
eb02dbba3cd9f7294cd81e268cf85a1de7a71d02 Use self.generate not node.generate throughout tests (Samuel Dobson)

Pull request description:

  After #17211 was merged, there have been a few intermittent test failures in `wallet_send.py`, `rpc_fundrawtransaction.py`, and `rpc_psbt.py`

  I believe all these failures are due to these missing `sync_all()`s

ACKs for top commit:
  achow101:
    ACK 75a9305d455e234c6b63635d80b0f2aef902342e
  lsilva01:
    Tested ACK 75a9305d45 on Ubuntu 20.04

Tree-SHA512: 91de5763664046e5a35802eb1a9a28f69a1a27d78d26c9fa0024bcfab4ccb4b7ad4feebea7de4b19e141db9c39270c623c57c47942a48dfe679fdc8cad70df43
This commit is contained in:
MarcoFalke 2021-10-06 13:04:46 +02:00
commit 66d11b1435
No known key found for this signature in database
GPG Key ID: CE2B75697E69A548
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/functional/interface_zmq.py
View File

@ -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())

2
test/functional/p2p_compactblocks_blocksonly.py
View File

@ -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()

3
test/functional/rpc_fundrawtransaction.py
View File

@ -1010,7 +1010,8 @@ 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)
self.sync_all()
ext_utxo = self.nodes[0].listunspent(addresses=[addr])[0]
# An external input without solving data should result in an error

3
test/functional/rpc_psbt.py
View File

@ -627,7 +627,8 @@ 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)
self.sync_all()
ext_utxo = self.nodes[0].listunspent(addresses=[addr])[0]
# An external input without solving data should result in an error

3
test/functional/wallet_send.py
View File

@ -502,7 +502,8 @@ 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)
self.sync_all()
ext_utxo = ext_fund.listunspent(addresses=[addr])[0]
# An external input without solving data should result in an error