Remove now-unused param from monitor_updating_paused

In the previous commit, we removed the InboundHTLCResolution::Resolved enum
variant, which caused us to never provide any HTLCs in this now-removed
parameter.

Author: valentinewallace

lightning/src/ln/channel.rs

@@ -7493,14 +7493,7 @@ where
 					}
 				}
 
-				self.monitor_updating_paused(
-					false,
-					!update_blocked,
-					false,
-					Vec::new(),
-					Vec::new(),
-					Vec::new(),
-				);
+				self.monitor_updating_paused(false, !update_blocked, false, Vec::new(), Vec::new());
 				UpdateFulfillCommitFetch::NewClaim { monitor_update, htlc_value_msat }
 			},
 			UpdateFulfillFetch::DuplicateClaim {} => UpdateFulfillCommitFetch::DuplicateClaim {},
@@ -7921,7 +7914,7 @@ where
 
 		log_info!(logger, "Received initial commitment_signed from peer for channel {}", &self.context.channel_id());
 
-		self.monitor_updating_paused(false, false, false, Vec::new(), Vec::new(), Vec::new());
+		self.monitor_updating_paused(false, false, false, Vec::new(), Vec::new());
 		self.context.interactive_tx_signing_session.as_mut().expect("signing session should be present").received_commitment_signed();
 		Ok(channel_monitor)
 	}
@@ -8025,7 +8018,7 @@ where
 			.as_mut()
 			.expect("Signing session must exist for negotiated pending splice")
 			.received_commitment_signed();
-		self.monitor_updating_paused(false, false, false, Vec::new(), Vec::new(), Vec::new());
+		self.monitor_updating_paused(false, false, false, Vec::new(), Vec::new());
 
 		Ok(self.push_ret_blockable_mon_update(monitor_update))
 	}
@@ -8330,14 +8323,7 @@ where
 
 		log_debug!(logger, "Received valid commitment_signed from peer in channel {}, updating HTLC state and responding with{} a revoke_and_ack.",
 			&self.context.channel_id(), if need_commitment_signed { " our own commitment_signed and" } else { "" });
-		self.monitor_updating_paused(
-			true,
-			need_commitment_signed,
-			false,
-			Vec::new(),
-			Vec::new(),
-			Vec::new(),
-		);
+		self.monitor_updating_paused(true, need_commitment_signed, false, Vec::new(), Vec::new());
 		return Ok(self.push_ret_blockable_mon_update(monitor_update));
 	}
 
@@ -8542,7 +8528,7 @@ where
 				if update_fee.is_some() { "a fee update, " } else { "" },
 				update_add_count, update_fulfill_count, update_fail_count);
 
-			self.monitor_updating_paused(false, true, false, Vec::new(), Vec::new(), Vec::new());
+			self.monitor_updating_paused(false, true, false, Vec::new(), Vec::new());
 			(self.push_ret_blockable_mon_update(monitor_update), htlcs_to_fail)
 		} else {
 			(None, Vec::new())
@@ -8677,7 +8663,6 @@ where
 		}
 
 		log_trace!(logger, "Updating HTLCs on receipt of RAA...");
-		let mut to_forward_infos = Vec::new();
 		let mut pending_update_adds = Vec::new();
 		let mut revoked_htlcs = Vec::new();
 		let mut finalized_claimed_htlcs = Vec::new();
@@ -8878,7 +8863,6 @@ where
 					false,
 					true,
 					false,
-					to_forward_infos,
 					revoked_htlcs,
 					finalized_claimed_htlcs,
 				);
@@ -8925,7 +8909,6 @@ where
 						false,
 						true,
 						false,
-						to_forward_infos,
 						revoked_htlcs,
 						finalized_claimed_htlcs,
 					);
@@ -8938,7 +8921,6 @@ where
 						false,
 						false,
 						false,
-						to_forward_infos,
 						revoked_htlcs,
 						finalized_claimed_htlcs,
 					);
@@ -9343,14 +9325,12 @@ where
 	/// [`ChannelMonitorUpdateStatus::InProgress`]: crate::chain::ChannelMonitorUpdateStatus::InProgress
 	fn monitor_updating_paused(
 		&mut self, resend_raa: bool, resend_commitment: bool, resend_channel_ready: bool,
-		mut pending_forwards: Vec<(PendingHTLCInfo, u64)>,
 		mut pending_fails: Vec<(HTLCSource, PaymentHash, HTLCFailReason)>,
 		mut pending_finalized_claimed_htlcs: Vec<(HTLCSource, Option<AttributionData>)>,
 	) {
 		self.context.monitor_pending_revoke_and_ack |= resend_raa;
 		self.context.monitor_pending_commitment_signed |= resend_commitment;
 		self.context.monitor_pending_channel_ready |= resend_channel_ready;
-		self.context.monitor_pending_forwards.append(&mut pending_forwards);
 		self.context.monitor_pending_failures.append(&mut pending_fails);
 		self.context
 			.monitor_pending_finalized_fulfills
@@ -10515,7 +10495,7 @@ where
 				}],
 				channel_id: Some(self.context.channel_id()),
 			};
-			self.monitor_updating_paused(false, false, false, Vec::new(), Vec::new(), Vec::new());
+			self.monitor_updating_paused(false, false, false, Vec::new(), Vec::new());
 			self.push_ret_blockable_mon_update(monitor_update)
 		} else {
 			None
@@ -11272,7 +11252,7 @@ where
 			}],
 			channel_id: Some(self.context.channel_id()),
 		};
-		self.monitor_updating_paused(false, false, false, Vec::new(), Vec::new(), Vec::new());
+		self.monitor_updating_paused(false, false, false, Vec::new(), Vec::new());
 		let monitor_update = self.push_ret_blockable_mon_update(monitor_update);
 
 		let announcement_sigs =
@@ -12996,7 +12976,7 @@ where
 		let can_add_htlc = send_res.map_err(|(_, msg)| ChannelError::Ignore(msg))?;
 		if can_add_htlc {
 			let monitor_update = self.build_commitment_no_status_check(logger);
-			self.monitor_updating_paused(false, true, false, Vec::new(), Vec::new(), Vec::new());
+			self.monitor_updating_paused(false, true, false, Vec::new(), Vec::new());
 			Ok(self.push_ret_blockable_mon_update(monitor_update))
 		} else {
 			Ok(None)
@@ -13113,7 +13093,7 @@ where
 				}],
 				channel_id: Some(self.context.channel_id()),
 			};
-			self.monitor_updating_paused(false, false, false, Vec::new(), Vec::new(), Vec::new());
+			self.monitor_updating_paused(false, false, false, Vec::new(), Vec::new());
 			self.push_ret_blockable_mon_update(monitor_update)
 		} else {
 			None
@@ -13723,7 +13703,7 @@ where
 
 		let need_channel_ready = channel.check_get_channel_ready(0, logger).is_some()
 			|| channel.context.signer_pending_channel_ready;
-		channel.monitor_updating_paused(false, false, need_channel_ready, Vec::new(), Vec::new(), Vec::new());
+		channel.monitor_updating_paused(false, false, need_channel_ready, Vec::new(), Vec::new());
 		Ok((channel, channel_monitor))
 	}
 
@@ -14010,7 +13990,7 @@ where
 		};
 		let need_channel_ready = channel.check_get_channel_ready(0, logger).is_some()
 			|| channel.context.signer_pending_channel_ready;
-		channel.monitor_updating_paused(false, false, need_channel_ready, Vec::new(), Vec::new(), Vec::new());
+		channel.monitor_updating_paused(false, false, need_channel_ready, Vec::new(), Vec::new());
 
 		Ok((channel, funding_signed, channel_monitor))
 	}