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

diff --git a/lightning/src/util/macro_logger.rs b/lightning/src/util/macro_logger.rs
index e83e6e2e..e7998037 100644
--- a/lightning/src/util/macro_logger.rs
+++ b/lightning/src/util/macro_logger.rs
@@ -8,7 +8,7 @@
 // licenses.
 
 use crate::chain::transaction::OutPoint;
-use crate::chain::keysinterface::SpendableOutputDescriptor;
+use crate::sign::SpendableOutputDescriptor;
 
 use bitcoin::hash_types::Txid;
 use bitcoin::blockdata::transaction::Transaction;
@@ -17,6 +17,12 @@ 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]
 macro_rules! log_pubkey {
@@ -65,9 +71,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(())
 	}
@@ -167,17 +174,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 +198,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 +206,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 +214,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 +222,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 +230,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 +238,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)*);
 	)
 }