f Only print enum variant name now that we've dropped Display

Author: carlaKC

lightning/src/ln/channelmanager.rs

@@ -4460,7 +4460,7 @@ where
 
 		log_info!(
 			WithContext::from(&self.logger, Some(*counterparty_node_id), Some(msg.channel_id), Some(msg.payment_hash)),
-			"Failed to accept/forward incoming HTLC: {:?} - {}", reason, reason,
+			"Failed to accept/forward incoming HTLC: {:?}", reason,
 		);
 		// If `msg.blinding_point` is set, we must always fail with malformed.
 		if msg.blinding_point.is_some() {

lightning/src/ln/priv_short_conf_tests.rs

@@ -450,7 +450,7 @@ fn test_inbound_scid_privacy() {
 	check_added_monitors(&nodes[1], 1);
 
 	nodes[1].logger.assert_log_regex("lightning::ln::channelmanager",
-		regex::Regex::new(r"Forward using real SCID over aliased channel rejected").unwrap(), 1);
+		regex::Regex::new(r"RealSCIDForward").unwrap(), 1);
 
 	let mut updates = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
 	nodes[0].node.handle_update_fail_htlc(nodes[1].node.get_our_node_id(), &updates.update_fail_htlcs[0]);