clean: use dprint

UnstoppableSwap · Aug 26, 2024 · a57e3af · a57e3af
1 parent e3547fb
commit a57e3af
Show file tree

Hide file tree

Showing 10 changed files with 127 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/README.md b/README.md
@@ -1,9 +1,10 @@
 # `xmr-btc-swap`
 
 This is the monorepo containing the source code for all of our core projects:
- - [`swap`](swap/README.md) contains the source code for the main swapping binaries, `asb` and `swap`
- - [`gui`](src-gui/README.md) contains the new tauri based user interface
- - [`tauri`](src-tauri/) contains the tauri bindings between binaries and user interface
- - and other crates we use in our binaries
 
-If you're just here for the software, head over to the [releases](https://github.com/UnstoppableSwap/xmr-btc-swap/releases/latest) tab and grab the binary for your operating system! If you're just looking for documentation, check out our [docs page](https://docs.unstoppableswap.net/) or our [github docs](docs/README.md). 
+- [`swap`](swap/README.md) contains the source code for the main swapping binaries, `asb` and `swap`
+- [`gui`](src-gui/README.md) contains the new tauri based user interface
+- [`tauri`](src-tauri/) contains the tauri bindings between binaries and user interface
+- and other crates we use in our binaries
+
+If you're just here for the software, head over to the [releases](https://github.com/UnstoppableSwap/xmr-btc-swap/releases/latest) tab and grab the binary for your operating system! If you're just looking for documentation, check out our [docs page](https://docs.unstoppableswap.net/) or our [github docs](docs/README.md).
diff --git a/docs/asb/README.md b/docs/asb/README.md
@@ -172,7 +172,11 @@ First use `swap` or `asb` with the `export-bitcoin-wallet` subcommand.
 Output example:
 
 ```json
-{"descriptor":"wpkh(tprv8Zgredacted.../84'/1'/0'/0/*)","blockheight":2415616,"label":"asb-testnet"}
+{
+  "descriptor": "wpkh(tprv8Zgredacted.../84'/1'/0'/0/*)",
+  "blockheight": 2415616,
+  "label": "asb-testnet"
+}
 ```
 
 The wallet can theoretically be directly imported into

diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
@@ -44,9 +44,12 @@ macro_rules! tauri_command {
             context: tauri::State<'_, Arc<Context>>,
             args: $request_name,
         ) -> Result<<$request_name as swap::cli::api::request::Request>::Response, String> {
-            <$request_name as swap::cli::api::request::Request>::request(args, context.inner().clone())
-                .await
-                .to_string_result()
+            <$request_name as swap::cli::api::request::Request>::request(
+                args,
+                context.inner().clone(),
+            )
+            .await
+            .to_string_result()
         }
     };
 }

diff --git a/swap/src/api/request.rs b/swap/src/api/request.rs
@@ -27,8 +27,8 @@ use tracing::Instrument;
 use typeshare::typeshare;
 use uuid::Uuid;
 
-/// This trait is implemented by all types of request args that 
-/// the CLI can handle. 
+/// This trait is implemented by all types of request args that
+/// the CLI can handle.
 /// It provides a unified abstraction that can be useful for generics.
 #[allow(async_fn_in_trait)]
 pub trait Request {

diff --git a/swap/src/cli.rs b/swap/src/cli.rs
@@ -1,11 +1,11 @@
+pub mod api;
 mod behaviour;
 pub mod cancel_and_refund;
 pub mod command;
 mod event_loop;
 mod list_sellers;
 pub mod tracing;
 pub mod transport;
-pub mod api;
 
 pub use behaviour::{Behaviour, OutEvent};
 pub use cancel_and_refund::{cancel, cancel_and_refund, refund};

diff --git a/swap/src/cli/api/request.rs b/swap/src/cli/api/request.rs
@@ -1,7 +1,7 @@
 use super::tauri_bindings::TauriHandle;
+use crate::bitcoin::{CancelTimelock, ExpiredTimelocks, PunishTimelock, TxLock};
 use crate::cli::api::tauri_bindings::{TauriEmitter, TauriSwapProgressEvent};
 use crate::cli::api::Context;
-use crate::bitcoin::{CancelTimelock, ExpiredTimelocks, PunishTimelock, TxLock};
 use crate::cli::{list_sellers as list_sellers_impl, EventLoop, SellerStatus};
 use crate::libp2p_ext::MultiAddrExt;
 use crate::network::quote::{BidQuote, ZeroQuoteReceived};

diff --git a/swap/src/cli/command.rs b/swap/src/cli/command.rs
@@ -1,10 +1,10 @@
+use crate::bitcoin::{bitcoin_address, Amount};
 use crate::cli::api::request::{
     BalanceArgs, BuyXmrArgs, CancelAndRefundArgs, ExportBitcoinWalletArgs, GetConfigArgs,
     GetHistoryArgs, ListSellersArgs, MoneroRecoveryArgs, Request, ResumeSwapArgs, StartDaemonArgs,
     WithdrawBtcArgs,
 };
 use crate::cli::api::Context;
-use crate::bitcoin::{bitcoin_address, Amount};
 use crate::monero;
 use crate::monero::monero_address;
 use anyhow::Result;

diff --git a/swap/src/protocol/bob/swap.rs b/swap/src/protocol/bob/swap.rs
@@ -1,5 +1,5 @@
-use crate::cli::api::tauri_bindings::{TauriEmitter, TauriHandle, TauriSwapProgressEvent};
 use crate::bitcoin::{ExpiredTimelocks, TxCancel, TxRefund};
+use crate::cli::api::tauri_bindings::{TauriEmitter, TauriHandle, TauriSwapProgressEvent};
 use crate::cli::EventLoopHandle;
 use crate::network::cooperative_xmr_redeem_after_punish::Response::{Fullfilled, Rejected};
 use crate::network::swap_setup::bob::NewSwap;

diff --git a/swap/src/rpc/methods.rs b/swap/src/rpc/methods.rs
@@ -1,10 +1,10 @@
+use crate::bitcoin::bitcoin_address;
 use crate::cli::api::request::{
     get_current_swap, get_history, get_raw_states, suspend_current_swap, BalanceArgs, BuyXmrArgs,
     CancelAndRefundArgs, GetSwapInfoArgs, ListSellersArgs, MoneroRecoveryArgs, Request,
     ResumeSwapArgs, WithdrawBtcArgs,
 };
 use crate::cli::api::Context;
-use crate::bitcoin::bitcoin_address;
 use crate::monero::monero_address;
 use crate::{bitcoin, monero};
 use anyhow::Result;