Skip to content

Commit 370c592

Browse files
committed
Merge bitcoin#32630: test: fix sync function in rpc_psbt.py
4df4df4 test: fix sync function in rpc_psbt.py (Martin Zumsande) Pull request description: Even though the block is created on `node2`, the sync is only between `node1` and `node0`. Accordingly the test fails if I put a sleep in `msg_type == NetMsgType::HEADERS` processing: In this case, `node1` and `node0` do not hear about the new block, the sync still passes because they are in sync with each other, and later on in the `test_input_confs_control` subtest, `node1` would generate a forked block instead of building on the previous one, leading to test failure. Haven't seen this in the CI, but I ran into it on an experimental branch. ACKs for top commit: maflcko: lgtm ACK 4df4df4 achow101: ACK 4df4df4 Tree-SHA512: 1211ba0ad263ebcd0aa6ef7c856dec7ec6ca6010e1df705e7243f6c9d950ccca6df1275c36a73a83034f49ea8401e8f9800c05cdb74c39e860e7ebcaf2ce6ada
2 parents 88b22ac + 4df4df4 commit 370c592

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

test/functional/rpc_psbt.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def test_psbt_incomplete_after_invalid_modification(self):
8383
wallet = node.get_wallet_rpc(self.default_wallet_name)
8484
address = wallet.getnewaddress()
8585
wallet.sendtoaddress(address=address, amount=1.0)
86-
self.generate(node, nblocks=1, sync_fun=lambda: self.sync_all(self.nodes[:2]))
86+
self.generate(node, nblocks=1)
8787

8888
utxos = wallet.listunspent(addresses=[address])
8989
psbt = wallet.createpsbt([{"txid": utxos[0]["txid"], "vout": utxos[0]["vout"]}], [{wallet.getnewaddress(): 0.9999}])

0 commit comments

Comments
 (0)