milksad
/
rust-bitcoin-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

No space- and case insensitivity for SigHashType string serialization

This commit is contained in:
Dr Maxim Orlovsky 2020-10-14 16:46:48 +02:00
parent 00c3466363
commit 8e0b9921ae
No known key found for this signature in database
GPG Key ID: FFC0250947E5C6F7
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/blockdata/transaction.rs
View File

@ -636,7 +636,7 @@ impl str::FromStr for SigHashType {
type Err = String; type Err = String;
fn from_str(s: &str) -> Result<Self, Self::Err> { fn from_str(s: &str) -> Result<Self, Self::Err> {
match s.replace(' ', "").to_ascii_uppercase().as_ref() { match s.as_ref() {
"SIGHASH_ALL" => Ok(SigHashType::All), "SIGHASH_ALL" => Ok(SigHashType::All),
"SIGHASH_NONE" => Ok(SigHashType::None), "SIGHASH_NONE" => Ok(SigHashType::None),
"SIGHASH_SINGLE" => Ok(SigHashType::Single), "SIGHASH_SINGLE" => Ok(SigHashType::Single),
@ -960,18 +960,17 @@ mod tests {
assert_eq!(sht.to_string(), s); assert_eq!(sht.to_string(), s);
assert_eq!(SigHashType::from_str(s).unwrap(), sht); assert_eq!(SigHashType::from_str(s).unwrap(), sht);
} }
let sht_spaces = vec![
("SIGHASH_ALL | SIGHASH_ANYONECANPAY", SigHashType::AllPlusAnyoneCanPay),
("SIGHASH_NONE |SIGHASH_ANYONECANPAY", SigHashType::NonePlusAnyoneCanPay),
("SIGHASH_SINGLE| SIGHASH_ANYONECANPAY", SigHashType::SinglePlusAnyoneCanPay)
];
for (s, sht) in sht_spaces {
assert_eq!(SigHashType::from_str(s).unwrap(), sht);
}
let sht_mistakes = vec![ let sht_mistakes = vec![
"SIGHASH_ALL | SIGHASH_ANYONECANPAY",
"SIGHASH_NONE |SIGHASH_ANYONECANPAY",
"SIGHASH_SINGLE| SIGHASH_ANYONECANPAY",
"SIGHASH_ALL SIGHASH_ANYONECANPAY", "SIGHASH_ALL SIGHASH_ANYONECANPAY",
"SIGHASH_NONE |", "SIGHASH_NONE |",
"SIGHASH_SIGNLE" "SIGHASH_SIGNLE",
"sighash_none",
"Sighash_none",
"SigHash_None",
"SigHash_NONE",
]; ];
for s in sht_mistakes { for s in sht_mistakes {
assert_eq!(SigHashType::from_str(s).unwrap_err(), "can't recognize SIGHASH string"); assert_eq!(SigHashType::from_str(s).unwrap_err(), "can't recognize SIGHASH string");