Delete now-unused MonitorRestoreUpdates::accepted_htlcs

We stopped adding any HTLCs to this vec a few commits ago when we removed
support for HTLCs that were originally received on LDK 0.0.123-.

Author: valentinewallace

lightning/src/ln/channel.rs

@@ -51,8 +51,8 @@ use crate::ln::channel_state::{
 };
 use crate::ln::channelmanager::{
 	self, ChannelReadyOrder, FundingConfirmedMessage, HTLCPreviousHopData, HTLCSource,
-	OpenChannelMessage, PaymentClaimDetails, PendingHTLCInfo, RAACommitmentOrder, SentHTLCId,
-	BREAKDOWN_TIMEOUT, MAX_LOCAL_BREAKDOWN_TIMEOUT, MIN_CLTV_EXPIRY_DELTA,
+	OpenChannelMessage, PaymentClaimDetails, RAACommitmentOrder, SentHTLCId, BREAKDOWN_TIMEOUT,
+	MAX_LOCAL_BREAKDOWN_TIMEOUT, MIN_CLTV_EXPIRY_DELTA,
 };
 use crate::ln::funding::{FundingTxInput, SpliceContribution};
 use crate::ln::interactivetxs::{
@@ -1122,8 +1122,6 @@ pub(super) struct MonitorRestoreUpdates {
 	// A `CommitmentUpdate` to be sent to our channel peer.
 	pub commitment_update: Option<msgs::CommitmentUpdate>,
 	pub commitment_order: RAACommitmentOrder,
-	// TODO: get rid of this
-	pub accepted_htlcs: Vec<(PendingHTLCInfo, u64)>,
 	pub failed_htlcs: Vec<(HTLCSource, PaymentHash, HTLCFailReason)>,
 	pub finalized_claimed_htlcs: Vec<(HTLCSource, Option<AttributionData>)>,
 	// Inbound update_adds that are now irrevocably committed to this channel and are ready for the
@@ -9425,9 +9423,9 @@ where
 			self.context.monitor_pending_commitment_signed = false;
 			return MonitorRestoreUpdates {
 				raa: None, commitment_update: None, commitment_order: RAACommitmentOrder::RevokeAndACKFirst,
-				accepted_htlcs: Vec::new(), failed_htlcs, finalized_claimed_htlcs, pending_update_adds,
-				funding_broadcastable, channel_ready, announcement_sigs, tx_signatures: None,
-				channel_ready_order, committed_outbound_htlc_sources
+				failed_htlcs, finalized_claimed_htlcs, pending_update_adds, funding_broadcastable,
+				channel_ready, announcement_sigs, tx_signatures: None, channel_ready_order,
+				committed_outbound_htlc_sources
 			};
 		}
 
@@ -9456,9 +9454,9 @@ where
 			if commitment_update.is_some() { "a" } else { "no" }, if raa.is_some() { "an" } else { "no" },
 			match commitment_order { RAACommitmentOrder::CommitmentFirst => "commitment", RAACommitmentOrder::RevokeAndACKFirst => "RAA"});
 		MonitorRestoreUpdates {
-			raa, commitment_update, commitment_order, accepted_htlcs: Vec::new(), failed_htlcs, finalized_claimed_htlcs,
-			pending_update_adds, funding_broadcastable, channel_ready, announcement_sigs, tx_signatures: None,
-			channel_ready_order, committed_outbound_htlc_sources
+			raa, commitment_update, commitment_order, failed_htlcs, finalized_claimed_htlcs,
+			pending_update_adds, funding_broadcastable, channel_ready, announcement_sigs,
+			tx_signatures: None, channel_ready_order, committed_outbound_htlc_sources
 		}
 	}
 

lightning/src/ln/channelmanager.rs

@@ -3332,13 +3332,12 @@ macro_rules! handle_monitor_update_completion {
 				None
 			};
 
-			let (htlc_forwards, decode_update_add_htlcs) = $self.handle_channel_resumption(
+			let decode_update_add_htlcs = $self.handle_channel_resumption(
 				&mut $peer_state.pending_msg_events,
 				$chan,
 				updates.raa,
 				updates.commitment_update,
 				updates.commitment_order,
-				updates.accepted_htlcs,
 				updates.pending_update_adds,
 				updates.funding_broadcastable,
 				updates.channel_ready,
@@ -3361,7 +3360,6 @@ macro_rules! handle_monitor_update_completion {
 				cp_node_id,
 				unbroadcasted_batch_funding_txid,
 				update_actions,
-				htlc_forwards,
 				decode_update_add_htlcs,
 				updates.finalized_claimed_htlcs,
 				updates.failed_htlcs,
@@ -9555,7 +9553,6 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 		&self, channel_id: ChannelId, counterparty_node_id: PublicKey,
 		unbroadcasted_batch_funding_txid: Option<Txid>,
 		update_actions: Vec<MonitorUpdateCompletionAction>,
-		htlc_forwards: Option<PerSourcePendingForward>,
 		decode_update_add_htlcs: Option<(u64, Vec<msgs::UpdateAddHTLC>)>,
 		finalized_claimed_htlcs: Vec<(HTLCSource, Option<AttributionData>)>,
 		failed_htlcs: Vec<(HTLCSource, PaymentHash, HTLCFailReason)>,
@@ -9611,9 +9608,6 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 
 		self.handle_monitor_update_completion_actions(update_actions);
 
-		if let Some(forwards) = htlc_forwards {
-			self.forward_htlcs(&mut [forwards][..]);
-		}
 		if let Some(decode) = decode_update_add_htlcs {
 			self.push_decode_update_add_htlcs(decode);
 		}
@@ -9826,17 +9820,16 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 	fn handle_channel_resumption(&self, pending_msg_events: &mut Vec<MessageSendEvent>,
 		channel: &mut FundedChannel<SP>, raa: Option<msgs::RevokeAndACK>,
 		commitment_update: Option<msgs::CommitmentUpdate>, commitment_order: RAACommitmentOrder,
-		pending_forwards: Vec<(PendingHTLCInfo, u64)>, pending_update_adds: Vec<msgs::UpdateAddHTLC>,
-		funding_broadcastable: Option<Transaction>,
+		pending_update_adds: Vec<msgs::UpdateAddHTLC>, funding_broadcastable: Option<Transaction>,
 		channel_ready: Option<msgs::ChannelReady>, announcement_sigs: Option<msgs::AnnouncementSignatures>,
 		tx_signatures: Option<msgs::TxSignatures>, tx_abort: Option<msgs::TxAbort>,
 		channel_ready_order: ChannelReadyOrder,
-	) -> (Option<(u64, PublicKey, OutPoint, ChannelId, u128, Vec<(PendingHTLCInfo, u64)>)>, Option<(u64, Vec<msgs::UpdateAddHTLC>)>) {
+	) -> Option<(u64, Vec<msgs::UpdateAddHTLC>)> {
 		let logger = WithChannelContext::from(&self.logger, &channel.context, None);
-		log_trace!(logger, "Handling channel resumption with {} RAA, {} commitment update, {} pending forwards, {} pending update_add_htlcs, {}broadcasting funding, {} channel ready, {} announcement, {} tx_signatures, {} tx_abort",
+		log_trace!(logger, "Handling channel resumption with {} RAA, {} commitment update, {} pending update_add_htlcs, {}broadcasting funding, {} channel ready, {} announcement, {} tx_signatures, {} tx_abort",
 			if raa.is_some() { "an" } else { "no" },
 			if commitment_update.is_some() { "a" } else { "no" },
-			pending_forwards.len(), pending_update_adds.len(),
+			pending_update_adds.len(),
 			if funding_broadcastable.is_some() { "" } else { "not " },
 			if channel_ready.is_some() { "sending" } else { "without" },
 			if announcement_sigs.is_some() { "sending" } else { "without" },
@@ -9847,14 +9840,6 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 		let counterparty_node_id = channel.context.get_counterparty_node_id();
 		let outbound_scid_alias = channel.context.outbound_scid_alias();
 
-		let mut htlc_forwards = None;
-		if !pending_forwards.is_empty() {
-			htlc_forwards = Some((
-				outbound_scid_alias, channel.context.get_counterparty_node_id(),
-				channel.funding.get_funding_txo().unwrap(), channel.context.channel_id(),
-				channel.context.get_user_id(), pending_forwards
-			));
-		}
 		let mut decode_update_add_htlcs = None;
 		if !pending_update_adds.is_empty() {
 			decode_update_add_htlcs = Some((outbound_scid_alias, pending_update_adds));
@@ -9942,7 +9927,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 					},
 					None => {
 						debug_assert!(false, "Channel resumed without a funding txo, this should never happen!");
-						return (htlc_forwards, decode_update_add_htlcs);
+						return decode_update_add_htlcs;
 					}
 				};
 			} else {
@@ -10030,7 +10015,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 			emit_initial_channel_ready_event!(pending_events, channel);
 		}
 
-		(htlc_forwards, decode_update_add_htlcs)
+		decode_update_add_htlcs
 	}
 
 	#[rustfmt::skip]
@@ -12114,12 +12099,11 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 							}
 						}
 						let need_lnd_workaround = chan.context.workaround_lnd_bug_4006.take();
-						let (htlc_forwards, decode_update_add_htlcs) = self.handle_channel_resumption(
+						let decode_update_add_htlcs = self.handle_channel_resumption(
 							&mut peer_state.pending_msg_events, chan, responses.raa, responses.commitment_update, responses.commitment_order,
-							Vec::new(), Vec::new(), None, responses.channel_ready, responses.announcement_sigs,
+							Vec::new(), None, responses.channel_ready, responses.announcement_sigs,
 							responses.tx_signatures, responses.tx_abort, responses.channel_ready_order,
 						);
-						debug_assert!(htlc_forwards.is_none());
 						debug_assert!(decode_update_add_htlcs.is_none());
 						if let Some(upd) = channel_update {
 							peer_state.pending_msg_events.push(upd);