Format code base using rustfmt

get10101 · Apr 3, 2024 · 2df1977 · 2df1977
1 parent ca542c7
commit 2df1977
Show file tree

Hide file tree

Showing 24 changed files with 394 additions and 241 deletions.
diff --git a/bitcoin-rpc-provider/src/lib.rs b/bitcoin-rpc-provider/src/lib.rs
@@ -297,9 +297,17 @@ impl Wallet for BitcoinCoreProvider {
     }
 
     fn unreserve_utxos(&self, outpoints: &[OutPoint]) -> Result<(), ManagerError> {
-        match self.client.lock().unwrap().unlock_unspent(outpoints).map_err(rpc_err_to_manager_err)? {
+        match self
+            .client
+            .lock()
+            .unwrap()
+            .unlock_unspent(outpoints)
+            .map_err(rpc_err_to_manager_err)?
+        {
             true => Ok(()),
-            false => Err(ManagerError::StorageError(format!("Failed to unlock utxos: {outpoints:?}")))
+            false => Err(ManagerError::StorageError(format!(
+                "Failed to unlock utxos: {outpoints:?}"
+            ))),
         }
     }
 }

diff --git a/dlc-manager/src/channel/accepted_channel.rs b/dlc-manager/src/channel/accepted_channel.rs
@@ -39,7 +39,7 @@ pub struct AcceptedChannel {
     /// The accept party adaptor signature for the buffer transaction.
     pub accept_buffer_adaptor_signature: EcdsaAdaptorSignature,
     /// The reference id set by the api user.
-    pub reference_id: Option<ReferenceId>
+    pub reference_id: Option<ReferenceId>,
 }
 
 impl AcceptedChannel {
@@ -67,7 +67,7 @@ impl AcceptedChannel {
             own_basepoint: self.accept_base_points.own_basepoint,
             first_per_update_point: self.accept_per_update_point,
             buffer_adaptor_signature: *buffer_adaptor_signature,
-            reference_id
+            reference_id,
         }
     }
 }
diff --git a/dlc-manager/src/channel/mod.rs b/dlc-manager/src/channel/mod.rs
@@ -73,7 +73,7 @@ impl std::fmt::Debug for Channel {
             Channel::CounterClosed(_) => "counter closed",
             Channel::ClosedPunished(_) => "closed punished",
             Channel::CollaborativelyClosed(_) => "collaboratively closed",
-            Channel::Cancelled(_) => "cancelled"
+            Channel::Cancelled(_) => "cancelled",
         };
         f.debug_struct("Channel").field("state", &state).finish()
     }
@@ -94,7 +94,7 @@ impl Channel {
                 c.counter_party
             }
             Channel::ClosedPunished(c) => c.counter_party,
-            Channel::Cancelled(o) => o.counter_party
+            Channel::Cancelled(o) => o.counter_party,
         }
     }
 
@@ -112,7 +112,7 @@ impl Channel {
                 c.reference_id
             }
             Channel::ClosedPunished(c) => c.reference_id,
-            Channel::Cancelled(o) => o.reference_id
+            Channel::Cancelled(o) => o.reference_id,
         }
     }
 }

diff --git a/dlc-manager/src/channel/offered_channel.rs b/dlc-manager/src/channel/offered_channel.rs
@@ -6,7 +6,10 @@ use dlc_messages::channel::OfferChannel;
 // use dlc_messages::channel::OfferChannel;
 use secp256k1_zkp::PublicKey;
 
-use crate::{contract::offered_contract::OfferedContract, conversion_utils::get_tx_input_infos, error::Error, ContractId, DlcChannelId, ReferenceId};
+use crate::{
+    contract::offered_contract::OfferedContract, conversion_utils::get_tx_input_infos,
+    error::Error, ContractId, DlcChannelId, ReferenceId,
+};
 
 use super::party_points::PartyBasePoints;
 
@@ -39,11 +42,15 @@ pub struct OfferedChannel {
     /// The nSequence value to use for the CETs.
     pub cet_nsequence: u32,
     /// The reference id set by the api user.
-    pub reference_id: Option<ReferenceId>
+    pub reference_id: Option<ReferenceId>,
 }
 
 impl OfferedChannel {
-    pub(crate) fn get_offer_channel_msg(&self, offered_contract: &OfferedContract, reference_id: Option<ReferenceId>) -> OfferChannel {
+    pub(crate) fn get_offer_channel_msg(
+        &self,
+        offered_contract: &OfferedContract,
+        reference_id: Option<ReferenceId>,
+    ) -> OfferChannel {
         let party_points = &self.party_points;
         OfferChannel {
             protocol_version: crate::conversion_utils::PROTOCOL_VERSION,
@@ -72,7 +79,7 @@ impl OfferedChannel {
             fee_rate_per_vb: offered_contract.fee_rate_per_vb,
             fund_output_serial_id: offered_contract.fund_output_serial_id,
             cet_nsequence: crate::manager::CET_NSEQUENCE,
-            reference_id
+            reference_id,
         }
     }
 

diff --git a/dlc-manager/src/channel/ser.rs b/dlc-manager/src/channel/ser.rs
@@ -3,7 +3,10 @@ use super::accepted_channel::AcceptedChannel;
 use super::offered_channel::OfferedChannel;
 use super::party_points::PartyBasePoints;
 use super::signed_channel::{SignedChannel, SignedChannelState};
-use super::{ClosedChannel, ClosedPunishedChannel, ClosingChannel, FailedAccept, FailedSign, SettledClosingChannel};
+use super::{
+    ClosedChannel, ClosedPunishedChannel, ClosingChannel, FailedAccept, FailedSign,
+    SettledClosingChannel,
+};
 
 use dlc_messages::ser_impls::{
     read_ecdsa_adaptor_signature, read_string, write_ecdsa_adaptor_signature, write_string,