f more log + better var names

Author: TheBlueMatt

lightning/src/chain/channelmonitor.rs

@@ -3111,17 +3111,20 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 		F::Target: FeeEstimator,
 		L::Target: Logger,
 	{
-		let mut height = None;
+		let mut removed_height = None;
 		for entry in self.onchain_events_awaiting_threshold_conf.iter() {
 			if entry.txid == *txid {
-				height = Some(entry.height);
+				removed_height = Some(entry.height);
 				break;
 			}
 		}
 
-		if let Some(height) = height {
-			log_info!(logger, "transaction_unconfirmed of txid {} implies height {} was reorg'd out", txid, height);
-			self.onchain_events_awaiting_threshold_conf.retain(|ref entry| entry.height < height);
+		if let Some(removed_height) = removed_height {
+			log_info!(logger, "transaction_unconfirmed of txid {} implies height {} was reorg'd out", txid, removed_height);
+			self.onchain_events_awaiting_threshold_conf.retain(|ref entry| if entry.height >= removed_height {
+				log_info!(logger, "Transaction {} reorg'd out", entry.txid);
+				false
+			} else { true });
 		}
 
 		debug_assert!(!self.onchain_events_awaiting_threshold_conf.iter().any(|ref entry| entry.txid == *txid));