f Match on PendingThresholdConfirmations

Author: tnull

lightning/src/util/sweep.rs

@@ -701,20 +701,14 @@ where
 		state_lock
 			.outputs
 			.iter()
-			.filter_map(|o| {
-				if let Some(confirmation_hash) = o.status.confirmation_hash() {
-					if let Some(confirmation_height) = o.status.confirmation_height() {
-						if let Some(latest_spending_tx) = o.status.latest_spending_tx() {
-							return Some((
-								latest_spending_tx.txid(),
-								confirmation_height,
-								Some(confirmation_hash),
-							));
-						}
-					}
-				}
-
-				None
+			.filter_map(|o| match o.status {
+				OutputSpendStatus::PendingThresholdConfirmations {
+					ref latest_spending_tx,
+					confirmation_height,
+					confirmation_hash,
+					..
+				} => Some((latest_spending_tx.txid(), confirmation_height, Some(confirmation_hash))),
+				_ => None,
 			})
 			.collect::<Vec<_>>()
 	}