X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Fmacro_logger.rs;h=6e98272f3171d2bc47082c4171b6e4013800e911;hb=a5ecb851716bc0819586894232653ec4b5e2c67f;hp=01a0d3ff45f192b4744a8d9ef20eb614bf3f169d;hpb=71f4749e1c0d48a916c1ba3b0631d7796f61c074;p=rust-lightning

diff --git a/lightning/src/util/macro_logger.rs b/lightning/src/util/macro_logger.rs
index 01a0d3ff..6e98272f 100644
--- a/lightning/src/util/macro_logger.rs
+++ b/lightning/src/util/macro_logger.rs
@@ -7,29 +7,21 @@
 // You may not use this file except in accordance with one or both of these
 // licenses.
 
-use chain::transaction::OutPoint;
-use chain::keysinterface::SpendableOutputDescriptor;
+use crate::chain::transaction::OutPoint;
+use crate::chain::keysinterface::SpendableOutputDescriptor;
 
 use bitcoin::hash_types::Txid;
 use bitcoin::blockdata::transaction::Transaction;
-use bitcoin::secp256k1::PublicKey;
 
-use routing::router::Route;
-use ln::chan_utils::HTLCClaim;
-use util::logger::DebugBytes;
+use crate::routing::router::Route;
+use crate::ln::chan_utils::HTLCClaim;
+use crate::util::logger::DebugBytes;
 
-pub(crate) struct DebugPubKey<'a>(pub &'a PublicKey);
-impl<'a> core::fmt::Display for DebugPubKey<'a> {
-	fn fmt(&self, f: &mut core::fmt::Formatter) -> Result<(), core::fmt::Error> {
-		for i in self.0.serialize().iter() {
-			write!(f, "{:02x}", i)?;
-		}
-		Ok(())
-	}
-}
+/// Logs a pubkey in hex format.
+#[macro_export]
 macro_rules! log_pubkey {
 	($obj: expr) => {
-		::util::macro_logger::DebugPubKey(&$obj)
+		$crate::util::logger::DebugPubKey(&$obj)
 	}
 }
 
@@ -52,7 +44,7 @@ impl<'a> core::fmt::Display for DebugFundingChannelId<'a> {
 }
 macro_rules! log_funding_channel_id {
 	($funding_txid: expr, $funding_txo: expr) => {
-		::util::macro_logger::DebugFundingChannelId(&$funding_txid, $funding_txo)
+		$crate::util::macro_logger::DebugFundingChannelId(&$funding_txid, $funding_txo)
 	}
 }
 
@@ -64,7 +56,7 @@ impl<'a, T> core::fmt::Display for DebugFundingInfo<'a, T> {
 }
 macro_rules! log_funding_info {
 	($key_storage: expr) => {
-		::util::macro_logger::DebugFundingInfo(&$key_storage.get_funding_txo())
+		$crate::util::macro_logger::DebugFundingInfo(&$key_storage.get_funding_txo())
 	}
 }
 
@@ -82,7 +74,7 @@ impl<'a> core::fmt::Display for DebugRoute<'a> {
 }
 macro_rules! log_route {
 	($obj: expr) => {
-		::util::macro_logger::DebugRoute(&$obj)
+		$crate::util::macro_logger::DebugRoute(&$obj)
 	}
 }
 
@@ -115,7 +107,7 @@ impl<'a> core::fmt::Display for DebugTx<'a> {
 					}
 				}
 				if num_preimage > 0 || num_timeout > 0 || num_revoked > 0 {
-					write!(f, "HTLC claim tx ({} preimage, {} timeout, {} revoked)",
+					write!(f, "HTLC claim tx ({} preimage, {} timeout, {} revoked) ",
 						num_preimage, num_timeout, num_revoked)?;
 				}
 			}
@@ -130,7 +122,7 @@ impl<'a> core::fmt::Display for DebugTx<'a> {
 
 macro_rules! log_tx {
 	($obj: expr) => {
-		::util::macro_logger::DebugTx(&$obj)
+		$crate::util::macro_logger::DebugTx(&$obj)
 	}
 }
 
@@ -154,7 +146,7 @@ impl<'a> core::fmt::Display for DebugSpendable<'a> {
 
 macro_rules! log_spendable {
 	($obj: expr) => {
-		::util::macro_logger::DebugSpendable(&$obj)
+		$crate::util::macro_logger::DebugSpendable(&$obj)
 	}
 }
 
@@ -175,17 +167,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"))]
 			_ => {
@@ -199,7 +191,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)*);
 	)
 }
 
@@ -207,7 +199,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)*);
 	)
 }
 
@@ -215,7 +207,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)*);
 	)
 }
 
@@ -223,7 +215,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)*);
 	)
 }
 
@@ -231,7 +223,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)*)
 	)
 }
 
@@ -239,6 +231,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)*);
 	)
 }