f Drop SpendingDelay

Author: tnull

lightning-background-processor/src/lib.rs

@@ -949,7 +949,7 @@ mod tests {
 		CHANNEL_MANAGER_PERSISTENCE_PRIMARY_NAMESPACE, CHANNEL_MANAGER_PERSISTENCE_SECONDARY_NAMESPACE, CHANNEL_MANAGER_PERSISTENCE_KEY,
 		NETWORK_GRAPH_PERSISTENCE_PRIMARY_NAMESPACE, NETWORK_GRAPH_PERSISTENCE_SECONDARY_NAMESPACE, NETWORK_GRAPH_PERSISTENCE_KEY,
 		SCORER_PERSISTENCE_PRIMARY_NAMESPACE, SCORER_PERSISTENCE_SECONDARY_NAMESPACE, SCORER_PERSISTENCE_KEY};
-	use lightning::util::sweep::{OutputSweeper, OutputSpendStatus, SpendingDelay};
+	use lightning::util::sweep::{OutputSweeper, OutputSpendStatus};
 	use lightning_persister::fs_store::FilesystemStore;
 	use std::collections::VecDeque;
 	use std::{fs, env};
@@ -1665,21 +1665,22 @@ mod tests {
 			.expect("Events not handled within deadline");
 		match event {
 			Event::SpendableOutputs { outputs, channel_id } => {
-				nodes[0].sweeper.track_spendable_outputs(outputs, channel_id, false, Some(SpendingDelay::Relative { num_blocks: 3 }));
+				nodes[0].sweeper.track_spendable_outputs(outputs, channel_id, false, Some(153));
 			},
 			_ => panic!("Unexpected event: {:?}", event),
 		}
 
 		// Check we don't generate an initial sweeping tx until we reach the required height.
 		assert_eq!(nodes[0].sweeper.tracked_spendable_outputs().len(), 1);
 		let tracked_output = nodes[0].sweeper.tracked_spendable_outputs().first().unwrap().clone();
-		let sweep_tx_0 = nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().pop().unwrap();
-		assert!(!tracked_output.is_spent_in(&sweep_tx_0));
-		match tracked_output.status {
-			OutputSpendStatus::PendingInitialBroadcast { delayed_until_height } => {
-				assert_eq!(delayed_until_height, Some(153));
+		if let Some(sweep_tx_0) = nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().pop() {
+			assert!(!tracked_output.is_spent_in(&sweep_tx_0));
+			match tracked_output.status {
+				OutputSpendStatus::PendingInitialBroadcast { delayed_until_height } => {
+					assert_eq!(delayed_until_height, Some(153));
+				}
+				_ => panic!("Unexpected status"),
 			}
-			_ => panic!("Unexpected status"),
 		}
 
 		advance_chain(&mut nodes[0], 3);