X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Fmacro_logger.rs;h=e79980370342ff01920fe5a37b4423719a228ac7;hb=af3a369ef1ce07057e07c24a1709b494ad62493b;hp=b7224be3ecea8cff537f3ea6373d71fd96716247;hpb=d5b05e54c32cd53e0534849b57242c65747738b1;p=rust-lightning diff --git a/lightning/src/util/macro_logger.rs b/lightning/src/util/macro_logger.rs index b7224be3..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 { @@ -68,6 +74,7 @@ impl<'a> core::fmt::Display for DebugRoute<'a> { 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(()) }