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

Put NonStandardSighashTypeError inside ecdsa::Error variant 

As per convention; put the error type inside a variant and delegate to
it instead of carrying an integer around.
This commit is contained in:
Tobin C. Harding 2023-05-18 15:28:31 +10:00
parent 6c9d9d9c36
commit baba0fde57
No known key found for this signature in database
GPG Key ID: 40BF9E4C269D6607
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bitcoin/src/crypto/ecdsa.rs
View File

@ -37,8 +37,7 @@ impl Signature {
/// Deserializes from slice following the standardness rules for [`EcdsaSighashType`]. /// Deserializes from slice following the standardness rules for [`EcdsaSighashType`].
pub fn from_slice(sl: &[u8]) -> Result<Self, Error> { pub fn from_slice(sl: &[u8]) -> Result<Self, Error> {
let (hash_ty, sig) = sl.split_last().ok_or(Error::EmptySignature)?; let (hash_ty, sig) = sl.split_last().ok_or(Error::EmptySignature)?;
let hash_ty = EcdsaSighashType::from_standard(*hash_ty as u32) let hash_ty = EcdsaSighashType::from_standard(*hash_ty as u32)?;
.map_err(|_| Error::NonStandardSighashType(*hash_ty as u32))?;
let sig = secp256k1::ecdsa::Signature::from_der(sig).map_err(Error::Secp256k1)?; let sig = secp256k1::ecdsa::Signature::from_der(sig).map_err(Error::Secp256k1)?;
Ok(Signature { sig, hash_ty }) Ok(Signature { sig, hash_ty })
} }
@ -189,8 +188,8 @@ impl<'a> IntoIterator for &'a SerializedSignature {
pub enum Error { pub enum Error {
/// Hex decoding error /// Hex decoding error
Hex(hex::HexToBytesError), Hex(hex::HexToBytesError),
/// Base58 encoding error /// Non-standard sighash type
NonStandardSighashType(u32), SighashType(NonStandardSighashTypeError),
/// Empty Signature /// Empty Signature
EmptySignature, EmptySignature,
/// secp256k1-related error /// secp256k1-related error
@ -203,8 +202,7 @@ impl fmt::Display for Error {
match *self { match *self {
Hex(ref e) => write_err!(f, "signature hex decoding error"; e), Hex(ref e) => write_err!(f, "signature hex decoding error"; e),
NonStandardSighashType(hash_ty) => SighashType(ref e) => write_err!(f, "non-standard signature hash type"; e),
write!(f, "non-standard signature hash type {}", hash_ty),
EmptySignature => write!(f, "empty ECDSA signature"), EmptySignature => write!(f, "empty ECDSA signature"),
Secp256k1(ref e) => write_err!(f, "invalid ECDSA signature"; e), Secp256k1(ref e) => write_err!(f, "invalid ECDSA signature"; e),
} }
@ -219,7 +217,8 @@ impl std::error::Error for Error {
match self { match self {
Hex(e) => Some(e), Hex(e) => Some(e),
Secp256k1(e) => Some(e), Secp256k1(e) => Some(e),
NonStandardSighashType(_) | EmptySignature => None, SighashType(e) => Some(e),
EmptySignature => None,
} }
} }
} }
@ -229,7 +228,7 @@ impl From<secp256k1::Error> for Error {
} }
impl From<NonStandardSighashTypeError> for Error { impl From<NonStandardSighashTypeError> for Error {
fn from(err: NonStandardSighashTypeError) -> Self { Error::NonStandardSighashType(err.0) } fn from(err: NonStandardSighashTypeError) -> Self { Error::SighashType(err) }
} }
impl From<hex::HexToBytesError> for Error { impl From<hex::HexToBytesError> for Error {

2
bitcoin/src/psbt/serialize.rs
View File

@ -176,7 +176,7 @@ impl Deserialize for ecdsa::Signature {
// would use check the signature assuming sighash_u32 as `0x01`. // would use check the signature assuming sighash_u32 as `0x01`.
ecdsa::Signature::from_slice(bytes).map_err(|e| match e { ecdsa::Signature::from_slice(bytes).map_err(|e| match e {
ecdsa::Error::EmptySignature => Error::InvalidEcdsaSignature(e), ecdsa::Error::EmptySignature => Error::InvalidEcdsaSignature(e),
ecdsa::Error::NonStandardSighashType(flag) => Error::NonStandardSighashType(flag), ecdsa::Error::SighashType(err) => Error::NonStandardSighashType(err.0),
ecdsa::Error::Secp256k1(..) => Error::InvalidEcdsaSignature(e), ecdsa::Error::Secp256k1(..) => Error::InvalidEcdsaSignature(e),
ecdsa::Error::Hex(..) => unreachable!("Decoding from slice, not hex"), ecdsa::Error::Hex(..) => unreachable!("Decoding from slice, not hex"),
}) })