From 140ec2188393230ea506fb63535873282e36851b Mon Sep 17 00:00:00 2001 From: thesimplekid Date: Mon, 15 Jul 2024 14:34:44 +0100 Subject: [PATCH] feat: remove unused arg on melt --- CHANGELOG.md | 1 + bindings/cdk-js/src/wallet.rs | 12 ++---------- crates/cdk-cli/src/sub_commands/melt.rs | 3 +-- crates/cdk/src/wallet/mod.rs | 6 +----- crates/cdk/src/wallet/multi_mint_wallet.rs | 2 +- 5 files changed, 6 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 22dda38c..2774ab93 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,6 +36,7 @@ - cdk(mint): On `swap` verify correct number of sigs on outputs when `SigAll` ([thesimplekid]). ### Removed +- cdk(wallet): Remove unused argument `SplitTarget` on `melt` ([thesimplekid]). ## [v0.2.0] diff --git a/bindings/cdk-js/src/wallet.rs b/bindings/cdk-js/src/wallet.rs index d591c96e..e1378bfc 100644 --- a/bindings/cdk-js/src/wallet.rs +++ b/bindings/cdk-js/src/wallet.rs @@ -167,16 +167,8 @@ impl JsWallet { } #[wasm_bindgen(js_name = melt)] - pub async fn melt( - &mut self, - quote_id: String, - split_target_amount: Option, - ) -> Result { - let target = split_target_amount - .map(|a| SplitTarget::Value(*a.deref())) - .unwrap_or_default(); - - let melted = self.inner.melt("e_id, target).await.map_err(into_err)?; + pub async fn melt(&mut self, quote_id: String) -> Result { + let melted = self.inner.melt("e_id).await.map_err(into_err)?; Ok(melted.into()) } diff --git a/crates/cdk-cli/src/sub_commands/melt.rs b/crates/cdk-cli/src/sub_commands/melt.rs index 61f48e9b..c0e876ed 100644 --- a/crates/cdk-cli/src/sub_commands/melt.rs +++ b/crates/cdk-cli/src/sub_commands/melt.rs @@ -4,7 +4,6 @@ use std::str::FromStr; use std::{io, println}; use anyhow::{bail, Result}; -use cdk::amount::SplitTarget; use cdk::wallet::Wallet; use cdk::{Bolt11Invoice, UncheckedUrl}; @@ -47,7 +46,7 @@ pub async fn pay(wallets: HashMap) -> Result<()> { println!("{:?}", quote); - let melt = wallet.melt("e.id, SplitTarget::default()).await?; + let melt = wallet.melt("e.id).await?; println!("Paid invoice: {}", melt.state); if let Some(preimage) = melt.preimage { diff --git a/crates/cdk/src/wallet/mod.rs b/crates/cdk/src/wallet/mod.rs index cd3c61ee..580734eb 100644 --- a/crates/cdk/src/wallet/mod.rs +++ b/crates/cdk/src/wallet/mod.rs @@ -1189,11 +1189,7 @@ impl Wallet { /// Melt #[instrument(skip(self))] - pub async fn melt( - &self, - quote_id: &str, - amount_split_target: SplitTarget, - ) -> Result { + pub async fn melt(&self, quote_id: &str) -> Result { let quote_info = self.localstore.get_melt_quote(quote_id).await?; let quote_info = if let Some(quote) = quote_info { diff --git a/crates/cdk/src/wallet/multi_mint_wallet.rs b/crates/cdk/src/wallet/multi_mint_wallet.rs index a87f0f56..ca5d0d66 100644 --- a/crates/cdk/src/wallet/multi_mint_wallet.rs +++ b/crates/cdk/src/wallet/multi_mint_wallet.rs @@ -267,7 +267,7 @@ impl MultiMintWallet { } } - wallet.melt("e.id, SplitTarget::default()).await + wallet.melt("e.id).await } /// Restore