f remove log_v1_funding_channel_id macro

Author: dunxen

lightning/src/ln/peer_handler.rs

@@ -26,6 +26,7 @@ use crate::ln::msgs;
 use crate::ln::msgs::{ChannelMessageHandler, LightningError, SocketAddress, OnionMessageHandler, RoutingMessageHandler};
 #[cfg(not(c_bindings))]
 use crate::ln::channelmanager::{SimpleArcChannelManager, SimpleRefChannelManager};
+use crate::util::macro_logger::DebugFundingChannelId;
 use crate::util::ser::{VecWriter, Writeable, Writer};
 use crate::ln::peer_channel_encryptor::{PeerChannelEncryptor, NextNoiseStep, MessageBuf, MSG_BUF_ALLOC_SIZE};
 use crate::ln::wire;
@@ -2008,7 +2009,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 							log_debug!(WithContext::from(&self.logger, Some(*node_id), Some(msg.temporary_channel_id)), "Handling SendFundingCreated event in peer_handler for node {} for channel {} (which becomes {})",
 									log_pubkey!(node_id),
 									&msg.temporary_channel_id,
-									log_v1_funding_channel_id!(msg.funding_txid, msg.funding_output_index));
+									DebugFundingChannelId(&msg.funding_txid, msg.funding_output_index));
 							// TODO: If the peer is gone we should generate a DiscardFunding event
 							// indicating to the wallet that they should just throw away this funding transaction
 							self.enqueue_message(&mut *get_peer_for_forwarding!(node_id), msg);

lightning/src/util/macro_logger.rs

@@ -45,11 +45,6 @@ impl<'a> core::fmt::Display for DebugFundingChannelId<'a> {
 		ChannelId::v1_from_funding_outpoint(OutPoint { txid: self.0.clone(), index: self.1 }).fmt(f)
 	}
 }
-macro_rules! log_v1_funding_channel_id {
-	($funding_txid: expr, $funding_txo: expr) => {
-		$crate::util::macro_logger::DebugFundingChannelId(&$funding_txid, $funding_txo)
-	}
-}
 
 pub(crate) struct DebugFundingInfo<'a>(pub &'a ChannelId);
 impl<'a> core::fmt::Display for DebugFundingInfo<'a> {