Improve code for the Combiner role #15
Merged
Conversation
This file contains 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
|
@DanGould this PR fixes a pretty big hole in the |
tcharding
force-pushed
the
01-11-combine
branch
from
593a341
to
6e1d0cd
Compare
Add two new macros and refactor the `combine` functions to use them. Refactor only, no logic changes.
It does not make sense to allow our `v0` implementation to combine two PSBTs with different versions, error if this is attempted. While we are at it, move the `CombineError` into `global` because that is where it originates. Although this is not important in `v0`, over in `v2` there will be different `CombineError`s for the different maps - lets be uniform already.
Add a function `combine` to the `v0` module as we do in `v2`. While we are at it make all the docs and calling conventions uniform.
If an attempt is made to combine two PSBTs with different values for the global map fields `version` or `tx_version` return an error. This is in line with what we did in `v0`.
The current version of `Input::combine` is copied from the `v0` module and is not correct for `v2` - fix it.
As we did in other places use plural form for fields in the `Output` map.
As we did for `v2::Input`. The current version of `Output::combine` is copied from the `v0` module and is not correct for `v2` - fix it.
We have now fully replaced the usage of this private macro, remove it.
tcharding
force-pushed
the
01-11-combine
branch
from
6e1d0cd
to
c0ce672
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Improve code in the
v0andv2modules for the Combiner role. Includes refactoring and bug fixes. Note that thev2stuff is all new and was previously just copied fromv0.