X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=lightning%2Fsrc%2Futil%2Fmacro_logger.rs;h=1f9cb1ad27e62d21f916272be115deca7d26710d;hb=9faf6ca85f61058f0b4eba227b8dc848f07942e5;hp=5a70241428bacf3d974d86bc96b349ec37ac544f;hpb=8bd155e77482273c8b6e278f8282dc267144a8a7;p=rust-lightning

diff --git a/lightning/src/util/macro_logger.rs b/lightning/src/util/macro_logger.rs
index 5a702414..1f9cb1ad 100644
--- a/lightning/src/util/macro_logger.rs
+++ b/lightning/src/util/macro_logger.rs
@@ -66,22 +66,18 @@ impl<'a, T> std::fmt::Display for DebugFundingInfo<'a, T> {
 }
 macro_rules! log_funding_info {
 	($key_storage: expr) => {
-		match $key_storage {
-			Storage::Local { ref funding_info, .. } => {
-				::util::macro_logger::DebugFundingInfo(&funding_info)
-			},
-			Storage::Watchtower { .. } => {
-				::util::macro_logger::DebugFundingInfo(&None)
-			}
-		}
+		::util::macro_logger::DebugFundingInfo(&$key_storage.funding_info)
 	}
 }
 
 pub(crate) struct DebugRoute<'a>(pub &'a Route);
 impl<'a> std::fmt::Display for DebugRoute<'a> {
 	fn fmt(&self, f: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> {
-		for h in self.0.hops.iter() {
-			write!(f, "node_id: {}, short_channel_id: {}, fee_msat: {}, cltv_expiry_delta: {}\n", log_pubkey!(h.pubkey), h.short_channel_id, h.fee_msat, h.cltv_expiry_delta)?;
+		for (idx, p) in self.0.paths.iter().enumerate() {
+			write!(f, "path {}:\n", idx)?;
+			for h in p.iter() {
+				write!(f, " node_id: {}, short_channel_id: {}, fee_msat: {}, cltv_expiry_delta: {}\n", log_pubkey!(h.pubkey), h.short_channel_id, h.fee_msat, h.cltv_expiry_delta)?;
+			}
 		}
 		Ok(())
 	}