From: Matt Corallo <git@bluematt.me>
Date: Wed, 30 Aug 2023 18:19:35 +0000 (+0000)
Subject: Drop `ChannelMonitorUpdate::UpdateFailed` as its now unused
X-Git-Tag: v0.0.117-alpha1~2^2~7
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=6e115db22b1e1f89f62c958af1300ec0a47ef27a;p=rust-lightning

Drop `ChannelMonitorUpdate::UpdateFailed` as its now unused
---

diff --git a/lightning/src/chain/chainmonitor.rs b/lightning/src/chain/chainmonitor.rs
index 09f72c594..4e349799d 100644
--- a/lightning/src/chain/chainmonitor.rs
+++ b/lightning/src/chain/chainmonitor.rs
@@ -44,7 +44,7 @@ use crate::prelude::*;
 use crate::sync::{RwLock, RwLockReadGuard, Mutex, MutexGuard};
 use core::iter::FromIterator;
 use core::ops::Deref;
-use core::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
+use core::sync::atomic::{AtomicUsize, Ordering};
 use bitcoin::secp256k1::PublicKey;
 
 #[derive(Clone, Copy, Hash, PartialEq, Eq)]
diff --git a/lightning/src/chain/channelmonitor.rs b/lightning/src/chain/channelmonitor.rs
index 16a9901e4..3e03c2fd5 100644
--- a/lightning/src/chain/channelmonitor.rs
+++ b/lightning/src/chain/channelmonitor.rs
@@ -150,13 +150,10 @@ pub enum MonitorEvent {
 		/// same [`ChannelMonitor`] have been applied and persisted.
 		monitor_update_id: u64,
 	},
-
-	/// Indicates a [`ChannelMonitor`] update has failed.
-	UpdateFailed(OutPoint),
 }
 impl_writeable_tlv_based_enum_upgradable!(MonitorEvent,
-	// Note that Completed and UpdateFailed are currently never serialized to disk as they are
-	// generated only in ChainMonitor
+	// Note that Completed is currently never serialized to disk as it is generated only in
+	// ChainMonitor.
 	(0, Completed) => {
 		(0, funding_txo, required),
 		(2, monitor_update_id, required),
@@ -164,7 +161,7 @@ impl_writeable_tlv_based_enum_upgradable!(MonitorEvent,
 ;
 	(2, HTLCEvent),
 	(4, CommitmentTxConfirmed),
-	(6, UpdateFailed),
+	// 6 was `UpdateFailed` until LDK 0.0.117
 );
 
 /// Simple structure sent back by `chain::Watch` when an HTLC from a forward channel is detected on
diff --git a/lightning/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs
index 35735c389..b068b7a74 100644
--- a/lightning/src/ln/channelmanager.rs
+++ b/lightning/src/ln/channelmanager.rs
@@ -6729,8 +6729,7 @@ where
 							self.fail_htlc_backwards_internal(&htlc_update.source, &htlc_update.payment_hash, &reason, receiver);
 						}
 					},
-					MonitorEvent::CommitmentTxConfirmed(funding_outpoint) |
-					MonitorEvent::UpdateFailed(funding_outpoint) => {
+					MonitorEvent::CommitmentTxConfirmed(funding_outpoint) => {
 						let counterparty_node_id_opt = match counterparty_node_id {
 							Some(cp_id) => Some(cp_id),
 							None => {
@@ -6754,12 +6753,7 @@ where
 												msg: update
 											});
 										}
-										let reason = if let MonitorEvent::UpdateFailed(_) = monitor_event {
-											ClosureReason::ProcessingError { err: "Failed to persist ChannelMonitor update during chain sync".to_string() }
-										} else {
-											ClosureReason::CommitmentTxConfirmed
-										};
-										self.issue_channel_close_events(&chan.context, reason);
+										self.issue_channel_close_events(&chan.context, ClosureReason::CommitmentTxConfirmed);
 										pending_msg_events.push(events::MessageSendEvent::HandleError {
 											node_id: chan.context.get_counterparty_node_id(),
 											action: msgs::ErrorAction::SendErrorMessage {