From 2009763ae593da9f96d3d0d373bf495a336b7995 Mon Sep 17 00:00:00 2001 From: Fmt Bot Date: Sun, 22 Sep 2024 01:20:08 +0000 Subject: [PATCH] 2024-09-22 automated rustfmt nightly --- bitcoin/src/blockdata/transaction.rs | 11 ++++------- bitcoin/src/blockdata/witness.rs | 6 +++--- primitives/src/sequence.rs | 4 ++-- primitives/src/transaction.rs | 2 +- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/bitcoin/src/blockdata/transaction.rs b/bitcoin/src/blockdata/transaction.rs index ee260fa4a..0b51b984b 100644 --- a/bitcoin/src/blockdata/transaction.rs +++ b/bitcoin/src/blockdata/transaction.rs @@ -1412,21 +1412,18 @@ impl InputWeightPrediction { #[cfg(feature = "arbitrary")] impl<'a> Arbitrary<'a> for OutPoint { fn arbitrary(u: &mut Unstructured<'a>) -> arbitrary::Result { - Ok(OutPoint{ - txid: Txid::arbitrary(u)?, - vout: u32::arbitrary(u)? - }) + Ok(OutPoint { txid: Txid::arbitrary(u)?, vout: u32::arbitrary(u)? }) } } #[cfg(feature = "arbitrary")] impl<'a> Arbitrary<'a> for TxIn { fn arbitrary(u: &mut Unstructured<'a>) -> arbitrary::Result { - Ok(TxIn{ + Ok(TxIn { previous_output: OutPoint::arbitrary(u)?, script_sig: ScriptBuf::arbitrary(u)?, sequence: Sequence::arbitrary(u)?, - witness: Witness::arbitrary(u)? + witness: Witness::arbitrary(u)?, }) } } @@ -1440,7 +1437,7 @@ impl<'a> Arbitrary<'a> for Transaction { version: Version::arbitrary(u)?, lock_time: LockTime::arbitrary(u)?, input: Vec::::arbitrary(u)?, - output: Vec::::arbitrary(u)? + output: Vec::::arbitrary(u)?, }) } } diff --git a/bitcoin/src/blockdata/witness.rs b/bitcoin/src/blockdata/witness.rs index 705559316..432079e68 100644 --- a/bitcoin/src/blockdata/witness.rs +++ b/bitcoin/src/blockdata/witness.rs @@ -7,6 +7,8 @@ use core::fmt; use core::ops::Index; +#[cfg(feature = "arbitrary")] +use arbitrary::{Arbitrary, Unstructured}; use internals::compact_size; use io::{BufRead, Write}; @@ -18,8 +20,6 @@ use crate::prelude::Vec; use crate::script::ScriptExt as _; use crate::taproot::{self, TAPROOT_ANNEX_PREFIX}; use crate::{Script, VarInt}; -#[cfg(feature = "arbitrary")] -use arbitrary::{Arbitrary, Unstructured}; /// The Witness is the data used to unlock bitcoin since the [segwit upgrade]. /// @@ -623,7 +623,7 @@ impl Default for Witness { #[cfg(feature = "arbitrary")] impl<'a> Arbitrary<'a> for Witness { fn arbitrary(u: &mut Unstructured<'a>) -> arbitrary::Result { - let arbitrary_bytes = Vec::>::arbitrary(u)?; + let arbitrary_bytes = Vec::>::arbitrary(u)?; Ok(Witness::from_slice(&arbitrary_bytes)) } } diff --git a/primitives/src/sequence.rs b/primitives/src/sequence.rs index 3246753d7..d22b77b11 100644 --- a/primitives/src/sequence.rs +++ b/primitives/src/sequence.rs @@ -17,6 +17,8 @@ use core::fmt; +#[cfg(feature = "arbitrary")] +use arbitrary::{Arbitrary, Unstructured}; use internals::impl_to_hex_from_lower_hex; #[cfg(feature = "serde")] use serde::{Deserialize, Serialize}; @@ -24,8 +26,6 @@ use serde::{Deserialize, Serialize}; use units::locktime::relative::TimeOverflowError; #[cfg(feature = "alloc")] use units::parse::{self, PrefixedHexError, UnprefixedHexError}; -#[cfg(feature = "arbitrary")] -use arbitrary::{Arbitrary, Unstructured}; #[cfg(feature = "alloc")] use crate::locktime::relative; diff --git a/primitives/src/transaction.rs b/primitives/src/transaction.rs index a47f680bd..cd8acd0ed 100644 --- a/primitives/src/transaction.rs +++ b/primitives/src/transaction.rs @@ -12,9 +12,9 @@ use core::fmt; -use hashes::sha256d; #[cfg(feature = "arbitrary")] use arbitrary::{Arbitrary, Unstructured}; +use hashes::sha256d; hashes::hash_newtype! { /// A bitcoin transaction hash/transaction ID.