From b5da2413db2adc27f8eec91195ba480c19fe65e7 Mon Sep 17 00:00:00 2001 From: ok300 <106775972+ok300@users.noreply.github.com> Date: Fri, 17 May 2024 19:29:50 +0200 Subject: [PATCH] Cargo fmt --- src/swaps/boltzv2.rs | 2 +- src/swaps/liquidv2.rs | 8 ++++---- tests/liquid_v2.rs | 18 +++++++++++++----- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/swaps/boltzv2.rs b/src/swaps/boltzv2.rs index be1ea71..e69366f 100644 --- a/src/swaps/boltzv2.rs +++ b/src/swaps/boltzv2.rs @@ -122,7 +122,7 @@ impl BoltzApiClientV2 { Ok(r) => { println!("{:#?}", r); r.into_string()? - }, + } Err(ureq::Error::Status(code, response)) => { print!("{:#?}", response); let error: Value = serde_json::from_str(&response.into_string()?)?; diff --git a/src/swaps/liquidv2.rs b/src/swaps/liquidv2.rs index ad9eddc..e1b5d99 100644 --- a/src/swaps/liquidv2.rs +++ b/src/swaps/liquidv2.rs @@ -383,9 +383,10 @@ impl LBtcSwapScriptV2 { ) -> Result<(OutPoint, TxOut), Error> { let boltz_client = BoltzApiClientV2::new(boltz_url); let hex = if self.swap_type == SwapType::ReverseSubmarine { - boltz_client.get_reverse_tx(swap_id)?.hex}else{ - boltz_client.get_submarine_tx(swap_id)?.hex - }; + boltz_client.get_reverse_tx(swap_id)?.hex + } else { + boltz_client.get_submarine_tx(swap_id)?.hex + }; let address = self.to_address(network_config.network())?; let tx: Transaction = elements::encode::deserialize(&hex_to_bytes(&hex)?)?; @@ -748,7 +749,6 @@ impl LBtcSwapTxV2 { }; claim_tx.input[0].witness = witness; - } else { // If Non-Cooperative claim use the Script Path spending diff --git a/tests/liquid_v2.rs b/tests/liquid_v2.rs index 34c3cbb..6943d6b 100644 --- a/tests/liquid_v2.rs +++ b/tests/liquid_v2.rs @@ -161,7 +161,11 @@ fn liquid_v2_submarine() { .submarine_partial_sig(&our_keys, &claim_tx_response) .unwrap(); boltz_api_v2 - .post_claim_tx_details(&create_swap_response.clone().id, pub_nonce, partial_sig) + .post_claim_tx_details( + &create_swap_response.clone().id, + pub_nonce, + partial_sig, + ) .unwrap(); log::info!("Successfully Sent partial signature"); } @@ -177,7 +181,6 @@ fn liquid_v2_submarine() { &ElectrumConfig::default_liquid(), boltz_url.to_string(), create_swap_response.clone().id, - ) .unwrap(); @@ -430,9 +433,14 @@ fn test_recover_liquidv2_refund() { blinding_key, ); - let rev_swap_tx = - LBtcSwapTxV2::new_refund(swap_script, &RETURN_ADDRESS.to_string(), &network_config, BOLTZ_MAINNET_URL_V2.to_string(), id.clone()) - .unwrap(); + let rev_swap_tx = LBtcSwapTxV2::new_refund( + swap_script, + &RETURN_ADDRESS.to_string(), + &network_config, + BOLTZ_MAINNET_URL_V2.to_string(), + id.clone(), + ) + .unwrap(); let client = BoltzApiClientV2::new(BOLTZ_MAINNET_URL_V2); let coop = Some((&client, &id)); let signed_tx = rev_swap_tx