diff --git a/bitcoin/src/blockdata/block.rs b/bitcoin/src/blockdata/block.rs index 57a456b07..7154254d0 100644 --- a/bitcoin/src/blockdata/block.rs +++ b/bitcoin/src/blockdata/block.rs @@ -30,9 +30,7 @@ use crate::transaction::{Transaction, TransactionExt as _, Wtxid}; #[doc(inline)] pub use primitives::block::{Block, Checked, Unchecked, Validation, Version, BlockHash, Header, WitnessCommitment}; #[doc(inline)] -pub use units::block::{ - BlockHeight, BlockHeightInterval, TooBigForRelativeHeightError, -}; +pub use units::block::{BlockHeight, BlockHeightInterval, TooBigForRelativeHeightError}; #[deprecated(since = "TBD", note = "use `BlockHeightInterval` instead")] #[doc(hidden)] diff --git a/bitcoin/src/blockdata/mod.rs b/bitcoin/src/blockdata/mod.rs index e9feea27e..9d904a1e1 100644 --- a/bitcoin/src/blockdata/mod.rs +++ b/bitcoin/src/blockdata/mod.rs @@ -71,8 +71,8 @@ pub mod locktime { /// Re-export everything from the `primitives::locktime::relative` module. pub use primitives::locktime::relative::{ - DisabledLockTimeError, NumberOfBlocks, IncompatibleHeightError, IncompatibleTimeError, - LockTime, NumberOf512Seconds, TimeOverflowError, + DisabledLockTimeError, IncompatibleHeightError, IncompatibleTimeError, LockTime, + NumberOf512Seconds, NumberOfBlocks, TimeOverflowError, }; #[deprecated(since = "TBD", note = "use `NumberOfBlocks` instead")] diff --git a/primitives/src/locktime/relative.rs b/primitives/src/locktime/relative.rs index d2c32970c..2c9668d1c 100644 --- a/primitives/src/locktime/relative.rs +++ b/primitives/src/locktime/relative.rs @@ -378,7 +378,10 @@ impl LockTime { /// assert!(lock.is_satisfied_by_time(relative::Time::from_512_second_intervals(intervals + 10)).expect("a time")); /// ``` #[inline] - pub fn is_satisfied_by_time(self, time: NumberOf512Seconds) -> Result { + pub fn is_satisfied_by_time( + self, + time: NumberOf512Seconds, + ) -> Result { use LockTime as L; match self { @@ -589,15 +592,12 @@ mod tests { let time = NumberOf512Seconds::from_512_second_intervals(70); let lock_by_time = LockTime::from(time); - assert!( - !lock_by_time.is_implied_by(LockTime::from(NumberOf512Seconds::from_512_second_intervals(69))) - ); - assert!( - lock_by_time.is_implied_by(LockTime::from(NumberOf512Seconds::from_512_second_intervals(70))) - ); - assert!( - lock_by_time.is_implied_by(LockTime::from(NumberOf512Seconds::from_512_second_intervals(71))) - ); + assert!(!lock_by_time + .is_implied_by(LockTime::from(NumberOf512Seconds::from_512_second_intervals(69)))); + assert!(lock_by_time + .is_implied_by(LockTime::from(NumberOf512Seconds::from_512_second_intervals(70)))); + assert!(lock_by_time + .is_implied_by(LockTime::from(NumberOf512Seconds::from_512_second_intervals(71)))); } #[test] diff --git a/primitives/src/sequence.rs b/primitives/src/sequence.rs index 1eaee1450..7d68c7cdf 100644 --- a/primitives/src/sequence.rs +++ b/primitives/src/sequence.rs @@ -187,7 +187,7 @@ impl Sequence { /// Constructs a new [`relative::LockTime`] from this [`Sequence`] number. #[inline] pub fn to_relative_lock_time(self) -> Option { - use crate::locktime::relative::{NumberOfBlocks, LockTime, NumberOf512Seconds}; + use crate::locktime::relative::{LockTime, NumberOf512Seconds, NumberOfBlocks}; if !self.is_relative_lock_time() { return None; diff --git a/units/src/block.rs b/units/src/block.rs index fb67a210f..778fb1bea 100644 --- a/units/src/block.rs +++ b/units/src/block.rs @@ -217,7 +217,9 @@ impl TryFrom for absolute::MedianTimePast { /// /// An absolute locktime MTP has a minimum value of [`absolute::LOCK_TIME_THRESHOLD`], /// while [`BlockMtp`] may take the full range of `u32`. - fn try_from(h: BlockMtp) -> Result { absolute::MedianTimePast::from_u32(h.to_u32()) } + fn try_from(h: BlockMtp) -> Result { + absolute::MedianTimePast::from_u32(h.to_u32()) + } } impl_u32_wrapper! { diff --git a/units/src/locktime/absolute.rs b/units/src/locktime/absolute.rs index e44d8f364..f80ccdfee 100644 --- a/units/src/locktime/absolute.rs +++ b/units/src/locktime/absolute.rs @@ -405,7 +405,12 @@ impl ParseError { ) } E::ParseInt(ParseIntError { input, bits: _, is_signed: _, source: _ }) => { - write!(f, "{} ({})", input.display_cannot_parse("absolute Height/MedianTimePast"), subject) + write!( + f, + "{} ({})", + input.display_cannot_parse("absolute Height/MedianTimePast"), + subject + ) } E::Conversion(value) if *value < i64::from(lower_bound) => { write!(f, "{} {} is below limit {}", subject, value, lower_bound) diff --git a/units/src/locktime/relative.rs b/units/src/locktime/relative.rs index 7a1394b5b..7d4d2e4e4 100644 --- a/units/src/locktime/relative.rs +++ b/units/src/locktime/relative.rs @@ -286,7 +286,10 @@ mod tests { fn sanity_check() { assert_eq!(NumberOfBlocks::MAX.to_consensus_u32(), u32::from(u16::MAX)); assert_eq!(NumberOf512Seconds::from_512_second_intervals(100).value(), 100u16); - assert_eq!(NumberOf512Seconds::from_512_second_intervals(100).to_consensus_u32(), 4_194_404u32); // 0x400064 + assert_eq!( + NumberOf512Seconds::from_512_second_intervals(100).to_consensus_u32(), + 4_194_404u32 + ); // 0x400064 } #[test] @@ -325,7 +328,8 @@ mod tests { #[test] fn from_seconds_floor_with_maximum_encodable_seconds_success() { - let actual = NumberOf512Seconds::from_seconds_floor(MAXIMUM_ENCODABLE_SECONDS + 511).unwrap(); + let actual = + NumberOf512Seconds::from_seconds_floor(MAXIMUM_ENCODABLE_SECONDS + 511).unwrap(); let expected = NumberOf512Seconds(u16::MAX); assert_eq!(actual, expected); } diff --git a/units/tests/api.rs b/units/tests/api.rs index aa0a8ceaa..33b60bc7b 100644 --- a/units/tests/api.rs +++ b/units/tests/api.rs @@ -171,9 +171,7 @@ fn api_can_use_all_types_from_module_amount() { #[test] fn api_can_use_all_types_from_module_block() { - use bitcoin_units::block::{ - BlockHeight, BlockHeightInterval, TooBigForRelativeHeightError, - }; + use bitcoin_units::block::{BlockHeight, BlockHeightInterval, TooBigForRelativeHeightError}; } #[test]