From d0ed16cd75e46310e1fc2fed8a0953474edb9e26 Mon Sep 17 00:00:00 2001 From: Lucas Soriano del Pino Date: Thu, 4 Apr 2024 11:05:09 +1100 Subject: [PATCH] Format code base using rustfmt --- bitcoin-rpc-provider/src/lib.rs | 13 ++++++++++--- dlc-manager/src/channel/mod.rs | 2 +- dlc-manager/tests/channel_execution_tests.rs | 10 ++++++---- rustfmt.toml | 2 ++ 4 files changed, 19 insertions(+), 8 deletions(-) create mode 100644 rustfmt.toml diff --git a/bitcoin-rpc-provider/src/lib.rs b/bitcoin-rpc-provider/src/lib.rs index 43b2e217..6b52888e 100644 --- a/bitcoin-rpc-provider/src/lib.rs +++ b/bitcoin-rpc-provider/src/lib.rs @@ -391,11 +391,18 @@ 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/mod.rs b/dlc-manager/src/channel/mod.rs index 7249b0f1..a6a1655c 100644 --- a/dlc-manager/src/channel/mod.rs +++ b/dlc-manager/src/channel/mod.rs @@ -45,7 +45,7 @@ impl std::fmt::Debug for Channel { Channel::Signed(_) => "signed", Channel::FailedAccept(_) => "failed accept", Channel::FailedSign(_) => "failed sign", - Channel::Cancelled(_) => "cancelled" + Channel::Cancelled(_) => "cancelled", }; f.debug_struct("Contract").field("state", &state).finish() } diff --git a/dlc-manager/tests/channel_execution_tests.rs b/dlc-manager/tests/channel_execution_tests.rs index 04a95c68..306d033d 100644 --- a/dlc-manager/tests/channel_execution_tests.rs +++ b/dlc-manager/tests/channel_execution_tests.rs @@ -477,11 +477,13 @@ fn channel_execution_test(test_params: TestParams, path: TestPath) { assert_channel_state!(alice_manager_send, temporary_channel_id, Offered); if let TestPath::CancelOffer = path { - let (reject_msg, _) = alice_manager_send.lock().unwrap().reject_channel(&temporary_channel_id).expect("Error rejecting contract offer"); + let (reject_msg, _) = alice_manager_send + .lock() + .unwrap() + .reject_channel(&temporary_channel_id) + .expect("Error rejecting contract offer"); assert_channel_state!(alice_manager_send, temporary_channel_id, Cancelled); - alice_send - .send(Some(Message::Reject(reject_msg))) - .unwrap(); + alice_send.send(Some(Message::Reject(reject_msg))).unwrap(); sync_receive.recv().expect("Error synchronizing"); assert_channel_state!(bob_manager_send, temporary_channel_id, Cancelled); diff --git a/rustfmt.toml b/rustfmt.toml new file mode 100644 index 00000000..f42c8b39 --- /dev/null +++ b/rustfmt.toml @@ -0,0 +1,2 @@ +edition = "2021" +max_width = 100