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_backup.py | |
| parent | eb1f5706dfd51cb61491aba887b5b8b9dce396f6 (diff) | |
| parent | fa0b916971e5bc23ad6396831940a2899ca05402 (diff) | |
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_backup.py')
| -rwxr-xr-x | test/functional/wallet_backup.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/functional/wallet_backup.py b/test/functional/wallet_backup.py index c7a983556d..bc6d6206e5 100755 --- a/test/functional/wallet_backup.py +++ b/test/functional/wallet_backup.py @@ -88,7 +88,7 @@ class WalletBackupTest(BitcoinTestFramework): # Have the miner (node3) mine a block. # Must sync mempools before mining. self.sync_mempools() - self.nodes[3].generate(1) + self.generate(self.nodes[3], 1) self.sync_blocks() # As above, this mirrors the original bash test. @@ -130,13 +130,13 @@ class WalletBackupTest(BitcoinTestFramework): def run_test(self): self.log.info("Generating initial blockchain") - self.nodes[0].generate(1) + self.generate(self.nodes[0], 1) self.sync_blocks() - self.nodes[1].generate(1) + self.generate(self.nodes[1], 1) self.sync_blocks() - self.nodes[2].generate(1) + self.generate(self.nodes[2], 1) self.sync_blocks() - self.nodes[3].generate(COINBASE_MATURITY) + self.generate(self.nodes[3], COINBASE_MATURITY) self.sync_blocks() assert_equal(self.nodes[0].getbalance(), 50) @@ -165,7 +165,7 @@ class WalletBackupTest(BitcoinTestFramework): self.do_one_round() # Generate 101 more blocks, so any fees paid mature - self.nodes[3].generate(COINBASE_MATURITY + 1) + self.generate(self.nodes[3], COINBASE_MATURITY + 1) self.sync_all() balance0 = self.nodes[0].getbalance() |