fix: format

Author: asmogo

bindings/swift/rust/Cargo.toml

@@ -18,7 +18,7 @@ name = "uniffi-bindgen-swift"
 path = "uniffi-bindgen-swift.rs"
 
 [dependencies]
-cdk-ffi = { workspace = true, default-features = false, features = ["npubcash", "bip353"] }
+cdk-ffi = { workspace = true, default-features = false, features = ["npubcash", "nwc", "bip353"] }
 uniffi = { workspace = true, features = ["cli"] }
 
 

crates/cdk-ffi/src/nwc.rs

@@ -46,7 +46,8 @@ impl NwcService {
         let relays = relays
             .iter()
             .map(|r| {
-                RelayUrl::parse(r).map_err(|e| FfiError::internal(format!("invalid relay {r}: {e}")))
+                RelayUrl::parse(r)
+                    .map_err(|e| FfiError::internal(format!("invalid relay {r}: {e}")))
             })
             .collect::<Result<Vec<_>, _>>()?;
 

crates/cdk-nwc/src/lib.rs

@@ -34,8 +34,7 @@ pub mod service;
 
 pub use error::{Error, Result};
 pub use handler::NwcRequestHandler;
-pub use service::{NwcService, NwcServiceConfig, SUPPORTED_METHODS};
-
 // Re-export the NIP-47 protocol types so downstream crates depend on a single
 // source of truth without pulling `nostr_sdk` paths into their signatures.
 pub use nostr_sdk::nips::nip47;
+pub use service::{NwcService, NwcServiceConfig, SUPPORTED_METHODS};

crates/cdk-nwc/src/service.rs

@@ -21,8 +21,7 @@ use std::collections::{HashSet, VecDeque};
 use std::sync::Arc;
 
 use nostr_sdk::nips::nip47::{
-    ErrorCode, NIP47Error, NostrWalletConnectURI, Request, RequestParams, Response,
-    ResponseResult,
+    ErrorCode, NIP47Error, NostrWalletConnectURI, Request, RequestParams, Response, ResponseResult,
 };
 use nostr_sdk::nips::{nip04, nip44};
 use nostr_sdk::prelude::*;
@@ -247,29 +246,31 @@ impl NwcService {
 /// Any failure is logged and (where possible) answered with a NIP-47 error
 /// response. This function never panics and never returns an error to the
 /// caller — keeping the relay loop alive is part of the security contract.
-async fn handle_request<H>(
-    service_keys: &Keys,
-    client: &NostrClient,
-    handler: &H,
-    event: &Event,
-) where
+async fn handle_request<H>(service_keys: &Keys, client: &NostrClient, handler: &H, event: &Event)
+where
     H: NwcRequestHandler + ?Sized,
 {
     let secret = service_keys.secret_key();
 
-    let (request, encryption) =
-        match decrypt_request(secret, &event.pubkey, &event.content) {
-            Ok(parsed) => parsed,
-            Err(e) => {
-                tracing::warn!("Failed to decode NWC request {}: {e}", event.id);
-                return;
-            }
-        };
+    let (request, encryption) = match decrypt_request(secret, &event.pubkey, &event.content) {
+        Ok(parsed) => parsed,
+        Err(e) => {
+            tracing::warn!("Failed to decode NWC request {}: {e}", event.id);
+            return;
+        }
+    };
 
     let response = dispatch(handler, request).await;
 
-    if let Err(e) =
-        send_response(service_keys, client, &event.pubkey, event.id, &response, encryption).await
+    if let Err(e) = send_response(
+        service_keys,
+        client,
+        &event.pubkey,
+        event.id,
+        &response,
+        encryption,
+    )
+    .await
     {
         tracing::warn!("Failed to send NWC response for {}: {e}", event.id);
     }
@@ -506,12 +507,8 @@ mod tests {
         let request = Request::get_balance();
 
         for scheme in [Encryption::Nip44, Encryption::Nip04] {
-            let content = encrypt_request(
-                client.secret_key(),
-                &service.public_key(),
-                &request,
-                scheme,
-            );
+            let content =
+                encrypt_request(client.secret_key(), &service.public_key(), &request, scheme);
 
             let (decoded, detected) =
                 decrypt_request(service.secret_key(), &client.public_key(), &content)

crates/cdk/src/wallet/nwc.rs

@@ -41,8 +41,7 @@ use tracing::instrument;
 
 use crate::error::Error;
 use crate::nuts::{CurrencyUnit, SecretKey};
-use crate::Amount;
-use crate::Wallet;
+use crate::{Amount, Wallet};
 
 /// Derive the NWC wallet-service secret key from a wallet seed.
 ///
@@ -125,9 +124,12 @@ fn nip47_err(code: ErrorCode, message: impl Into<String>) -> NIP47Error {
 fn amount_to_msat(amount: Amount, unit: &CurrencyUnit) -> Result<u64, NIP47Error> {
     let value = u64::from(amount);
     match unit {
-        CurrencyUnit::Sat => value
-            .checked_mul(1000)
-            .ok_or_else(|| nip47_err(ErrorCode::Internal, "amount overflow converting sat to msat")),
+        CurrencyUnit::Sat => value.checked_mul(1000).ok_or_else(|| {
+            nip47_err(
+                ErrorCode::Internal,
+                "amount overflow converting sat to msat",
+            )
+        }),
         CurrencyUnit::Msat => Ok(value),
         other => Err(nip47_err(
             ErrorCode::Other,
@@ -369,7 +371,11 @@ impl cdk_nwc::NwcRequestHandler for WalletNwcHandler {
             .map_err(|e| nip47_err(ErrorCode::Internal, e.to_string()))?;
 
         for tx in &transactions {
-            if tx.payment_request.as_deref().and_then(payment_hash_of).as_deref()
+            if tx
+                .payment_request
+                .as_deref()
+                .and_then(payment_hash_of)
+                .as_deref()
                 == Some(target_hash.as_str())
             {
                 return transaction_to_nip47(tx, unit);