From 868d857a6e26e589f95d85aeffe5d76c6911e6f7 Mon Sep 17 00:00:00 2001 From: Fmt Bot Date: Sun, 24 Aug 2025 00:50:48 +0000 Subject: [PATCH] 2025-08-24 automated rustfmt nightly --- bitcoin/examples/sign-tx-segwit-v0.rs | 4 +-- bitcoin/examples/sign-tx-taproot.rs | 4 +-- bitcoin/examples/taproot-psbt-simple.rs | 2 +- bitcoin/src/blockdata/block.rs | 3 +-- bitcoin/src/blockdata/witness.rs | 5 +++- bitcoin/src/consensus/encode.rs | 12 +++------ bitcoin/src/crypto/sighash.rs | 3 ++- bitcoin/src/psbt/error.rs | 2 +- bitcoin/tests/serde.rs | 4 +-- p2p/src/message.rs | 36 +++++++++++++------------ primitives/src/block.rs | 6 ++--- primitives/src/opcodes.rs | 4 +-- primitives/src/pow.rs | 6 ++--- primitives/src/script/borrowed.rs | 6 ++--- primitives/src/script/mod.rs | 4 +-- primitives/src/script/owned.rs | 6 ++--- primitives/src/transaction.rs | 4 +-- primitives/src/witness.rs | 7 +++-- units/src/fee_rate/mod.rs | 12 ++++++--- 19 files changed, 67 insertions(+), 63 deletions(-) diff --git a/bitcoin/examples/sign-tx-segwit-v0.rs b/bitcoin/examples/sign-tx-segwit-v0.rs index 7c2808d21b..de41c91c3b 100644 --- a/bitcoin/examples/sign-tx-segwit-v0.rs +++ b/bitcoin/examples/sign-tx-segwit-v0.rs @@ -51,8 +51,8 @@ fn main() { let mut unsigned_tx = Transaction { version: transaction::Version::TWO, // Post BIP-68. lock_time: absolute::LockTime::ZERO, // Ignore the locktime. - inputs: vec![input], // Input goes into index 0. - outputs: vec![spend, change], // Outputs, order does not matter. + inputs: vec![input], // Input goes into index 0. + outputs: vec![spend, change], // Outputs, order does not matter. }; let input_index = 0; diff --git a/bitcoin/examples/sign-tx-taproot.rs b/bitcoin/examples/sign-tx-taproot.rs index 7f1ab5055d..eaa312e3cd 100644 --- a/bitcoin/examples/sign-tx-taproot.rs +++ b/bitcoin/examples/sign-tx-taproot.rs @@ -51,8 +51,8 @@ fn main() { let mut unsigned_tx = Transaction { version: transaction::Version::TWO, // Post BIP-68. lock_time: absolute::LockTime::ZERO, // Ignore the locktime. - inputs: vec![input], // Input goes into index 0. - outputs: vec![spend, change], // Outputs, order does not matter. + inputs: vec![input], // Input goes into index 0. + outputs: vec![spend, change], // Outputs, order does not matter. }; let input_index = 0; diff --git a/bitcoin/examples/taproot-psbt-simple.rs b/bitcoin/examples/taproot-psbt-simple.rs index f9e5814d57..8ba75a05db 100644 --- a/bitcoin/examples/taproot-psbt-simple.rs +++ b/bitcoin/examples/taproot-psbt-simple.rs @@ -197,7 +197,7 @@ fn main() { version: transaction::Version::TWO, // Post BIP 68. lock_time: absolute::LockTime::ZERO, // Ignore the locktime. inputs, // Input is 0-indexed. - outputs: vec![spend, change], // Outputs, order does not matter. + outputs: vec![spend, change], // Outputs, order does not matter. }; // Now we'll start the PSBT workflow. diff --git a/bitcoin/src/blockdata/block.rs b/bitcoin/src/blockdata/block.rs index 3e3a38b980..eb38d43b91 100644 --- a/bitcoin/src/blockdata/block.rs +++ b/bitcoin/src/blockdata/block.rs @@ -18,14 +18,13 @@ use super::transaction::Coinbase; use super::Weight; use crate::consensus::encode::WriteExt as _; use crate::consensus::{encode, Decodable, Encodable}; -use crate::internal_macros; use crate::merkle_tree::{MerkleNode as _, TxMerkleNode, WitnessMerkleNode}; use crate::network::Params; use crate::pow::{Target, Work}; use crate::prelude::Vec; use crate::script::{self, ScriptExt as _}; use crate::transaction::{Transaction, TransactionExt as _, Wtxid}; -use crate::BlockTime; +use crate::{internal_macros, BlockTime}; #[rustfmt::skip] // Keep public re-exports separate. #[doc(inline)] diff --git a/bitcoin/src/blockdata/witness.rs b/bitcoin/src/blockdata/witness.rs index dcc7718fc0..1d20f8bbc2 100644 --- a/bitcoin/src/blockdata/witness.rs +++ b/bitcoin/src/blockdata/witness.rs @@ -492,7 +492,10 @@ mod test { assert_eq!(expected_wit[i], wit_el.to_lower_hex_string()); } assert_eq!(expected_wit[1], tx.inputs[0].witness.last().unwrap().to_lower_hex_string()); - assert_eq!(expected_wit[0], tx.inputs[0].witness.get_back(1).unwrap().to_lower_hex_string()); + assert_eq!( + expected_wit[0], + tx.inputs[0].witness.get_back(1).unwrap().to_lower_hex_string() + ); assert_eq!(expected_wit[0], tx.inputs[0].witness.get(0).unwrap().to_lower_hex_string()); assert_eq!(expected_wit[1], tx.inputs[0].witness.get(1).unwrap().to_lower_hex_string()); assert_eq!(None, tx.inputs[0].witness.get(2)); diff --git a/bitcoin/src/consensus/encode.rs b/bitcoin/src/consensus/encode.rs index ab14b298bd..23c2bc2662 100644 --- a/bitcoin/src/consensus/encode.rs +++ b/bitcoin/src/consensus/encode.rs @@ -468,18 +468,13 @@ impl Encodable for [u16; 8] { impl Encodable for Vec { #[inline] - fn consensus_encode( - &self, - w: &mut W, - ) -> Result { + fn consensus_encode(&self, w: &mut W) -> Result { if TypeId::of::() == TypeId::of::() { let len = self.len(); let ptr = self.as_ptr(); // unsafe: We've just checked that T is `u8`. - let v = unsafe { - slice::from_raw_parts(ptr.cast::(), len) - }; + let v = unsafe { slice::from_raw_parts(ptr.cast::(), len) }; consensus_encode_with_size(v, w) } else { let mut len = 0; @@ -944,8 +939,7 @@ mod tests { // Check serialization that `if len > MAX_VEC_SIZE {return err}` isn't inclusive, // by making sure it fails with `MissingData` and not an `OversizedVectorAllocation` Error. - let err = - deserialize::(&serialize(&(super::MAX_VEC_SIZE as u32))).unwrap_err(); + let err = deserialize::(&serialize(&(super::MAX_VEC_SIZE as u32))).unwrap_err(); assert_eq!(err, DeserializeError::Parse(ParseError::MissingData)); test_len_is_max_vec::(); diff --git a/bitcoin/src/crypto/sighash.rs b/bitcoin/src/crypto/sighash.rs index 8ffeb7304e..92d1a72e4d 100644 --- a/bitcoin/src/crypto/sighash.rs +++ b/bitcoin/src/crypto/sighash.rs @@ -853,7 +853,8 @@ impl> SighashCache { if sighash != EcdsaSighashType::Single && sighash != EcdsaSighashType::None { self.segwit_cache().outputs.consensus_encode(writer)?; - } else if sighash == EcdsaSighashType::Single && input_index < self.tx.borrow().outputs.len() + } else if sighash == EcdsaSighashType::Single + && input_index < self.tx.borrow().outputs.len() { let mut single_enc = LegacySighash::engine(); self.tx.borrow().outputs[input_index].consensus_encode(&mut single_enc)?; diff --git a/bitcoin/src/psbt/error.rs b/bitcoin/src/psbt/error.rs index c2745e59fd..2993e6dce2 100644 --- a/bitcoin/src/psbt/error.rs +++ b/bitcoin/src/psbt/error.rs @@ -9,7 +9,7 @@ use crate::bip32::Xpub; use crate::consensus::encode; use crate::prelude::Box; use crate::psbt::raw; -use crate::{key, ecdsa, taproot, Txid, Transaction, OutPoint}; +use crate::{ecdsa, key, taproot, OutPoint, Transaction, Txid}; /// Enum for marking psbt hash error. #[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)] diff --git a/bitcoin/tests/serde.rs b/bitcoin/tests/serde.rs index d0f7871c88..34467f8665 100644 --- a/bitcoin/tests/serde.rs +++ b/bitcoin/tests/serde.rs @@ -32,8 +32,8 @@ use bitcoin::sighash::{EcdsaSighashType, TapSighashType}; use bitcoin::taproot::{self, ControlBlock, LeafVersion, TapTree, TaprootBuilder}; use bitcoin::witness::Witness; use bitcoin::{ - ecdsa, transaction, Address, Amount, NetworkKind, OutPoint, PrivateKey, PublicKey, - ScriptBuf, Sequence, Target, Transaction, TxIn, TxOut, Txid, Work, + ecdsa, transaction, Address, Amount, NetworkKind, OutPoint, PrivateKey, PublicKey, ScriptBuf, + Sequence, Target, Transaction, TxIn, TxOut, Txid, Work, }; #[test] diff --git a/p2p/src/message.rs b/p2p/src/message.rs index b28cf9033c..451bf26920 100644 --- a/p2p/src/message.rs +++ b/p2p/src/message.rs @@ -8,13 +8,14 @@ use alloc::borrow::{Cow, ToOwned}; use alloc::boxed::Box; use alloc::string::String; -use alloc::vec::Vec; use alloc::vec; +use alloc::vec::Vec; use core::{cmp, fmt}; +use bitcoin::block::HeaderExt; use bitcoin::consensus::encode::{self, Decodable, Encodable, ReadExt, WriteExt}; use bitcoin::merkle_tree::MerkleBlock; -use bitcoin::{block, block::HeaderExt, transaction}; +use bitcoin::{block, transaction}; use hashes::sha256d; use internals::ToU64 as _; use io::{self, BufRead, Read, Write}; @@ -421,8 +422,7 @@ impl Encodable for NetworkMessage { NetworkMessage::GetHeaders(ref dat) => dat.consensus_encode(writer), NetworkMessage::Tx(ref dat) => dat.consensus_encode(writer), NetworkMessage::Block(ref dat) => dat.consensus_encode(writer), - NetworkMessage::Headers(ref dat) => - dat.consensus_encode(writer), + NetworkMessage::Headers(ref dat) => dat.consensus_encode(writer), NetworkMessage::Ping(ref dat) => dat.consensus_encode(writer), NetworkMessage::Pong(ref dat) => dat.consensus_encode(writer), NetworkMessage::MerkleBlock(ref dat) => dat.consensus_encode(writer), @@ -538,13 +538,11 @@ impl HeadersMessage { /// Each header passes its own proof-of-work target. pub fn all_targets_satisfied(&self) -> bool { - !self.0 - .iter() - .any(|header| { - let target = header.target(); - let valid_pow = header.validate_pow(target); - valid_pow.is_err() - }) + !self.0.iter().any(|header| { + let target = header.target(); + let valid_pow = header.validate_pow(target); + valid_pow.is_err() + }) } } @@ -732,9 +730,8 @@ impl Decodable for V2NetworkMessage { 10u8 => NetworkMessage::GetBlockTxn(Decodable::consensus_decode_from_finite_reader(r)?), 11u8 => NetworkMessage::GetData(Decodable::consensus_decode_from_finite_reader(r)?), 12u8 => NetworkMessage::GetHeaders(Decodable::consensus_decode_from_finite_reader(r)?), - 13u8 => NetworkMessage::Headers( - HeadersMessage::consensus_decode_from_finite_reader(r)?, - ), + 13u8 => + NetworkMessage::Headers(HeadersMessage::consensus_decode_from_finite_reader(r)?), 14u8 => NetworkMessage::Inv(Decodable::consensus_decode_from_finite_reader(r)?), 15u8 => NetworkMessage::MemPool, 16u8 => NetworkMessage::MerkleBlock(Decodable::consensus_decode_from_finite_reader(r)?), @@ -803,7 +800,9 @@ impl Encodable for CheckedData { impl Decodable for CheckedData { #[inline] - fn consensus_decode_from_finite_reader(r: &mut R) -> Result { + fn consensus_decode_from_finite_reader( + r: &mut R, + ) -> Result { let len = u32::consensus_decode_from_finite_reader(r)? as usize; let checksum = <[u8; 4]>::consensus_decode_from_finite_reader(r)?; @@ -811,8 +810,11 @@ impl Decodable for CheckedData { let data = read_bytes_from_finite_reader(r, opts)?; let expected_checksum = sha2_checksum(&data); if expected_checksum != checksum { - Err(encode::ParseError::InvalidChecksum { expected: expected_checksum, actual: checksum } - .into()) + Err(encode::ParseError::InvalidChecksum { + expected: expected_checksum, + actual: checksum, + } + .into()) } else { Ok(CheckedData { data, checksum }) } diff --git a/primitives/src/block.rs b/primitives/src/block.rs index ded539ae1b..00ac2a887e 100644 --- a/primitives/src/block.rs +++ b/primitives/src/block.rs @@ -395,11 +395,11 @@ impl<'a> Arbitrary<'a> for Version { #[cfg(test)] mod tests { - use super::*; - - #[cfg(feature = "alloc")] + #[cfg(feature = "alloc")] use alloc::{format, vec}; + use super::*; + fn dummy_header() -> Header { Header { version: Version::ONE, diff --git a/primitives/src/opcodes.rs b/primitives/src/opcodes.rs index 376478ff74..6def038da9 100644 --- a/primitives/src/opcodes.rs +++ b/primitives/src/opcodes.rs @@ -545,11 +545,11 @@ impl Ordinary { #[cfg(test)] mod tests { - use super::*; - #[cfg(feature = "alloc")] use alloc::{collections::BTreeSet, format}; + use super::*; + #[cfg(feature = "alloc")] macro_rules! roundtrip { ($unique:expr, $op:ident) => { diff --git a/primitives/src/pow.rs b/primitives/src/pow.rs index 00ec86294f..3cffa64c36 100644 --- a/primitives/src/pow.rs +++ b/primitives/src/pow.rs @@ -50,10 +50,10 @@ impl fmt::UpperHex for CompactTarget { #[cfg(test)] mod tests { - use super::*; - #[cfg(feature = "alloc")] - use alloc::{format}; + use alloc::format; + + use super::*; #[test] fn compact_target_ordering() { diff --git a/primitives/src/script/borrowed.rs b/primitives/src/script/borrowed.rs index 349cfddcca..cf662aa280 100644 --- a/primitives/src/script/borrowed.rs +++ b/primitives/src/script/borrowed.rs @@ -188,10 +188,10 @@ delegate_index!( #[cfg(test)] mod tests { - use super::*; - #[cfg(feature = "alloc")] - use alloc::{vec}; + use alloc::vec; + + use super::*; #[test] fn script_from_bytes() { diff --git a/primitives/src/script/mod.rs b/primitives/src/script/mod.rs index 2f2b3afdb7..233cede04e 100644 --- a/primitives/src/script/mod.rs +++ b/primitives/src/script/mod.rs @@ -611,11 +611,11 @@ impl<'de> serde::Deserialize<'de> for ScriptBuf { #[cfg(test)] mod tests { - use super::*; - #[cfg(feature = "alloc")] use alloc::{format, vec}; + use super::*; + #[test] fn scriptbuf_from_vec_u8() { let vec = vec![0x51, 0x52, 0x53]; diff --git a/primitives/src/script/owned.rs b/primitives/src/script/owned.rs index 916276f918..9fb73fae4d 100644 --- a/primitives/src/script/owned.rs +++ b/primitives/src/script/owned.rs @@ -148,10 +148,10 @@ impl<'a> Arbitrary<'a> for ScriptBuf { #[cfg(test)] mod tests { - use super::*; - #[cfg(feature = "alloc")] - use alloc::{vec}; + use alloc::vec; + + use super::*; #[test] fn script_buf_from_bytes() { diff --git a/primitives/src/transaction.rs b/primitives/src/transaction.rs index 3ca18d153e..80db09ca25 100644 --- a/primitives/src/transaction.rs +++ b/primitives/src/transaction.rs @@ -642,11 +642,11 @@ impl<'a> Arbitrary<'a> for Wtxid { #[cfg(feature = "alloc")] #[cfg(test)] mod tests { - use super::*; - #[cfg(feature = "alloc")] use alloc::{format, vec}; + use super::*; + #[test] fn sanity_check() { let version = Version(123); diff --git a/primitives/src/witness.rs b/primitives/src/witness.rs index 7d506f347e..47b73dbcb2 100644 --- a/primitives/src/witness.rs +++ b/primitives/src/witness.rs @@ -575,14 +575,13 @@ impl<'a> Arbitrary<'a> for Witness { #[cfg(test)] mod test { - use super::*; - #[cfg(feature = "alloc")] - use alloc::{vec}; - + use alloc::vec; #[cfg(feature = "std")] use std::println; + use super::*; + // Appends all the indices onto the end of a list of elements. fn append_u32_vec(elements: &[u8], indices: &[u32]) -> Vec { let mut v = elements.to_vec(); diff --git a/units/src/fee_rate/mod.rs b/units/src/fee_rate/mod.rs index 4472e3a0c3..bcf690b70a 100644 --- a/units/src/fee_rate/mod.rs +++ b/units/src/fee_rate/mod.rs @@ -106,19 +106,25 @@ impl FeeRate { pub const fn to_sat_per_kwu_floor(self) -> u64 { self.to_sat_per_mvb() / 4_000 } /// Converts to sat/kwu rounding up. - pub const fn to_sat_per_kwu_ceil(self) -> u64 { self.to_sat_per_mvb().saturating_add(3_999) / 4_000 } + pub const fn to_sat_per_kwu_ceil(self) -> u64 { + self.to_sat_per_mvb().saturating_add(3_999) / 4_000 + } /// Converts to sat/vB rounding down. pub const fn to_sat_per_vb_floor(self) -> u64 { self.to_sat_per_mvb() / 1_000_000 } /// Converts to sat/vB rounding up. - pub const fn to_sat_per_vb_ceil(self) -> u64 { self.to_sat_per_mvb().saturating_add(999_999) / 1_000_000 } + pub const fn to_sat_per_vb_ceil(self) -> u64 { + self.to_sat_per_mvb().saturating_add(999_999) / 1_000_000 + } /// Converts to sat/kvb rounding down. pub const fn to_sat_per_kvb_floor(self) -> u64 { self.to_sat_per_mvb() / 1_000 } /// Converts to sat/kvb rounding up. - pub const fn to_sat_per_kvb_ceil(self) -> u64 { self.to_sat_per_mvb().saturating_add(999) / 1_000 } + pub const fn to_sat_per_kvb_ceil(self) -> u64 { + self.to_sat_per_mvb().saturating_add(999) / 1_000 + } /// Checked multiplication. ///