From a3d2b2a93ac8daecb9dc6670c2dcccd24d428b28 Mon Sep 17 00:00:00 2001 From: Fmt Bot Date: Sun, 26 Jan 2025 01:16:37 +0000 Subject: [PATCH] 2025-01-26 automated rustfmt nightly --- bitcoin/src/blockdata/constants.rs | 5 +---- primitives/src/locktime/absolute.rs | 1 - units/src/amount/tests.rs | 30 ++++++----------------------- units/src/fee.rs | 4 +--- 4 files changed, 8 insertions(+), 32 deletions(-) diff --git a/bitcoin/src/blockdata/constants.rs b/bitcoin/src/blockdata/constants.rs index e1f15030ce..ad8e96fdf2 100644 --- a/bitcoin/src/blockdata/constants.rs +++ b/bitcoin/src/blockdata/constants.rs @@ -112,10 +112,7 @@ fn bitcoin_genesis_tx(params: &Params) -> Transaction { witness: Witness::default(), }); - ret.output.push(TxOut { - value: Amount::FIFTY_BTC, - script_pubkey: out_script, - }); + ret.output.push(TxOut { value: Amount::FIFTY_BTC, script_pubkey: out_script }); // end ret diff --git a/primitives/src/locktime/absolute.rs b/primitives/src/locktime/absolute.rs index 679d3218b4..8a3fc0a1e0 100644 --- a/primitives/src/locktime/absolute.rs +++ b/primitives/src/locktime/absolute.rs @@ -490,7 +490,6 @@ mod tests { assert!(lock_time.is_satisfied_by(height, day_after)); assert!(!lock_time.is_satisfied_by(height, day_before)); - } #[test] diff --git a/units/src/amount/tests.rs b/units/src/amount/tests.rs index 1404ae1083..031526ad4d 100644 --- a/units/src/amount/tests.rs +++ b/units/src/amount/tests.rs @@ -22,10 +22,7 @@ fn sanity_check() { let ssat = SignedAmount::from_sat; assert_eq!(ssat(-100).abs(), ssat(100)); - assert_eq!( - ssat(i64::MIN + 1).checked_abs().unwrap(), - ssat(i64::MAX) - ); + assert_eq!(ssat(i64::MIN + 1).checked_abs().unwrap(), ssat(i64::MAX)); assert_eq!(ssat(-100).signum(), -1); assert_eq!(ssat(0).signum(), 0); assert_eq!(ssat(100).signum(), 1); @@ -36,14 +33,8 @@ fn sanity_check() { #[cfg(feature = "alloc")] { - assert_eq!( - Amount::from_float_in(0_f64, Denomination::Bitcoin).unwrap(), - sat(0) - ); - assert_eq!( - Amount::from_float_in(2_f64, Denomination::Bitcoin).unwrap(), - sat(200_000_000) - ); + assert_eq!(Amount::from_float_in(0_f64, Denomination::Bitcoin).unwrap(), sat(0)); + assert_eq!(Amount::from_float_in(2_f64, Denomination::Bitcoin).unwrap(), sat(200_000_000)); assert!(Amount::from_float_in(-100_f64, Denomination::Bitcoin).is_err()); } } @@ -185,14 +176,8 @@ fn unchecked_arithmetic() { let sat = Amount::from_sat; let ssat = SignedAmount::from_sat; - assert_eq!( - ssat(10).unchecked_add(ssat(20)), - ssat(30) - ); - assert_eq!( - ssat(50).unchecked_sub(ssat(10)), - ssat(40) - ); + assert_eq!(ssat(10).unchecked_add(ssat(20)), ssat(30)); + assert_eq!(ssat(50).unchecked_sub(ssat(10)), ssat(40)); assert_eq!(sat(5).unchecked_add(sat(7)), sat(12)); assert_eq!(sat(10).unchecked_sub(sat(7)), sat(3)); } @@ -201,10 +186,7 @@ fn unchecked_arithmetic() { fn positive_sub() { let ssat = SignedAmount::from_sat; - assert_eq!( - ssat(10).positive_sub(ssat(7)).unwrap(), - ssat(3) - ); + assert_eq!(ssat(10).positive_sub(ssat(7)).unwrap(), ssat(3)); assert!(ssat(-10).positive_sub(ssat(7)).is_none()); assert!(ssat(10).positive_sub(ssat(-7)).is_none()); assert!(ssat(10).positive_sub(ssat(11)).is_none()); diff --git a/units/src/fee.rs b/units/src/fee.rs index a1475f9bd3..1f0a535b48 100644 --- a/units/src/fee.rs +++ b/units/src/fee.rs @@ -188,9 +188,7 @@ impl ops::Div for Amount { /// This operation will panic if `fee_rate` is zero or the division results in overflow. /// /// Note: This uses floor division. For ceiling division use [`Amount::checked_div_by_fee_rate_ceil`]. - fn div(self, rhs: FeeRate) -> Self::Output { - self.checked_div_by_fee_rate_floor(rhs).unwrap() - } + fn div(self, rhs: FeeRate) -> Self::Output { self.checked_div_by_fee_rate_floor(rhs).unwrap() } } #[cfg(test)]