Deduplicate payment hash logging

Author: joostjager

lightning/src/ln/channelmanager.rs

@@ -5243,7 +5243,7 @@ where
 		.map_err(|e| {
 			let first_hop_key = Some(path.hops.first().unwrap().pubkey);
 			let logger = WithContext::from(&self.logger, first_hop_key, None, Some(*payment_hash));
-			log_error!(logger, "Failed to build an onion for path for payment hash {payment_hash}");
+			log_error!(logger, "Failed to build an onion for path");
 			e
 		})?;
 
@@ -5272,7 +5272,7 @@ where
 			);
 			log_trace!(
 				logger,
-				"Attempting to send payment with payment hash {payment_hash} along path with next hop {first_chan_scid}"
+				"Attempting to send payment along path with next hop {first_chan_scid}"
 			);
 
 			let per_peer_state = self.per_peer_state.read().unwrap();
@@ -7488,8 +7488,13 @@ where
 						} else {
 							"alternate"
 						};
-					log_trace!(logger, "Forwarding HTLC from SCID {} with payment_hash {} and next hop SCID {} over {}",
-						prev_outbound_scid_alias, &payment_hash, short_chan_id, channel_description);
+					log_trace!(
+						logger,
+						"Forwarding HTLC from SCID {} with next hop SCID {} over {}",
+						prev_outbound_scid_alias,
+						short_chan_id,
+						channel_description
+					);
 					if let Err((reason, msg)) = optimal_channel.queue_add_htlc(
 						*outgoing_amt_msat,
 						*payment_hash,
@@ -7501,12 +7506,7 @@ where
 						&self.fee_estimator,
 						&&logger,
 					) {
-						log_trace!(
-							logger,
-							"Failed to forward HTLC with payment_hash {}: {}",
-							&payment_hash,
-							msg
-						);
+						log_trace!(logger, "Failed to forward HTLC: {}", msg);
 
 						if let Some(chan) = peer_state
 							.channel_by_id
@@ -8561,9 +8561,8 @@ where
 			}) => {
 				log_trace!(
 					WithContext::from(&self.logger, None, Some(*channel_id), Some(*payment_hash)),
-					"Failing {}HTLC with payment_hash {} backwards from us: {:?}",
+					"Failing {}HTLC backwards from us: {:?}",
 					if blinded_failure.is_some() { "blinded " } else { "" },
-					&payment_hash,
 					onion_error
 				);
 				// In case of trampoline + phantom we prioritize the trampoline failure over the phantom failure.
@@ -12055,11 +12054,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 								None,
 							);
 						} else {
-							log_trace!(
-								logger,
-								"Failing HTLC with hash {} from our monitor",
-								&htlc_update.payment_hash
-							);
+							log_trace!(logger, "Failing HTLC from our monitor");
 							let failure_reason = LocalHTLCFailureReason::OnChainTimeout;
 							let receiver = HTLCHandlingFailureType::Forward {
 								node_id: Some(counterparty_node_id),
@@ -16920,8 +16915,7 @@ where
 								Some(*payment_hash),
 							);
 							log_info!(logger,
-								"Failing HTLC with hash {} as it is missing in the ChannelMonitor but was present in the (stale) ChannelManager",
-								&payment_hash);
+								"Failing HTLC as it is missing in the ChannelMonitor but was present in the (stale) ChannelManager");
 							failed_htlcs.push((
 								channel_htlc_source.clone(),
 								*payment_hash,
@@ -17575,18 +17569,20 @@ where
 								// still have an entry for this HTLC in `forward_htlcs` or
 								// `pending_intercepted_htlcs`, we were apparently not persisted after
 								// the monitor was when forwarding the payment.
-								decode_update_add_htlcs.retain(|src_outb_alias, update_add_htlcs| {
-									update_add_htlcs.retain(|update_add_htlc| {
-										let matches = *src_outb_alias == prev_hop_data.prev_outbound_scid_alias &&
-											update_add_htlc.htlc_id == prev_hop_data.htlc_id;
-										if matches {
-											log_info!(logger, "Removing pending to-decode HTLC with hash {} as it was forwarded to the closed channel",
-												&htlc.payment_hash);
-										}
-										!matches
-									});
-									!update_add_htlcs.is_empty()
-								});
+								decode_update_add_htlcs.retain(
+									|src_outb_alias, update_add_htlcs| {
+										update_add_htlcs.retain(|update_add_htlc| {
+											let matches = *src_outb_alias
+												== prev_hop_data.prev_outbound_scid_alias
+												&& update_add_htlc.htlc_id == prev_hop_data.htlc_id;
+											if matches {
+												log_info!(logger, "Removing pending to-decode HTLC as it was forwarded to the closed channel");
+											}
+											!matches
+										});
+										!update_add_htlcs.is_empty()
+									},
+								);
 								forward_htlcs.retain(|_, forwards| {
 									forwards.retain(|forward| {
 										if let HTLCForwardInfo::AddHTLC(htlc_info) = forward {