From 5d4d40e9e8972731eaf1f17e3970690c3952625e Mon Sep 17 00:00:00 2001 From: archipelago Date: Wed, 15 Jul 2026 05:17:01 -0400 Subject: [PATCH] style: cargo fmt the Ark wallet merge (release-gate fmt guard) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Formatting only — no logic changes to PR #78. Co-Authored-By: Claude Fable 5 --- core/archipelago/src/api/rpc/ark.rs | 10 ++++++++-- core/archipelago/src/wallet/ark_client.rs | 23 +++++++++++++++-------- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/core/archipelago/src/api/rpc/ark.rs b/core/archipelago/src/api/rpc/ark.rs index 27209f3f..da83b375 100644 --- a/core/archipelago/src/api/rpc/ark.rs +++ b/core/archipelago/src/api/rpc/ark.rs @@ -55,14 +55,20 @@ impl RpcHandler { })) } }; - let bal = client.balance().await.unwrap_or_else(|_| serde_json::json!({})); + let bal = client + .balance() + .await + .unwrap_or_else(|_| serde_json::json!({})); let sat = |key: &str| bal.get(key).and_then(|v| v.as_u64()).unwrap_or(0); let spendable = sat("spendable_sat"); let pending = sat("pending_in_round_sat") + sat("pending_board_sat") + sat("pending_lightning_send_sat") + sat("claimable_lightning_receive_sat") - + bal.get("pending_exit_sat").and_then(|v| v.as_u64()).unwrap_or(0); + + bal + .get("pending_exit_sat") + .and_then(|v| v.as_u64()) + .unwrap_or(0); let onchain = client .onchain_balance() .await diff --git a/core/archipelago/src/wallet/ark_client.rs b/core/archipelago/src/wallet/ark_client.rs index 9aa4ae4a..c6c92285 100644 --- a/core/archipelago/src/wallet/ark_client.rs +++ b/core/archipelago/src/wallet/ark_client.rs @@ -210,7 +210,10 @@ impl ArkClient { /// the call itself succeeds). pub async fn spendable_sats(&self) -> Result { let bal = self.balance().await?; - Ok(bal.get("spendable_sat").and_then(|v| v.as_u64()).unwrap_or(0)) + Ok(bal + .get("spendable_sat") + .and_then(|v| v.as_u64()) + .unwrap_or(0)) } /// `GET /api/v1/onchain/balance` — the wallet's on-chain (boarding) funds. @@ -220,7 +223,9 @@ impl ArkClient { /// `POST /api/v1/wallet/addresses/next` — fresh Ark (`tark1…`) address. pub async fn ark_address(&self) -> Result { - let res = self.post("/api/v1/wallet/addresses/next", serde_json::json!({})).await?; + let res = self + .post("/api/v1/wallet/addresses/next", serde_json::json!({})) + .await?; res.get("address") .and_then(|v| v.as_str()) .map(String::from) @@ -229,7 +234,9 @@ impl ArkClient { /// `POST /api/v1/onchain/addresses/next` — fresh on-chain boarding address. pub async fn onchain_address(&self) -> Result { - let res = self.post("/api/v1/onchain/addresses/next", serde_json::json!({})).await?; + let res = self + .post("/api/v1/onchain/addresses/next", serde_json::json!({})) + .await?; res.get("address") .and_then(|v| v.as_str()) .map(String::from) @@ -277,7 +284,10 @@ impl ArkClient { ) .await } - None => self.post("/api/v1/boards/board-all", serde_json::json!({})).await, + None => { + self.post("/api/v1/boards/board-all", serde_json::json!({})) + .await + } } } @@ -353,10 +363,7 @@ pub async fn load_ark_txs(data_dir: &Path) -> Vec m, Err(_) => return Vec::new(), }; - movements - .iter() - .filter_map(movement_to_tx) - .collect() + movements.iter().filter_map(movement_to_tx).collect() } /// Convert one barkd `Movement` into an [`EcashTransaction`]. `None` for