f Drop SpendingDelay enum

Author: tnull

lightning/src/util/sweep.rs

@@ -30,7 +30,6 @@ use bitcoin::blockdata::locktime::absolute::LockTime;
 use bitcoin::secp256k1::Secp256k1;
 use bitcoin::{BlockHash, Transaction, Txid};
 
-use core::cmp;
 use core::ops::Deref;
 
 /// The state of a spendable output currently tracked by an [`OutputSweeper`].
@@ -395,13 +394,13 @@ where
 	/// [`SpendableOutputDescriptor::StaticOutput`]s, which may be handled directly by the on-chain
 	/// wallet implementation.
 	///
-	/// If `delay_spend` is configured, we will delay the spending until the respective block
+	/// If `delay_until_height` is set, we will delay the spending until the respective block
 	/// height is reached. This can be used to batch spends, e.g., to reduce on-chain fees.
 	///
 	/// [`Event::SpendableOutputs`]: crate::events::Event::SpendableOutputs
 	pub fn track_spendable_outputs(
 		&self, output_descriptors: Vec<SpendableOutputDescriptor>, channel_id: Option<ChannelId>,
-		exclude_static_ouputs: bool, delay_spend: Option<SpendingDelay>,
+		exclude_static_ouputs: bool, delay_until_height: Option<u32>,
 	) {
 		let mut relevant_descriptors = output_descriptors
 			.into_iter()
@@ -418,16 +417,13 @@ where
 		let mut spending_tx_opt;
 		{
 			let mut state_lock = self.sweeper_state.lock().unwrap();
-			let cur_height = state_lock.best_block.height;
-			let delayed_until_height = delay_spend.map(|delay| match delay {
-				SpendingDelay::Relative { num_blocks } => cur_height + num_blocks,
-				SpendingDelay::Absolute { height } => cmp::max(height, cur_height),
-			});
 			for descriptor in relevant_descriptors {
 				let output_info = TrackedSpendableOutput {
 					descriptor,
 					channel_id,
-					status: OutputSpendStatus::PendingInitialBroadcast { delayed_until_height },
+					status: OutputSpendStatus::PendingInitialBroadcast {
+						delayed_until_height: delay_until_height,
+					},
 				};
 
 				if state_lock