f Skip any unconfirmations if unconf_height is None

Author: tnull

lightning/src/util/sweep.rs

@@ -662,18 +662,14 @@ where
 			.find(|o| o.status.latest_spending_tx().map(|tx| tx.txid()) == Some(*txid))
 			.and_then(|o| o.status.confirmation_height());
 
-		// Unconfirm all >= this height.
-		let mut should_persist = false;
-		state_lock
-			.outputs
-			.iter_mut()
-			.filter(|o| o.status.confirmation_height() >= unconf_height)
-			.for_each(|o| {
-				should_persist = true;
-				o.status.unconfirmed()
-			});
+		if let Some(unconf_height) = unconf_height {
+			// Unconfirm all >= this height.
+			state_lock
+				.outputs
+				.iter_mut()
+				.filter(|o| o.status.confirmation_height() >= Some(unconf_height))
+				.for_each(|o| o.status.unconfirmed());
 
-		if should_persist {
 			self.persist_state(&*state_lock).unwrap_or_else(|e| {
 				log_error!(self.logger, "Error persisting OutputSweeper: {:?}", e);
 			});