diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2021-10-19 10:26:38 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2021-10-19 10:26:41 +0200 |
| commit | 077e98c6c20609bff7ecf1c7c9cdb3f4b31bc139 (patch) | |
| tree | 0c5f9b79136f509ba6c55dfc8e5bc7b856193ee5 | |
| parent | 4b24f6bbb51a40e77fcc7f1010eb14187567bc9a (diff) | |
| parent | ffdd94d753ccb8de86eacfb50ffe733c43c1c7c1 (diff) | |
Merge bitcoin/bitcoin#23303: test: Fix wallet_multisig_descriptor_psbt.py
ffdd94d753ccb8de86eacfb50ffe733c43c1c7c1 test: Fix wallet_multisig_descriptor_psbt.py (Hennadii Stepanov)
Pull request description:
The `wallet_multisig_descriptor_psbt.py`, which was introduced in the recent bitcoin/bitcoin#22067, has a merge conflict with the previously merged bitcoin/bitcoin#23207.
Fixed in this PR.
ACKs for top commit:
mjdietzx:
Tested ACK ffdd94d
S3RK:
ACK ffdd94d
Tree-SHA512: e8871aeebbe119e22347de19f62b4524e191885d66f94af802a33793dfa413790901fd54aeea1ab3d1b1487cb457e8a58b0aef19d0dc78b12a583646ba4af67e
| -rwxr-xr-x | test/functional/wallet_multisig_descriptor_psbt.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/functional/wallet_multisig_descriptor_psbt.py b/test/functional/wallet_multisig_descriptor_psbt.py index 68c206b038..ed855d2525 100755 --- a/test/functional/wallet_multisig_descriptor_psbt.py +++ b/test/functional/wallet_multisig_descriptor_psbt.py @@ -104,13 +104,13 @@ class WalletMultisigDescriptorPSBTTest(BitcoinTestFramework): self.log.info("Get a mature utxo to send to the multisig...") coordinator_wallet = participants["signers"][0] - coordinator_wallet.generatetoaddress(101, coordinator_wallet.getnewaddress()) + self.generatetoaddress(self.nodes[0], 101, coordinator_wallet.getnewaddress()) deposit_amount = 6.15 multisig_receiving_address = participants["multisigs"][0].getnewaddress() self.log.info("Send funds to the resulting multisig receiving address...") coordinator_wallet.sendtoaddress(multisig_receiving_address, deposit_amount) - self.nodes[0].generate(1) + self.generate(self.nodes[0], 1) self.sync_all() for participant in participants["multisigs"]: assert_approx(participant.getbalance(), deposit_amount, vspan=0.001) @@ -136,7 +136,7 @@ class WalletMultisigDescriptorPSBTTest(BitcoinTestFramework): coordinator_wallet.sendrawtransaction(finalized["hex"]) self.log.info("Check that balances are correct after the transaction has been included in a block.") - self.nodes[0].generate(1) + self.generate(self.nodes[0], 1) self.sync_all() assert_approx(participants["multisigs"][0].getbalance(), deposit_amount - value, vspan=0.001) assert_equal(participants["signers"][self.N - 1].getbalance(), value) @@ -153,7 +153,7 @@ class WalletMultisigDescriptorPSBTTest(BitcoinTestFramework): coordinator_wallet.sendrawtransaction(finalized["hex"]) self.log.info("Check that balances are correct after the transaction has been included in a block.") - self.nodes[0].generate(1) + self.generate(self.nodes[0], 1) self.sync_all() assert_approx(participants["multisigs"][0].getbalance(), deposit_amount - (value * 2), vspan=0.001) assert_equal(participants["signers"][self.N - 1].getbalance(), value * 2) |