PSBT serde implementation #497
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
13 tasks
apoelstra
reviewed
Oct 14, 2020
src/blockdata/transaction.rs
Outdated
| let s = match self { | ||
| SigHashType::All => "SIGHASH_ALL", | ||
| SigHashType::None => "SIGHASH_NONE", | ||
| SigHashType::Single => "SIGHASH_SIGNLE", |
apoelstra
reviewed
Oct 14, 2020
src/blockdata/transaction.rs
Outdated
| SigHashType::All => "SIGHASH_ALL", | ||
| SigHashType::None => "SIGHASH_NONE", | ||
| SigHashType::Single => "SIGHASH_SIGNLE", | ||
| SigHashType::AllPlusAnyoneCanPay => "SIGHASH_ALL | SIGHASH_ANYONECANPAY", |
There was a problem hiding this comment.
IMO we should drop the spaces here which might make parsing easier in some contexts (e.g. shell ... though of course shell will also barf on the | ;))
apoelstra
reviewed
Oct 14, 2020
src/blockdata/transaction.rs
Outdated
| SigHashType::Single => "SIGHASH_SIGNLE", | ||
| SigHashType::AllPlusAnyoneCanPay => "SIGHASH_ALL | SIGHASH_ANYONECANPAY", | ||
| SigHashType::NonePlusAnyoneCanPay => "SIGHASH_NONE | SIGHASH_ANYONECANPAY", | ||
| SigHashType::SinglePlusAnyoneCanPay => "SIGHASH_SIGNLE | SIGHASH_ANYONECANPAY", |
apoelstra
reviewed
Oct 14, 2020
| "SIGHASH_ALL|SIGHASH_ANYONECANPAY" => Ok(SigHashType::AllPlusAnyoneCanPay), | ||
| "SIGHASH_NONE|SIGHASH_ANYONECANPAY" => Ok(SigHashType::NonePlusAnyoneCanPay), | ||
| "SIGHASH_SIGNLE|SIGHASH_ANYONECANPAY" => Ok(SigHashType::SinglePlusAnyoneCanPay), | ||
| _ => Err("can't recognize SIGHASH string".to_string()) |
There was a problem hiding this comment.
can you add a unit test which tries to round-trip every variant as a string?
|
@apoelstra fixed typo + tests |
apoelstra
reviewed
Oct 14, 2020
src/blockdata/transaction.rs
Outdated
| type Err = String; | ||
|
|
||
| fn from_str(s: &str) -> Result<Self, Self::Err> { | ||
| match s.replace(' ', "").to_ascii_uppercase().as_ref() { |
There was a problem hiding this comment.
I really don't like this being case-insensitive or space-insensitive. It will break roundtripping tests for this type or anything that contains it.
apoelstra
approved these changes
Oct 14, 2020
elichai
approved these changes
Oct 14, 2020
|
I made this work with JSON and added a test here: #508. |
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.
No description provided.