diff options
author | merge-script <90386131+bitcoin-core-merge-script@users.noreply.github.com> | 2021-09-09 14:02:45 +0200 |
---|---|---|
committer | merge-script <90386131+bitcoin-core-merge-script@users.noreply.github.com> | 2021-09-09 14:02:45 +0200 |
commit | a5d00d4baff27b4185ea086af571142af17c32e4 (patch) | |
tree | 70d2e453b03cb6c8883a8f2967abbd9c54f046a7 /test/functional/wallet_send.py | |
parent | eb1f5706dfd51cb61491aba887b5b8b9dce396f6 (diff) | |
parent | fa0b916971e5bc23ad6396831940a2899ca05402 (diff) | |
download | bitcoin-a5d00d4baff27b4185ea086af571142af17c32e4.tar.xz |
Merge bitcoin/bitcoin#22788: scripted-diff: Use generate* from TestFramework
fa0b916971e5bc23ad6396831940a2899ca05402 scripted-diff: Use generate* from TestFramework (MarcoFalke)
Pull request description:
This is needed for #22567.
By using the newly added `generate*` member functions of the test framework, it paves the way to make it easier to implicitly call `sync_all` after block generation to avoid intermittent issues.
ACKs for top commit:
jonatack:
ACK fa0b916971e5bc23ad6396831940a2899ca05402
Tree-SHA512: e74a324b60250a87c08847cdfd7b6ce3e1d89b891659fd168f6dd7dc0aa718d0edd28285374a613f462f34f4ef8e12c90ad44fb58721c91b2ea691406ad22c2a
Diffstat (limited to 'test/functional/wallet_send.py')
-rwxr-xr-x | test/functional/wallet_send.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/functional/wallet_send.py b/test/functional/wallet_send.py index d24d1693af..aecdaf821f 100755 --- a/test/functional/wallet_send.py +++ b/test/functional/wallet_send.py @@ -241,7 +241,7 @@ class WalletSendTest(BitcoinTestFramework): assert_equal(res, [{"success": True}, {"success": True}]) w0.sendtoaddress(a2_receive, 10) # fund w3 - self.nodes[0].generate(1) + self.generate(self.nodes[0], 1) self.sync_blocks() if not self.options.descriptors: @@ -260,7 +260,7 @@ class WalletSendTest(BitcoinTestFramework): assert_equal(res, [{"success": True}]) w0.sendtoaddress(a2_receive, 10) # fund w4 - self.nodes[0].generate(1) + self.generate(self.nodes[0], 1) self.sync_blocks() self.log.info("Send to address...") @@ -435,14 +435,14 @@ class WalletSendTest(BitcoinTestFramework): assert not res[0]["allowed"] assert_equal(res[0]["reject-reason"], "non-final") # It shouldn't be confirmed in the next block - self.nodes[0].generate(1) + self.generate(self.nodes[0], 1) assert_equal(self.nodes[0].gettransaction(txid)["confirmations"], 0) # The mempool should allow it now: res = self.nodes[0].testmempoolaccept([hex]) assert res[0]["allowed"] # Don't wait for wallet to add it to the mempool: res = self.nodes[0].sendrawtransaction(hex) - self.nodes[0].generate(1) + self.generate(self.nodes[0], 1) assert_equal(self.nodes[0].gettransaction(txid)["confirmations"], 1) self.sync_all() |