diff --git a/bitcoin/src/blockdata/script/builder.rs b/bitcoin/src/blockdata/script/builder.rs index ec842f7c9..55d4c325a 100644 --- a/bitcoin/src/blockdata/script/builder.rs +++ b/bitcoin/src/blockdata/script/builder.rs @@ -23,7 +23,9 @@ impl Builder { /// Constructs a new empty script builder with at least the specified capacity. #[inline] - pub fn with_capacity(capacity: usize) -> Self { Builder(ScriptBuf::with_capacity(capacity), None) } + pub fn with_capacity(capacity: usize) -> Self { + Builder(ScriptBuf::with_capacity(capacity), None) + } /// Returns the length in bytes of the script. pub fn len(&self) -> usize { self.0.len() } diff --git a/bitcoin/src/blockdata/transaction.rs b/bitcoin/src/blockdata/transaction.rs index 18c3a8eb7..9cc1c5939 100644 --- a/bitcoin/src/blockdata/transaction.rs +++ b/bitcoin/src/blockdata/transaction.rs @@ -16,6 +16,7 @@ use hashes::sha256d; use internals::{compact_size, write_err, ToU64}; use io::{BufRead, Write}; use primitives::Sequence; +use units::NumOpResult; use super::Weight; use crate::consensus::{self, encode, Decodable, Encodable}; @@ -27,7 +28,6 @@ use crate::script::{Script, ScriptBuf, ScriptExt as _, ScriptExtPriv as _}; use crate::sighash::{EcdsaSighashType, TapSighashType}; use crate::witness::Witness; use crate::{Amount, FeeRate, SignedAmount}; -use units::NumOpResult; #[rustfmt::skip] // Keep public re-exports separate. #[doc(inline)] @@ -786,10 +786,7 @@ pub fn effective_value( ) -> NumOpResult { let weight = input_weight_prediction.total_weight(); - fee_rate - .to_fee(weight) - .map(Amount::to_signed) - .and_then(|fee| value.to_signed() - fee) // Cannot overflow. + fee_rate.to_fee(weight).map(Amount::to_signed).and_then(|fee| value.to_signed() - fee) // Cannot overflow. } /// Predicts the weight of a to-be-constructed transaction. @@ -1943,7 +1940,7 @@ mod tests { // needless_borrows_for_generic_args incorrecctly identifies &[] as a needless borrow #[allow(clippy::needless_borrows_for_generic_args)] fn weight_prediction_new() { - let p2wpkh_max = InputWeightPrediction::new(0, [72,33]); + let p2wpkh_max = InputWeightPrediction::new(0, [72, 33]); assert_eq!(p2wpkh_max.script_size, 1); assert_eq!(p2wpkh_max.witness_size, 108); assert_eq!(p2wpkh_max.total_weight(), Weight::from_wu(272)); diff --git a/bitcoin/src/psbt/mod.rs b/bitcoin/src/psbt/mod.rs index 1766574dd..c004e432a 100644 --- a/bitcoin/src/psbt/mod.rs +++ b/bitcoin/src/psbt/mod.rs @@ -852,11 +852,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(); @@ -889,18 +889,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/units/src/fee_rate/mod.rs b/units/src/fee_rate/mod.rs index cc23c222e..c69b7dff2 100644 --- a/units/src/fee_rate/mod.rs +++ b/units/src/fee_rate/mod.rs @@ -161,7 +161,7 @@ crate::internal_macros::impl_op_for_references! { impl ops::Div for FeeRate { type Output = FeeRate; - + fn div(self, rhs: NonZeroU64) -> Self::Output{ Self::from_sat_per_kwu(self.to_sat_per_kwu() / rhs.get()) } } } @@ -204,9 +204,10 @@ impl<'a> Arbitrary<'a> for FeeRate { #[cfg(test)] mod tests { - use super::*; use core::num::NonZeroU64; + use super::*; + #[test] fn sanity_check() { let fee_rate: u64 = u64::from(FeeRate::from_sat_per_kwu(100)); diff --git a/units/src/result.rs b/units/src/result.rs index f0587b2b2..dcc714dea 100644 --- a/units/src/result.rs +++ b/units/src/result.rs @@ -88,7 +88,6 @@ pub enum NumOpResult { } impl NumOpResult { - /// Maps a `NumOpResult` to `NumOpResult` by applying a function to a /// contained [`NumOpResult::Valid`] value, leaving a [`NumOpResult::Error`] value untouched. /// diff --git a/units/src/weight.rs b/units/src/weight.rs index 269332592..d801dd254 100644 --- a/units/src/weight.rs +++ b/units/src/weight.rs @@ -293,9 +293,10 @@ impl<'a> Arbitrary<'a> for Weight { #[cfg(test)] mod tests { - use super::*; use core::num::NonZeroU64; + use super::*; + const ONE: Weight = Weight::from_wu(1); const TWO: Weight = Weight::from_wu(2); const FOUR: Weight = Weight::from_wu(4); diff --git a/units/tests/serde.rs b/units/tests/serde.rs index 453f218c6..4c93da1f0 100644 --- a/units/tests/serde.rs +++ b/units/tests/serde.rs @@ -7,7 +7,9 @@ use bincode::serialize; use bitcoin_units::locktime::{absolute, relative}; -use bitcoin_units::{amount, fee_rate, Amount, BlockHeight, BlockInterval, FeeRate, SignedAmount, Weight}; +use bitcoin_units::{ + amount, fee_rate, Amount, BlockHeight, BlockInterval, FeeRate, SignedAmount, Weight, +}; use serde::{Deserialize, Serialize}; /// A struct that includes all the types that implement or support `serde` traits.