diff options
author | Andrew Chow <achow101-github@achow101.com> | 2022-07-28 17:23:11 -0400 |
---|---|---|
committer | Andrew Chow <achow101-github@achow101.com> | 2022-07-28 17:34:28 -0400 |
commit | 317ef0368b40732526fe08e966192bbebe8c4447 (patch) | |
tree | 7d50b37a22497a8508c6d78714f79ade9421f34a /src | |
parent | 41205bf442254d17bc7885f3b2693749da714a0e (diff) | |
parent | 4e616d20c9e92b5118a07d4a4b8562fffc66e767 (diff) | |
download | bitcoin-317ef0368b40732526fe08e966192bbebe8c4447.tar.xz |
Merge bitcoin/bitcoin#25670: test: check that combining PSBTs with different txs fails
4e616d20c9e92b5118a07d4a4b8562fffc66e767 test: check that combining PSBTs with different txs fails (Sebastian Falbesoner)
2a428c79897761579efc990aaf810b0eb3e572b6 test: support passing PSBTMaps directly to PSBT ctor (Sebastian Falbesoner)
Pull request description:
This PR adds missing test coverage for the `combinepsbt` RPC, in the case of combining two PSBTs with different transactions:
https://github.com/bitcoin/bitcoin/blob/b8067cd435059eedb580975afc62c4e7a6f27321/src/psbt.cpp#L24-L27
The calling function `CombinePSBTs` checks for the false return value and then returns the transaction error string `PSBT_MISMATCH`:
https://github.com/bitcoin/bitcoin/blob/b8067cd435059eedb580975afc62c4e7a6f27321/src/psbt.cpp#L433-L435
https://github.com/bitcoin/bitcoin/blob/b8067cd435059eedb580975afc62c4e7a6f27321/src/util/error.cpp#L30-L31
ACKs for top commit:
instagibbs:
reACK https://github.com/bitcoin/bitcoin/pull/25670/commits/4e616d20c9e92b5118a07d4a4b8562fffc66e767
achow101:
ACK 4e616d20c9e92b5118a07d4a4b8562fffc66e767
Tree-SHA512: 45b2b224b13b44ad69ae62e4bc20f74cab32770cf8127b026ec47a7520f7253148fdbf1fad612afece59e45a6738bef9a351ae87ea98dc83d095cc78f6db0318
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions