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_create_tx.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_create_tx.py')
| -rwxr-xr-x | test/functional/wallet_create_tx.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/functional/wallet_create_tx.py b/test/functional/wallet_create_tx.py index a39a3c8d9b..c8b92ef1bf 100755 --- a/test/functional/wallet_create_tx.py +++ b/test/functional/wallet_create_tx.py @@ -24,7 +24,7 @@ class CreateTxWalletTest(BitcoinTestFramework): def run_test(self): self.log.info('Create some old blocks') self.nodes[0].setmocktime(TIME_GENESIS_BLOCK) - self.nodes[0].generate(200) + self.generate(self.nodes[0], 200) self.nodes[0].setmocktime(0) self.test_anti_fee_sniping() @@ -38,7 +38,7 @@ class CreateTxWalletTest(BitcoinTestFramework): assert_equal(tx['locktime'], 0) self.log.info('Check that anti-fee-sniping is enabled when we mine a recent block') - self.nodes[0].generate(1) + self.generate(self.nodes[0], 1) txid = self.nodes[0].sendtoaddress(self.nodes[0].getnewaddress(), 1) tx = self.nodes[0].decoderawtransaction(self.nodes[0].gettransaction(txid)['hex']) assert 0 < tx['locktime'] <= 201 |