diff --git a/bitcoin/src/psbt/mod.rs b/bitcoin/src/psbt/mod.rs index 72f053c2f..325322816 100644 --- a/bitcoin/src/psbt/mod.rs +++ b/bitcoin/src/psbt/mod.rs @@ -749,12 +749,11 @@ impl serde::Serialize for Psbt { impl<'de> serde::Deserialize<'de> for Psbt { fn deserialize(deserializer: D) -> Result where - D: serde::Deserializer<'de> + D: serde::Deserializer<'de>, { struct Visitor; - impl<'de> serde::de::Visitor<'de> for Visitor - { + impl<'de> serde::de::Visitor<'de> for Visitor { type Value = Psbt; fn expecting(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result { @@ -762,8 +761,7 @@ impl<'de> serde::Deserialize<'de> for Psbt { } fn visit_bytes(self, bytes: &[u8]) -> Result { - Psbt::deserialize(bytes) - .map_err(|e| serde::de::Error::custom(e)) + Psbt::deserialize(bytes).map_err(|e| serde::de::Error::custom(e)) } fn visit_str(self, s: &str) -> Result { @@ -900,11 +898,11 @@ impl GetKey for $map { KeyRequest::XOnlyPubkey(xonly) => { let pubkey_even = xonly.public_key(secp256k1::Parity::Even); let key = self.get(&pubkey_even).cloned(); - + if key.is_some() { return Ok(key); } - + let pubkey_odd = xonly.public_key(secp256k1::Parity::Odd); if let Some(priv_key) = self.get(&pubkey_odd).copied() { let negated_priv_key = priv_key.negate(); @@ -937,18 +935,18 @@ impl GetKey for $map { KeyRequest::XOnlyPubkey(xonly) => Ok(self.get(xonly).cloned()), KeyRequest::Pubkey(pk) => { let (xonly, parity) = pk.inner.x_only_public_key(); - + if let Some(mut priv_key) = self.get(&XOnlyPublicKey::from(xonly)).cloned() { let computed_pk = priv_key.public_key(&secp); let (_, computed_parity) = computed_pk.inner.x_only_public_key(); - + if computed_parity != parity { priv_key = priv_key.negate(); } - + return Ok(Some(priv_key)); } - + Ok(None) }, KeyRequest::Bip32(_) => Err(GetKeyError::NotSupported), @@ -1456,17 +1454,15 @@ mod tests { Err(ABSURD_FEE_RATE) ); assert_eq!( - psbt.clone() - .extract_tx_with_fee_rate_limit(JUST_BELOW_ABSURD_FEE_RATE) - .map_err(|e| match e { + psbt.clone().extract_tx_with_fee_rate_limit(JUST_BELOW_ABSURD_FEE_RATE).map_err(|e| { + match e { ExtractTxError::AbsurdFeeRate { fee_rate, .. } => fee_rate, _ => panic!(""), - }), + } + }), Err(ABSURD_FEE_RATE) ); - assert!(psbt - .extract_tx_with_fee_rate_limit(ABSURD_FEE_RATE) - .is_ok()); + assert!(psbt.extract_tx_with_fee_rate_limit(ABSURD_FEE_RATE).is_ok()); // Testing that extract_tx will error at 25k sat/vbyte (6250000 sat/kwu) assert_eq!( diff --git a/bitcoin/tests/serde.rs b/bitcoin/tests/serde.rs index 136d72418..dce8faf38 100644 --- a/bitcoin/tests/serde.rs +++ b/bitcoin/tests/serde.rs @@ -30,8 +30,7 @@ use bitcoin::consensus::encode::deserialize; use bitcoin::hashes::{hash160, ripemd160, sha256, sha256d}; use bitcoin::hex::FromHex; use bitcoin::locktime::{absolute, relative}; -use bitcoin::psbt::raw; -use bitcoin::psbt::{Input, Output, Psbt, PsbtSighashType}; +use bitcoin::psbt::{raw, Input, Output, Psbt, PsbtSighashType}; use bitcoin::script::ScriptBufExt as _; use bitcoin::sighash::{EcdsaSighashType, TapSighashType}; use bitcoin::taproot::{self, ControlBlock, LeafVersion, TapTree, TaprootBuilder}; diff --git a/fuzz/fuzz_targets/bitcoin/p2p_address_roundtrip.rs b/fuzz/fuzz_targets/bitcoin/p2p_address_roundtrip.rs index f5dd65a64..669c5ea92 100644 --- a/fuzz/fuzz_targets/bitcoin/p2p_address_roundtrip.rs +++ b/fuzz/fuzz_targets/bitcoin/p2p_address_roundtrip.rs @@ -19,26 +19,17 @@ fn do_test(data: &[u8]) { if let Ok(ip_addr) = IpAddr::try_from(addr_v2.clone()) { let round_trip: AddrV2 = AddrV2::from(ip_addr); - assert_eq!( - addr_v2, round_trip, - "AddrV2 -> IpAddr -> AddrV2 should round-trip correctly" - ); + assert_eq!(addr_v2, round_trip, "AddrV2 -> IpAddr -> AddrV2 should round-trip correctly"); } if let Ok(ip_addr) = Ipv4Addr::try_from(addr_v2.clone()) { let round_trip: AddrV2 = AddrV2::from(ip_addr); - assert_eq!( - addr_v2, round_trip, - "AddrV2 -> Ipv4Addr -> AddrV2 should round-trip correctly" - ); + assert_eq!(addr_v2, round_trip, "AddrV2 -> Ipv4Addr -> AddrV2 should round-trip correctly"); } if let Ok(ip_addr) = Ipv6Addr::try_from(addr_v2.clone()) { let round_trip: AddrV2 = AddrV2::from(ip_addr); - assert_eq!( - addr_v2, round_trip, - "AddrV2 -> Ipv6Addr -> AddrV2 should round-trip correctly" - ); + assert_eq!(addr_v2, round_trip, "AddrV2 -> Ipv6Addr -> AddrV2 should round-trip correctly"); } if let Ok(socket_addr) = SocketAddr::try_from(addr_v2.clone()) { diff --git a/units/src/amount/error.rs b/units/src/amount/error.rs index fbb1cfdfd..e0946d15c 100644 --- a/units/src/amount/error.rs +++ b/units/src/amount/error.rs @@ -347,7 +347,6 @@ impl fmt::Display for ParseDenominationError { #[cfg(feature = "std")] impl std::error::Error for ParseDenominationError { fn source(&self) -> Option<&(dyn std::error::Error + 'static)> { - match *self { Self::Unknown(_) | Self::PossiblyConfusing(_) => None, } diff --git a/units/src/locktime/absolute.rs b/units/src/locktime/absolute.rs index ee50262ef..46e8a7403 100644 --- a/units/src/locktime/absolute.rs +++ b/units/src/locktime/absolute.rs @@ -377,7 +377,6 @@ impl ParseError { ) -> fmt::Result { use core::num::IntErrorKind; - match self { Self::ParseInt(ParseIntError { input, bits: _, is_signed: _, source }) if *source.kind() == IntErrorKind::PosOverflow => @@ -425,7 +424,6 @@ impl ParseError { fn source(&self) -> Option<&(dyn std::error::Error + 'static)> { use core::num::IntErrorKind; - match self { Self::ParseInt(ParseIntError { source, .. }) if *source.kind() == IntErrorKind::PosOverflow =>