From 0fbfe68c72496c3135108914cdb2c2b45e496e99 Mon Sep 17 00:00:00 2001 From: Fmt Bot Date: Sun, 16 Feb 2025 01:21:38 +0000 Subject: [PATCH] 2025-02-16 automated rustfmt nightly --- bitcoin/src/crypto/key.rs | 19 +++++++++++-------- primitives/src/transaction.rs | 5 +---- primitives/src/witness.rs | 3 ++- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/bitcoin/src/crypto/key.rs b/bitcoin/src/crypto/key.rs index 9ba23615a..1b3c3a484 100644 --- a/bitcoin/src/crypto/key.rs +++ b/bitcoin/src/crypto/key.rs @@ -499,10 +499,10 @@ impl PrivateKey { 33 => false, 34 => { if data[33] != 1 { - return Err(InvalidWifCompressionFlagError{ invalid: data[33] }.into()); + return Err(InvalidWifCompressionFlagError { invalid: data[33] }.into()); } true - }, + } length => { return Err(InvalidBase58PayloadLengthError { length }.into()); } @@ -987,8 +987,7 @@ impl fmt::Display for FromWifError { InvalidAddressVersion(ref e) => write_err!(f, "decoded base58 data contained an invalid address version btye"; e), Secp256k1(ref e) => write_err!(f, "private key validation failed"; e), - InvalidWifCompressionFlag(ref e) => - write_err!(f, "invalid WIF compression flag";e), + InvalidWifCompressionFlag(ref e) => write_err!(f, "invalid WIF compression flag";e), } } } @@ -1179,7 +1178,7 @@ impl std::error::Error for InvalidAddressVersionError {} /// Invalid compression flag for a WIF key #[derive(Debug, Clone, PartialEq, Eq)] -pub struct InvalidWifCompressionFlagError{ +pub struct InvalidWifCompressionFlagError { /// The invalid compression flag. pub(crate) invalid: u8, } @@ -1206,9 +1205,13 @@ mod tests { #[test] fn key_derivation() { // mainnet compressed WIF with invalid compression flag. - let sk = - PrivateKey::from_wif("L2x4uC2YgfFWZm9tF4pjDnVR6nJkheizFhEr2KvDNnTEmEqVzPJY"); - assert!(matches!(sk, Err(FromWifError::InvalidWifCompressionFlag(InvalidWifCompressionFlagError { invalid: 49 })))); + let sk = PrivateKey::from_wif("L2x4uC2YgfFWZm9tF4pjDnVR6nJkheizFhEr2KvDNnTEmEqVzPJY"); + assert!(matches!( + sk, + Err(FromWifError::InvalidWifCompressionFlag(InvalidWifCompressionFlagError { + invalid: 49 + })) + )); // testnet compressed let sk = diff --git a/primitives/src/transaction.rs b/primitives/src/transaction.rs index ca7e63524..fa7b0e430 100644 --- a/primitives/src/transaction.rs +++ b/primitives/src/transaction.rs @@ -616,10 +616,7 @@ mod tests { witness: Witness::new(), }; - let txout = TxOut { - value: Amount::from_sat(123456789), - script_pubkey: ScriptBuf::new(), - }; + let txout = TxOut { value: Amount::from_sat(123456789), script_pubkey: ScriptBuf::new() }; let tx_orig = Transaction { version: Version::ONE, diff --git a/primitives/src/witness.rs b/primitives/src/witness.rs index d48755992..62b6f2bc7 100644 --- a/primitives/src/witness.rs +++ b/primitives/src/witness.rs @@ -603,7 +603,8 @@ mod test { let witness_elements = 2; let content = append_u32_vec(&elements, &[0, 2]); let indices_start = elements.len(); - let witness = Witness::from_parts__unstable(content.clone(), witness_elements, indices_start); + let witness = + Witness::from_parts__unstable(content.clone(), witness_elements, indices_start); assert_eq!(witness.nth(0).unwrap(), [11_u8]); assert_eq!(witness.nth(1).unwrap(), [21_u8, 22]); assert_eq!(witness.size(), 6);