diff options
| author | fanquake <fanquake@gmail.com> | 2021-08-24 16:22:24 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-08-24 16:22:30 +0800 |
| commit | eb09c26724e3f714b613788fc506f2ff3a208d2c (patch) | |
| tree | 941ac1005e0ffd55f6efa1107ba2b810244250ca /test/functional/wallet_importdescriptors.py | |
| parent | dd455ecfa085f72dea5fe192491b7d0b474fbed1 (diff) | |
| parent | fab2e23b579c44f1b4bed4d813bbe5a21eaa22c8 (diff) | |
Merge bitcoin/bitcoin#22741: test: Add generate* calls to test framework
fab2e23b579c44f1b4bed4d813bbe5a21eaa22c8 Use generate* from TestFramework (MarcoFalke)
faf7e9280487d643cf59681df2711d72675b5ad4 test: Add generate* calls to test framework (MarcoFalke)
Pull request description:
This is needed for #22567.
By making the calls to `generate*` member function of the test framework, it paves the way to make it easier to implicitly call the `sync_all` member function.
ACKs for top commit:
jnewbery:
utACK fab2e23b579c44f1b4bed4d813bbe5a21eaa22c8
Tree-SHA512: 7a7be6be71f0602119689df45d63a1adec309f323eac2330ee0f200676001afe825605859bd02c6a8a8dcf85d925dc1bc37370ef1ceb8ad1d85a66eec0dbfff9
Diffstat (limited to 'test/functional/wallet_importdescriptors.py')
| -rwxr-xr-x | test/functional/wallet_importdescriptors.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/functional/wallet_importdescriptors.py b/test/functional/wallet_importdescriptors.py index 262175c789..4cb311983c 100755 --- a/test/functional/wallet_importdescriptors.py +++ b/test/functional/wallet_importdescriptors.py @@ -74,7 +74,7 @@ class ImportDescriptorsTest(BitcoinTestFramework): assert_equal(wpriv.getwalletinfo()['keypoolsize'], 0) self.log.info('Mining coins') - w0.generatetoaddress(COINBASE_MATURITY + 1, w0.getnewaddress()) + self.generatetoaddress(w0, COINBASE_MATURITY + 1, w0.getnewaddress()) # RPC importdescriptors ----------------------------------------------- @@ -405,7 +405,7 @@ class ImportDescriptorsTest(BitcoinTestFramework): solvable=True, ismine=True) txid = w0.sendtoaddress(address, 49.99995540) - w0.generatetoaddress(6, w0.getnewaddress()) + self.generatetoaddress(w0, 6, w0.getnewaddress()) self.sync_blocks() tx = wpriv.createrawtransaction([{"txid": txid, "vout": 0}], {w0.getnewaddress(): 49.999}) signed_tx = wpriv.signrawtransactionwithwallet(tx) |