f DRY up via macro

Author: tnull

src/payment/onchain.rs

@@ -20,7 +20,20 @@ use std::sync::{Arc, RwLock};
 #[cfg(not(feature = "uniffi"))]
 type FeeRate = bitcoin::FeeRate;
 #[cfg(feature = "uniffi")]
-type FeeRate = crate::uniffi_types::FeeRate;
+type FeeRate = Arc<crate::uniffi_types::FeeRate>;
+
+macro_rules! maybe_map_fee_rate_opt {
+	($fee_rate_opt: expr) => {{
+		#[cfg(not(feature = "uniffi"))]
+		{
+			$fee_rate_opt
+		}
+		#[cfg(feature = "uniffi")]
+		{
+			$fee_rate_opt.map(|f| f.0)
+		}
+	}};
+}
 
 /// A payment handler allowing to send and receive on-chain payments.
 ///
@@ -59,7 +72,6 @@ impl OnchainPayment {
 	/// a reasonable estimate from the configured chain source.
 	///
 	/// [`BalanceDetails::total_anchor_channels_reserve_sats`]: crate::BalanceDetails::total_anchor_channels_reserve_sats
-	#[cfg(not(feature = "uniffi"))]
 	pub fn send_to_address(
 		&self, address: &bitcoin::Address, amount_sats: u64, fee_rate: Option<FeeRate>,
 	) -> Result<Txid, Error> {
@@ -72,32 +84,8 @@ impl OnchainPayment {
 			crate::total_anchor_channels_reserve_sats(&self.channel_manager, &self.config);
 		let send_amount =
 			OnchainSendAmount::ExactRetainingReserve { amount_sats, cur_anchor_reserve_sats };
-		self.wallet.send_to_address(address, send_amount, fee_rate)
-	}
-
-	/// Send an on-chain payment to the given address.
-	///
-	/// This will respect any on-chain reserve we need to keep, i.e., won't allow to cut into
-	/// [`BalanceDetails::total_anchor_channels_reserve_sats`].
-	///
-	/// If `fee_rate` is set it will be used on the resulting transaction. Otherwise we'll retrieve
-	/// a reasonable estimate from the configured chain source.
-	///
-	/// [`BalanceDetails::total_anchor_channels_reserve_sats`]: crate::BalanceDetails::total_anchor_channels_reserve_sats
-	#[cfg(feature = "uniffi")]
-	pub fn send_to_address(
-		&self, address: &bitcoin::Address, amount_sats: u64, fee_rate: Option<Arc<FeeRate>>,
-	) -> Result<Txid, Error> {
-		let rt_lock = self.runtime.read().unwrap();
-		if rt_lock.is_none() {
-			return Err(Error::NotRunning);
-		}
-
-		let cur_anchor_reserve_sats =
-			crate::total_anchor_channels_reserve_sats(&self.channel_manager, &self.config);
-		let send_amount =
-			OnchainSendAmount::ExactRetainingReserve { amount_sats, cur_anchor_reserve_sats };
-		self.wallet.send_to_address(address, send_amount, fee_rate.map(|f| f.0))
+		let fee_rate_opt = maybe_map_fee_rate_opt!(fee_rate);
+		self.wallet.send_to_address(address, send_amount, fee_rate_opt)
 	}
 
 	/// Send an on-chain payment to the given address, draining the available funds.
@@ -115,7 +103,6 @@ impl OnchainPayment {
 	/// we'll retrieve an estimate from the configured chain source.
 	///
 	/// [`BalanceDetails::spendable_onchain_balance_sats`]: crate::balance::BalanceDetails::spendable_onchain_balance_sats
-	#[cfg(not(feature = "uniffi"))]
 	pub fn send_all_to_address(
 		&self, address: &bitcoin::Address, retain_reserves: bool, fee_rate: Option<FeeRate>,
 	) -> Result<Txid, Error> {
@@ -132,41 +119,7 @@ impl OnchainPayment {
 			OnchainSendAmount::AllDrainingReserve
 		};
 
-		self.wallet.send_to_address(address, send_amount, fee_rate)
-	}
-
-	/// Send an on-chain payment to the given address, draining the available funds.
-	///
-	/// This is useful if you have closed all channels and want to migrate funds to another
-	/// on-chain wallet.
-	///
-	/// Please note that if `retain_reserves` is set to `false` this will **not** retain any on-chain reserves, which might be potentially
-	/// dangerous if you have open Anchor channels for which you can't trust the counterparty to
-	/// spend the Anchor output after channel closure. If `retain_reserves` is set to `true`, this
-	/// will try to send all spendable onchain funds, i.e.,
-	/// [`BalanceDetails::spendable_onchain_balance_sats`].
-	///
-	/// If `fee_rate` is set it will be used on the resulting transaction. Otherwise a reasonable
-	/// we'll retrieve an estimate from the configured chain source.
-	///
-	/// [`BalanceDetails::spendable_onchain_balance_sats`]: crate::balance::BalanceDetails::spendable_onchain_balance_sats
-	#[cfg(feature = "uniffi")]
-	pub fn send_all_to_address(
-		&self, address: &bitcoin::Address, retain_reserves: bool, fee_rate: Option<Arc<FeeRate>>,
-	) -> Result<Txid, Error> {
-		let rt_lock = self.runtime.read().unwrap();
-		if rt_lock.is_none() {
-			return Err(Error::NotRunning);
-		}
-
-		let send_amount = if retain_reserves {
-			let cur_anchor_reserve_sats =
-				crate::total_anchor_channels_reserve_sats(&self.channel_manager, &self.config);
-			OnchainSendAmount::AllRetainingReserve { cur_anchor_reserve_sats }
-		} else {
-			OnchainSendAmount::AllDrainingReserve
-		};
-
-		self.wallet.send_to_address(address, send_amount, fee_rate.map(|f| f.0))
+		let fee_rate_opt = maybe_map_fee_rate_opt!(fee_rate);
+		self.wallet.send_to_address(address, send_amount, fee_rate_opt)
 	}
 }