Add peer_id and channel_id to logging for utils.rs

Author: henghonglee

lightning-invoice/src/utils.rs

@@ -236,7 +236,7 @@ where
 	let mut phantom_hints: Vec<Vec<RouteHint>> = Vec::new();
 
 	for PhantomRouteHints { channels, phantom_scid, real_node_pubkey } in phantom_route_hints {
-		log_trace!(logger, None, None, "Generating phantom route hints for node {}",
+		log_trace!(logger, Some(real_node_pubkey), None, "Generating phantom route hints for node {}",
 			log_pubkey!(real_node_pubkey));
 		let mut route_hints = sort_and_filter_channels(channels, amt_msat, &logger);
 
@@ -587,7 +587,7 @@ fn sort_and_filter_channels<L: Deref>(
 	log_trace!(logger, None, None, "Considering {} channels for invoice route hints", channels.len());
 	for channel in channels.into_iter().filter(|chan| chan.is_channel_ready) {
 		if channel.get_inbound_payment_scid().is_none() || channel.counterparty.forwarding_info.is_none() {
-			log_trace!(logger, None, None, "Ignoring channel {} for invoice route hints", log_bytes!(channel.channel_id));
+			log_trace!(logger, Some(channel.counterparty.node_id), Some(channel.channel_id), "Ignoring channel {} for invoice route hints", log_bytes!(channel.channel_id));
 			continue;
 		}
 
@@ -600,15 +600,15 @@ fn sort_and_filter_channels<L: Deref>(
 			} else {
 				// If any public channel exists, return no hints and let the sender
 				// look at the public channels instead.
-				log_trace!(logger, None, None, "Not including channels in invoice route hints on account of public channel {}",
+				log_trace!(logger, Some(channel.counterparty.node_id), Some(channel.channel_id), "Not including channels in invoice route hints on account of public channel {}",
 					log_bytes!(channel.channel_id));
 				return vec![]
 			}
 		}
 
 		if channel.inbound_capacity_msat >= min_inbound_capacity {
 			if !min_capacity_channel_exists {
-				log_trace!(logger, None, None, "Channel with enough inbound capacity exists for invoice route hints");
+				log_trace!(logger, Some(channel.counterparty.node_id), Some(channel.channel_id), "Channel with enough inbound capacity exists for invoice route hints");
 				min_capacity_channel_exists = true;
 			}
 
@@ -618,7 +618,7 @@ fn sort_and_filter_channels<L: Deref>(
 		}
 
 		if channel.is_usable && !online_channel_exists {
-			log_trace!(logger, None, None, "Channel with connected peer exists for invoice route hints");
+			log_trace!(logger, Some(channel.counterparty.node_id), Some(channel.channel_id), "Channel with connected peer exists for invoice route hints");
 			online_channel_exists = true;
 		}
 
@@ -703,14 +703,14 @@ fn sort_and_filter_channels<L: Deref>(
 			} else { true };
 
 			if include_channel {
-				log_trace!(logger, None, None, "Including channel {} in invoice route hints",
+				log_trace!(logger, Some(channel.counterparty.node_id), Some(channel.channel_id), "Including channel {} in invoice route hints",
 					log_bytes!(channel.channel_id));
 			} else if !has_enough_capacity {
-				log_trace!(logger, None, None, "Ignoring channel {} without enough capacity for invoice route hints",
+				log_trace!(logger, Some(channel.counterparty.node_id), Some(channel.channel_id), "Ignoring channel {} without enough capacity for invoice route hints",
 					log_bytes!(channel.channel_id));
 			} else {
 				debug_assert!(!channel.is_usable || (has_pub_unconf_chan && !channel.is_public));
-				log_trace!(logger, None, None, "Ignoring channel {} with disconnected peer",
+				log_trace!(logger, Some(channel.counterparty.node_id), Some(channel.channel_id), "Ignoring channel {} with disconnected peer",
 					log_bytes!(channel.channel_id));
 			}