f re-add constants, but not public ones

Author: TheBlueMatt

lightning/src/chain/channelmonitor.rs

@@ -102,6 +102,10 @@ pub struct ChannelMonitorUpdate {
 	pub channel_id: Option<ChannelId>,
 }
 
+/// LDK prior to 0.1 used this constant as the [`ChannelMonitorUpdate::update_id`] for any
+/// [`ChannelMonitorUpdate`]s which were generated after the channel was closed.
+const LEGACY_CLOSED_CHANNEL_UPDATE_ID: u64 = core::u64::MAX;
+
 impl Writeable for ChannelMonitorUpdate {
 	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
 		write_ver_prefix!(w, SERIALIZATION_VERSION, MIN_SERIALIZATION_VERSION);
@@ -3106,10 +3110,10 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 		F::Target: FeeEstimator,
 		L::Target: Logger,
 	{
-		if self.latest_update_id == u64::MAX && updates.update_id == u64::MAX {
+		if self.latest_update_id == LEGACY_CLOSED_CHANNEL_UPDATE_ID && updates.update_id == LEGACY_CLOSED_CHANNEL_UPDATE_ID {
 			log_info!(logger, "Applying pre-0.1 post-force-closed update to monitor {} with {} change(s).",
 				log_funding_info!(self), updates.updates.len());
-		} else if updates.update_id == u64::MAX {
+		} else if updates.update_id == LEGACY_CLOSED_CHANNEL_UPDATE_ID {
 			log_info!(logger, "Applying pre-0.1 force close update to monitor {} with {} change(s).",
 				log_funding_info!(self), updates.updates.len());
 		} else {
@@ -3133,7 +3137,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 		// The `ChannelManager` may also queue redundant `ChannelForceClosed` updates if it still
 		// thinks the channel needs to have its commitment transaction broadcast, so we'll allow
 		// them as well.
-		if updates.update_id == u64::MAX || self.lockdown_from_offchain {
+		if updates.update_id == LEGACY_CLOSED_CHANNEL_UPDATE_ID || self.lockdown_from_offchain {
 			assert_eq!(updates.updates.len(), 1);
 			match updates.updates[0] {
 				ChannelMonitorUpdateStep::ChannelForceClosed { .. } => {},

lightning/src/util/persist.rs

@@ -732,9 +732,11 @@ where
 		&self, funding_txo: OutPoint, update: Option<&ChannelMonitorUpdate>,
 		monitor: &ChannelMonitor<ChannelSigner>,
 	) -> chain::ChannelMonitorUpdateStatus {
+		const LEGACY_CLOSED_CHANNEL_UPDATE_ID: u64 = u64::MAX;
 		if let Some(update) = update {
-			if update.update_id != u64::MAX && update.update_id % self.maximum_pending_updates != 0
-			{
+			let persist_update = update.update_id != LEGACY_CLOSED_CHANNEL_UPDATE_ID
+				&& update.update_id % self.maximum_pending_updates != 0;
+			if persist_update {
 				let monitor_name = MonitorName::from(funding_txo);
 				let update_name = UpdateName::from(update.update_id);
 				match self.kv_store.write(
@@ -761,22 +763,24 @@ where
 				// In case of channel-close monitor update, we need to read old monitor before persisting
 				// the new one in order to determine the cleanup range.
 				let maybe_old_monitor = match monitor.get_latest_update_id() {
-					u64::MAX => self.read_monitor(&monitor_name).ok(),
+					LEGACY_CLOSED_CHANNEL_UPDATE_ID => self.read_monitor(&monitor_name).ok(),
 					_ => None,
 				};
 
 				// We could write this update, but it meets criteria of our design that calls for a full monitor write.
 				let monitor_update_status = self.persist_new_channel(funding_txo, monitor);
 
 				if let chain::ChannelMonitorUpdateStatus::Completed = monitor_update_status {
-					let cleanup_range = if monitor.get_latest_update_id() == u64::MAX {
+					let channel_closed_legacy =
+						monitor.get_latest_update_id() == LEGACY_CLOSED_CHANNEL_UPDATE_ID;
+					let cleanup_range = if channel_closed_legacy {
 						// If there is an error while reading old monitor, we skip clean up.
 						maybe_old_monitor.map(|(_, ref old_monitor)| {
 							let start = old_monitor.get_latest_update_id();
-							// We never persist an update with update_id = u64::MAX
+							// We never persist an update with the leagacy closed update_id
 							let end = cmp::min(
 								start.saturating_add(self.maximum_pending_updates),
-								u64::MAX - 1,
+								LEGACY_CLOSED_CHANNEL_UPDATE_ID - 1,
 							);
 							(start, end)
 						})