f Rename OnchainSendType to OnchainSendAmount

Author: tnull

src/payment/onchain.rs

@@ -11,7 +11,7 @@ use crate::config::Config;
 use crate::error::Error;
 use crate::logger::{log_info, FilesystemLogger, Logger};
 use crate::types::{ChannelManager, Wallet};
-use crate::wallet::OnchainSendType;
+use crate::wallet::OnchainSendAmount;
 
 use bitcoin::{Address, Txid};
 
@@ -62,7 +62,7 @@ impl OnchainPayment {
 		let cur_anchor_reserve_sats =
 			crate::total_anchor_channels_reserve_sats(&self.channel_manager, &self.config);
 		let send_amount =
-			OnchainSendType::SendRetainingReserve { amount_sats, cur_anchor_reserve_sats };
+			OnchainSendAmount::ExactRetainingReserve { amount_sats, cur_anchor_reserve_sats };
 		self.wallet.send_to_address(address, send_amount)
 	}
 
@@ -89,9 +89,9 @@ impl OnchainPayment {
 		let send_amount = if retain_reserves {
 			let cur_anchor_reserve_sats =
 				crate::total_anchor_channels_reserve_sats(&self.channel_manager, &self.config);
-			OnchainSendType::SendAllRetainingReserve { cur_anchor_reserve_sats }
+			OnchainSendAmount::AllRetainingReserve { cur_anchor_reserve_sats }
 		} else {
-			OnchainSendType::SendAllDrainingReserve
+			OnchainSendAmount::AllDrainingReserve
 		};
 
 		self.wallet.send_to_address(address, send_amount)

src/wallet/mod.rs

@@ -45,10 +45,10 @@ use bitcoin::{
 use std::ops::Deref;
 use std::sync::{Arc, Mutex};
 
-pub(crate) enum OnchainSendType {
-	SendRetainingReserve { amount_sats: u64, cur_anchor_reserve_sats: u64 },
-	SendAllRetainingReserve { cur_anchor_reserve_sats: u64 },
-	SendAllDrainingReserve,
+pub(crate) enum OnchainSendAmount {
+	ExactRetainingReserve { amount_sats: u64, cur_anchor_reserve_sats: u64 },
+	AllRetainingReserve { cur_anchor_reserve_sats: u64 },
+	AllDrainingReserve,
 }
 
 pub(crate) mod persist;
@@ -242,7 +242,7 @@ where
 	}
 
 	pub(crate) fn send_to_address(
-		&self, address: &bitcoin::Address, send_amount: OnchainSendType,
+		&self, address: &bitcoin::Address, send_amount: OnchainSendAmount,
 	) -> Result<Txid, Error> {
 		let confirmation_target = ConfirmationTarget::OnchainPayment;
 		let fee_rate = self.fee_estimator.estimate_fee_rate(confirmation_target);
@@ -252,7 +252,7 @@ where
 
 			// Prepare the tx_builder. We properly check the reserve requirements (again) further down.
 			let tx_builder = match send_amount {
-				OnchainSendType::SendRetainingReserve { amount_sats, .. } => {
+				OnchainSendAmount::ExactRetainingReserve { amount_sats, .. } => {
 					let mut tx_builder = locked_wallet.build_tx();
 					let amount = Amount::from_sat(amount_sats);
 					tx_builder
@@ -261,7 +261,7 @@ where
 						.enable_rbf();
 					tx_builder
 				},
-				OnchainSendType::SendAllRetainingReserve { cur_anchor_reserve_sats } => {
+				OnchainSendAmount::AllRetainingReserve { cur_anchor_reserve_sats } => {
 					let change_address_info = locked_wallet.peek_address(KeychainKind::Internal, 0);
 					let balance = locked_wallet.balance();
 					let spendable_amount_sats = self
@@ -320,7 +320,7 @@ where
 						.enable_rbf();
 					tx_builder
 				},
-				OnchainSendType::SendAllDrainingReserve => {
+				OnchainSendAmount::AllDrainingReserve => {
 					let mut tx_builder = locked_wallet.build_tx();
 					tx_builder
 						.drain_wallet()
@@ -344,7 +344,10 @@ where
 
 			// Check the reserve requirements (again) and return an error if they aren't met.
 			match send_amount {
-				OnchainSendType::SendRetainingReserve { amount_sats, cur_anchor_reserve_sats } => {
+				OnchainSendAmount::ExactRetainingReserve {
+					amount_sats,
+					cur_anchor_reserve_sats,
+				} => {
 					let balance = locked_wallet.balance();
 					let spendable_amount_sats = self
 						.get_balances_inner(balance, cur_anchor_reserve_sats)
@@ -371,7 +374,7 @@ where
 						return Err(Error::InsufficientFunds);
 					}
 				},
-				OnchainSendType::SendAllRetainingReserve { cur_anchor_reserve_sats } => {
+				OnchainSendAmount::AllRetainingReserve { cur_anchor_reserve_sats } => {
 					let balance = locked_wallet.balance();
 					let spendable_amount_sats = self
 						.get_balances_inner(balance, cur_anchor_reserve_sats)
@@ -420,7 +423,7 @@ where
 		let txid = tx.compute_txid();
 
 		match send_amount {
-			OnchainSendType::SendRetainingReserve { amount_sats, .. } => {
+			OnchainSendAmount::ExactRetainingReserve { amount_sats, .. } => {
 				log_info!(
 					self.logger,
 					"Created new transaction {} sending {}sats on-chain to address {}",
@@ -429,7 +432,7 @@ where
 					address
 				);
 			},
-			OnchainSendType::SendAllRetainingReserve { cur_anchor_reserve_sats } => {
+			OnchainSendAmount::AllRetainingReserve { cur_anchor_reserve_sats } => {
 				log_info!(
 					self.logger,
 					"Created new transaction {} sending available on-chain funds retaining a reserve of {}sats to address {}",
@@ -438,7 +441,7 @@ where
 					address,
 				);
 			},
-			OnchainSendType::SendAllDrainingReserve => {
+			OnchainSendAmount::AllDrainingReserve => {
 				log_info!(
 					self.logger,
 					"Created new transaction {} sending all available on-chain funds to address {}",