diff --git a/bitcoin/src/blockdata/transaction.rs b/bitcoin/src/blockdata/transaction.rs index f169f4168..fca435125 100644 --- a/bitcoin/src/blockdata/transaction.rs +++ b/bitcoin/src/blockdata/transaction.rs @@ -517,11 +517,7 @@ impl TransactionExtPriv for Transaction { 1 } else if witness_program.is_p2wsh() { // Treat the last item of the witness as the witnessScript - witness - .last() - .map(Script::from_bytes) - .map(|s| s.count_sigops()) - .unwrap_or(0) + witness.last().map(Script::from_bytes).map(|s| s.count_sigops()).unwrap_or(0) } else { 0 } diff --git a/bitcoin/src/psbt/mod.rs b/bitcoin/src/psbt/mod.rs index 20c2c6c04..61f6b4841 100644 --- a/bitcoin/src/psbt/mod.rs +++ b/bitcoin/src/psbt/mod.rs @@ -891,11 +891,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(); @@ -928,18 +928,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), diff --git a/bitcoin/src/taproot/mod.rs b/bitcoin/src/taproot/mod.rs index f69434d21..5c284ce89 100644 --- a/bitcoin/src/taproot/mod.rs +++ b/bitcoin/src/taproot/mod.rs @@ -779,7 +779,9 @@ impl TapTree { /// Returns [`TapTreeIter<'_>`] iterator for a Taproot script tree, operating in DFS order over /// tree [`ScriptLeaf`]s. - pub fn script_leaves(&self) -> ScriptLeaves<'_> { ScriptLeaves { leaf_iter: self.0.leaf_nodes() } } + pub fn script_leaves(&self) -> ScriptLeaves<'_> { + ScriptLeaves { leaf_iter: self.0.leaf_nodes() } + } /// Returns the root [`TapNodeHash`] of this tree. pub fn root_hash(&self) -> TapNodeHash { self.0.hash } diff --git a/units/src/fee_rate/mod.rs b/units/src/fee_rate/mod.rs index aec144041..6d9b76d93 100644 --- a/units/src/fee_rate/mod.rs +++ b/units/src/fee_rate/mod.rs @@ -10,7 +10,6 @@ use core::ops; #[cfg(feature = "arbitrary")] use arbitrary::{Arbitrary, Unstructured}; - use NumOpResult as R; use crate::{Amount, MathOp, NumOpError as E, NumOpResult, Weight};