X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Fmacro_logger.rs;h=f962251cd65bd7baf072a9bcbfa0d731d4bfec64;hb=3eb61f7e9b55531626936cf84c57cd7530a878a4;hp=e83e6e2ee48ea27d40327c4e56cb50e2827e94fc;hpb=50d12600b43c0c4a65547c6d37fca3efce0a12f2;p=rust-lightning

diff --git a/lightning/src/util/macro_logger.rs b/lightning/src/util/macro_logger.rs
index e83e6e2e..f962251c 100644
--- a/lightning/src/util/macro_logger.rs
+++ b/lightning/src/util/macro_logger.rs
@@ -7,15 +7,19 @@
 // You may not use this file except in accordance with one or both of these
 // licenses.
 
-use crate::chain::transaction::OutPoint;
-use crate::chain::keysinterface::SpendableOutputDescriptor;
+use crate::ln::ChannelId;
+use crate::sign::SpendableOutputDescriptor;
 
-use bitcoin::hash_types::Txid;
 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) => {
+		$crate::util::logger::DebugIter($obj)
+	}
+}
 
 /// Logs a pubkey in hex format.
 #[macro_export]
@@ -33,30 +37,17 @@ 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(())
-	}
-}
-macro_rules! log_funding_channel_id {
-	($funding_txid: expr, $funding_txo: expr) => {
-		$crate::util::macro_logger::DebugFundingChannelId(&$funding_txid, $funding_txo)
-	}
-}
-
-pub(crate) struct DebugFundingInfo<'a, T: 'a>(pub &'a (OutPoint, T));
-impl<'a, T> core::fmt::Display for DebugFundingInfo<'a, T> {
+pub(crate) struct DebugFundingInfo<'a>(pub &'a ChannelId);
+impl<'a> core::fmt::Display for DebugFundingInfo<'a> {
 	fn fmt(&self, f: &mut core::fmt::Formatter) -> Result<(), core::fmt::Error> {
-		DebugBytes(&(self.0).0.to_channel_id()[..]).fmt(f)
+		self.0.fmt(f)
 	}
 }
 macro_rules! log_funding_info {
 	($key_storage: expr) => {
-		$crate::util::macro_logger::DebugFundingInfo(&$key_storage.get_funding_txo())
+		$crate::util::macro_logger::DebugFundingInfo(
+			&$key_storage.channel_id()
+		)
 	}
 }
 
@@ -65,9 +56,10 @@ impl<'a> core::fmt::Display for DebugRoute<'a> {
 	fn fmt(&self, f: &mut core::fmt::Formatter) -> Result<(), core::fmt::Error> {
 		for (idx, p) in self.0.paths.iter().enumerate() {
 			writeln!(f, "path {}:", idx)?;
-			for h in p.iter() {
+			for h in p.hops.iter() {
 				writeln!(f, " node_id: {}, short_channel_id: {}, fee_msat: {}, cltv_expiry_delta: {}", log_pubkey!(h.pubkey), h.short_channel_id, h.fee_msat, h.cltv_expiry_delta)?;
 			}
+			writeln!(f, " blinded_tail: {:?}", p.blinded_tail)?;
 		}
 		Ok(())
 	}
@@ -156,7 +148,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!()))
 	);
 }
 
@@ -167,17 +159,17 @@ macro_rules! log_given_level {
 	($logger: expr, $lvl:expr, $($arg:tt)+) => (
 		match $lvl {
 			#[cfg(not(any(feature = "max_level_off")))]
-			$crate::util::logger::Level::Error => log_internal!($logger, $lvl, $($arg)*),
+			$crate::util::logger::Level::Error => $crate::log_internal!($logger, $lvl, $($arg)*),
 			#[cfg(not(any(feature = "max_level_off", feature = "max_level_error")))]
-			$crate::util::logger::Level::Warn => log_internal!($logger, $lvl, $($arg)*),
+			$crate::util::logger::Level::Warn => $crate::log_internal!($logger, $lvl, $($arg)*),
 			#[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn")))]
-			$crate::util::logger::Level::Info => log_internal!($logger, $lvl, $($arg)*),
+			$crate::util::logger::Level::Info => $crate::log_internal!($logger, $lvl, $($arg)*),
 			#[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info")))]
-			$crate::util::logger::Level::Debug => log_internal!($logger, $lvl, $($arg)*),
+			$crate::util::logger::Level::Debug => $crate::log_internal!($logger, $lvl, $($arg)*),
 			#[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info", feature = "max_level_debug")))]
-			$crate::util::logger::Level::Trace => log_internal!($logger, $lvl, $($arg)*),
+			$crate::util::logger::Level::Trace => $crate::log_internal!($logger, $lvl, $($arg)*),
 			#[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info", feature = "max_level_debug", feature = "max_level_trace")))]
-			$crate::util::logger::Level::Gossip => log_internal!($logger, $lvl, $($arg)*),
+			$crate::util::logger::Level::Gossip => $crate::log_internal!($logger, $lvl, $($arg)*),
 
 			#[cfg(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info", feature = "max_level_debug", feature = "max_level_trace"))]
 			_ => {
@@ -191,7 +183,7 @@ macro_rules! log_given_level {
 #[macro_export]
 macro_rules! log_error {
 	($logger: expr, $($arg:tt)*) => (
-		log_given_level!($logger, $crate::util::logger::Level::Error, $($arg)*);
+		$crate::log_given_level!($logger, $crate::util::logger::Level::Error, $($arg)*);
 	)
 }
 
@@ -199,7 +191,7 @@ macro_rules! log_error {
 #[macro_export]
 macro_rules! log_warn {
 	($logger: expr, $($arg:tt)*) => (
-		log_given_level!($logger, $crate::util::logger::Level::Warn, $($arg)*);
+		$crate::log_given_level!($logger, $crate::util::logger::Level::Warn, $($arg)*);
 	)
 }
 
@@ -207,7 +199,7 @@ macro_rules! log_warn {
 #[macro_export]
 macro_rules! log_info {
 	($logger: expr, $($arg:tt)*) => (
-		log_given_level!($logger, $crate::util::logger::Level::Info, $($arg)*);
+		$crate::log_given_level!($logger, $crate::util::logger::Level::Info, $($arg)*);
 	)
 }
 
@@ -215,7 +207,7 @@ macro_rules! log_info {
 #[macro_export]
 macro_rules! log_debug {
 	($logger: expr, $($arg:tt)*) => (
-		log_given_level!($logger, $crate::util::logger::Level::Debug, $($arg)*);
+		$crate::log_given_level!($logger, $crate::util::logger::Level::Debug, $($arg)*);
 	)
 }
 
@@ -223,7 +215,7 @@ macro_rules! log_debug {
 #[macro_export]
 macro_rules! log_trace {
 	($logger: expr, $($arg:tt)*) => (
-		log_given_level!($logger, $crate::util::logger::Level::Trace, $($arg)*)
+		$crate::log_given_level!($logger, $crate::util::logger::Level::Trace, $($arg)*)
 	)
 }
 
@@ -231,6 +223,6 @@ macro_rules! log_trace {
 #[macro_export]
 macro_rules! log_gossip {
 	($logger: expr, $($arg:tt)*) => (
-		log_given_level!($logger, $crate::util::logger::Level::Gossip, $($arg)*);
+		$crate::log_given_level!($logger, $crate::util::logger::Level::Gossip, $($arg)*);
 	)
 }