X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Fmacro_logger.rs;h=203c544e0096385c959d124f051bdc15295e958e;hb=bedc2c64fcfe5fa5f85ded630e9ed2eb3c3651eb;hp=e79980370342ff01920fe5a37b4423719a228ac7;hpb=16311f98b3ba6d0e707b21acd002f1dee4971010;p=rust-lightning

diff --git a/lightning/src/util/macro_logger.rs b/lightning/src/util/macro_logger.rs
index e7998037..203c544e 100644
--- a/lightning/src/util/macro_logger.rs
+++ b/lightning/src/util/macro_logger.rs
@@ -15,7 +15,6 @@ use bitcoin::blockdata::transaction::Transaction;
 
 use crate::routing::router::Route;
 use crate::ln::chan_utils::HTLCClaim;
-use crate::util::logger::DebugBytes;
 
 macro_rules! log_iter {
 	($obj: expr) => {
@@ -42,10 +41,7 @@ macro_rules! log_bytes {
 pub(crate) struct DebugFundingChannelId<'a>(pub &'a Txid, pub u16);
 impl<'a> core::fmt::Display for DebugFundingChannelId<'a> {
 	fn fmt(&self, f: &mut core::fmt::Formatter) -> Result<(), core::fmt::Error> {
-		for i in (OutPoint { txid: self.0.clone(), index: self.1 }).to_channel_id().iter() {
-			write!(f, "{:02x}", i)?;
-		}
-		Ok(())
+		(OutPoint { txid: self.0.clone(), index: self.1 }).to_channel_id().fmt(f)
 	}
 }
 macro_rules! log_funding_channel_id {
@@ -57,7 +53,7 @@ macro_rules! log_funding_channel_id {
 pub(crate) struct DebugFundingInfo<'a, T: 'a>(pub &'a (OutPoint, T));
 impl<'a, T> core::fmt::Display for DebugFundingInfo<'a, T> {
 	fn fmt(&self, f: &mut core::fmt::Formatter) -> Result<(), core::fmt::Error> {
-		DebugBytes(&(self.0).0.to_channel_id()[..]).fmt(f)
+		(self.0).0.to_channel_id().fmt(f)
 	}
 }
 macro_rules! log_funding_info {
@@ -163,7 +159,7 @@ macro_rules! log_spendable {
 #[macro_export]
 macro_rules! log_internal {
 	($logger: expr, $lvl:expr, $($arg:tt)+) => (
-		$logger.log(&$crate::util::logger::Record::new($lvl, format_args!($($arg)+), module_path!(), file!(), line!()))
+		$logger.log($crate::util::logger::Record::new($lvl, None, None, format_args!($($arg)+), module_path!(), file!(), line!()))
 	);
 }