Run contrib/run-rustfmt.sh

No other changes other than those introduced by the script.

diff --git a/fuzz/src/chanmon_consistency.rs b/fuzz/src/chanmon_consistency.rs
index 48bd5590b9474c024bf4a52b77d5d5e832781620..90e77f34517a5ff412169d48f619d17e82eda58e 100644 (file)
--- a/fuzz/src/chanmon_consistency.rs
+++ b/fuzz/src/chanmon_consistency.rs
@@ -21,11 +21,11 @@
 use bitcoin::amount::Amount;
 use bitcoin::constants::genesis_block;
 use bitcoin::locktime::absolute::LockTime;
+use bitcoin::network::Network;
 use bitcoin::opcodes;
 use bitcoin::script::{Builder, ScriptBuf};
-use bitcoin::transaction::{Transaction, TxOut};
-use bitcoin::network::Network;
 use bitcoin::transaction::Version;
+use bitcoin::transaction::{Transaction, TxOut};
 
 use bitcoin::hash_types::BlockHash;
 use bitcoin::hashes::sha256::Hash as Sha256;

diff --git a/fuzz/src/full_stack.rs b/fuzz/src/full_stack.rs
index 7733e21c804c514088af68e1acd2c1736e9b63f8..0a4bb98099f49984e0ac339a93166d9275387ef1 100644 (file)
--- a/fuzz/src/full_stack.rs
+++ b/fuzz/src/full_stack.rs
@@ -14,14 +14,14 @@
 //! This test has been very useful, though due to its complexity good starting inputs are critical.
 
 use bitcoin::amount::Amount;
+use bitcoin::consensus::encode::deserialize;
 use bitcoin::constants::genesis_block;
 use bitcoin::locktime::absolute::LockTime;
+use bitcoin::network::Network;
 use bitcoin::opcodes;
 use bitcoin::script::{Builder, ScriptBuf};
-use bitcoin::transaction::{Transaction, TxOut};
-use bitcoin::consensus::encode::deserialize;
-use bitcoin::network::Network;
 use bitcoin::transaction::Version;
+use bitcoin::transaction::{Transaction, TxOut};
 
 use bitcoin::hash_types::{BlockHash, Txid};
 use bitcoin::hashes::hex::FromHex;

diff --git a/lightning-background-processor/src/lib.rs b/lightning-background-processor/src/lib.rs
index d49b8b89f370183a23c817ab3f15ef6c8021144b..4d293d4e86f510a79074b9cb36f9908f9a88bc24 100644 (file)
--- a/lightning-background-processor/src/lib.rs
+++ b/lightning-background-processor/src/lib.rs
@@ -1012,12 +1012,12 @@ impl Drop for BackgroundProcessor {
 mod tests {
        use super::{BackgroundProcessor, GossipSync, FRESHNESS_TIMER};
        use bitcoin::constants::{genesis_block, ChainHash};
-       use bitcoin::locktime::absolute::LockTime;
-       use bitcoin::transaction::{Transaction, TxOut};
        use bitcoin::hashes::Hash;
+       use bitcoin::locktime::absolute::LockTime;
        use bitcoin::network::Network;
        use bitcoin::secp256k1::{PublicKey, Secp256k1, SecretKey};
        use bitcoin::transaction::Version;
+       use bitcoin::transaction::{Transaction, TxOut};
        use bitcoin::{Amount, ScriptBuf, Txid};
        use core::sync::atomic::{AtomicBool, Ordering};
        use lightning::chain::channelmonitor::ANTI_REORG_DELAY;

diff --git a/lightning-block-sync/src/gossip.rs b/lightning-block-sync/src/gossip.rs
index 72a77d4a9b8d0c39c7d0f7fd0b030109d3240a4f..feb130fe7b4c4ccf439c8b4bd52fb23dc1dc0c30 100644 (file)
--- a/lightning-block-sync/src/gossip.rs
+++ b/lightning-block-sync/src/gossip.rs
@@ -6,8 +6,8 @@ use crate::{AsyncBlockSourceResult, BlockData, BlockSource, BlockSourceError};
 
 use bitcoin::block::Block;
 use bitcoin::constants::ChainHash;
-use bitcoin::transaction::{OutPoint, TxOut};
 use bitcoin::hash_types::BlockHash;
+use bitcoin::transaction::{OutPoint, TxOut};
 
 use lightning::ln::peer_handler::APeerManager;
 

diff --git a/lightning-block-sync/src/test_utils.rs b/lightning-block-sync/src/test_utils.rs
index 960c72ad3132e10fe0ee907a5a5e85de37f12ae7..bf507a14dc6f0c291e061b1b9f37b0f8fc1aa936 100644 (file)
--- a/lightning-block-sync/src/test_utils.rs
+++ b/lightning-block-sync/src/test_utils.rs
@@ -6,8 +6,8 @@ use crate::{
 
 use bitcoin::block::{Block, Header, Version};
 use bitcoin::constants::genesis_block;
-use bitcoin::locktime::absolute::LockTime;
 use bitcoin::hash_types::{BlockHash, TxMerkleNode};
+use bitcoin::locktime::absolute::LockTime;
 use bitcoin::network::Network;
 use bitcoin::transaction;
 use bitcoin::Transaction;

diff --git a/lightning/src/ln/interactivetxs.rs b/lightning/src/ln/interactivetxs.rs
index 6bb5582227c495f16daabe8427a6458137868ce5..4e358ec7261e1be192fff6bd8c6089537e5355f0 100644 (file)
--- a/lightning/src/ln/interactivetxs.rs
+++ b/lightning/src/ln/interactivetxs.rs
@@ -12,8 +12,8 @@ use crate::prelude::*;
 
 use bitcoin::absolute::LockTime as AbsoluteLockTime;
 use bitcoin::amount::Amount;
-use bitcoin::constants::WITNESS_SCALE_FACTOR;
 use bitcoin::consensus::Encodable;
+use bitcoin::constants::WITNESS_SCALE_FACTOR;
 use bitcoin::policy::MAX_STANDARD_TX_WEIGHT;
 use bitcoin::transaction::Version;
 use bitcoin::{OutPoint, ScriptBuf, Sequence, Transaction, TxIn, TxOut, Weight};
@@ -1304,10 +1304,10 @@ mod tests {
        use crate::util::ser::TransactionU16LenLimited;
        use bitcoin::absolute::LockTime as AbsoluteLockTime;
        use bitcoin::amount::Amount;
-       use bitcoin::opcodes;
-       use bitcoin::script::Builder;
        use bitcoin::hashes::Hash;
        use bitcoin::key::UntweakedPublicKey;
+       use bitcoin::opcodes;
+       use bitcoin::script::Builder;
        use bitcoin::secp256k1::{Keypair, Secp256k1};
        use bitcoin::transaction::Version;
        use bitcoin::{

diff --git a/lightning/src/sign/mod.rs b/lightning/src/sign/mod.rs
index 99c328d601049e1e4c196d587ed3b87b83a274b3..2e6e69cc0f6b1555d29d3211b81ab30247eeab47 100644 (file)
--- a/lightning/src/sign/mod.rs
+++ b/lightning/src/sign/mod.rs
@@ -14,15 +14,15 @@
 
 use bitcoin::amount::Amount;
 use bitcoin::bip32::{ChildNumber, Xpriv, Xpub};
+use bitcoin::ecdsa::Signature as EcdsaSignature;
 use bitcoin::locktime::absolute::LockTime;
+use bitcoin::network::Network;
 use bitcoin::opcodes;
 use bitcoin::script::{Builder, Script, ScriptBuf};
-use bitcoin::transaction::{Transaction, TxIn, TxOut};
-use bitcoin::ecdsa::Signature as EcdsaSignature;
-use bitcoin::network::Network;
 use bitcoin::sighash;
 use bitcoin::sighash::EcdsaSighashType;
 use bitcoin::transaction::Version;
+use bitcoin::transaction::{Transaction, TxIn, TxOut};
 
 use bech32::u5;
 use bitcoin::hashes::sha256::Hash as Sha256;

diff --git a/lightning/src/sign/taproot.rs b/lightning/src/sign/taproot.rs
index 95f41751467c0cf1f169dfe7c6b78b3564cec076..740942bc055b27e12dee6f5184fe0a6f657725dc 100644 (file)
--- a/lightning/src/sign/taproot.rs
+++ b/lightning/src/sign/taproot.rs
@@ -1,9 +1,9 @@
 //! Defines a Taproot-specific signer type.
 
 use alloc::vec::Vec;
-use bitcoin::transaction::Transaction;
 use bitcoin::secp256k1;
 use bitcoin::secp256k1::{schnorr::Signature, PublicKey, Secp256k1, SecretKey};
+use bitcoin::transaction::Transaction;
 
 use musig2::types::{PartialSignature, PublicNonce};