test: Fix wallet_multisig_descriptor_psbt.py #23303
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Tested ACK ffdd94d Thanks for catching and fixing this! |
|
ACK ffdd94d |
sidhujag
pushed a commit
to syscoin/syscoin
that referenced
this pull request
Oct 19, 2021
ffdd94d 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#22067, has a merge conflict with the previously merged bitcoin#23207. Fixed in this PR. ACKs for top commit: mjdietzx: Tested ACK ffdd94d S3RK: ACK ffdd94d Tree-SHA512: e8871aeebbe119e22347de19f62b4524e191885d66f94af802a33793dfa413790901fd54aeea1ab3d1b1487cb457e8a58b0aef19d0dc78b12a583646ba4af67e
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The
wallet_multisig_descriptor_psbt.py, which was introduced in the recent #22067, has a merge conflict with the previously merged #23207.Fixed in this PR.