X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Futil%2Fmacro_logger.rs;h=bea3685b546728024bf1da7695dc9f495dcf23ff;hb=HEAD;hp=c10e2c204e9d13e49369b3591953baca1182d1e7;hpb=64bd2eaa7ff9d9f6270af1fb631347fdc08a2885;p=rust-lightning

diff --git a/src/util/macro_logger.rs b/src/util/macro_logger.rs
deleted file mode 100644
index c10e2c20..00000000
--- a/src/util/macro_logger.rs
+++ /dev/null
@@ -1,124 +0,0 @@
-use chain::transaction::OutPoint;
-
-use bitcoin::util::hash::Sha256dHash;
-use secp256k1::key::PublicKey;
-
-use ln::router::Route;
-
-use std;
-
-pub(crate) struct DebugPubKey<'a>(pub &'a PublicKey);
-impl<'a> std::fmt::Display for DebugPubKey<'a> {
-	fn fmt(&self, f: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> {
-		for i in self.0.serialize().iter() {
-			write!(f, "{:02x}", i)?;
-		}
-		Ok(())
-	}
-}
-macro_rules! log_pubkey {
-	($obj: expr) => {
-		::util::macro_logger::DebugPubKey(&$obj)
-	}
-}
-
-pub(crate) struct DebugBytes<'a>(pub &'a [u8]);
-impl<'a> std::fmt::Display for DebugBytes<'a> {
-	fn fmt(&self, f: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> {
-		for i in self.0 {
-			write!(f, "{:02x}", i)?;
-		}
-		Ok(())
-	}
-}
-macro_rules! log_bytes {
-	($obj: expr) => {
-		::util::macro_logger::DebugBytes(&$obj)
-	}
-}
-
-pub(crate) struct DebugFundingChannelId<'a>(pub &'a Sha256dHash, pub u16);
-impl<'a> std::fmt::Display for DebugFundingChannelId<'a> {
-	fn fmt(&self, f: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> {
-		for i in OutPoint::new(self.0.clone(), self.1).to_channel_id().iter() {
-			write!(f, "{:02x}", i)?;
-		}
-		Ok(())
-	}
-}
-macro_rules! log_funding_channel_id {
-	($funding_txid: expr, $funding_txo: expr) => {
-		::util::macro_logger::DebugFundingChannelId(&$funding_txid, $funding_txo)
-	}
-}
-
-pub(crate) struct DebugFundingOption<'a, T: 'a>(pub &'a Option<(OutPoint, T)>);
-impl<'a, T> std::fmt::Display for DebugFundingOption<'a, T> {
-	fn fmt(&self, f: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> {
-		match self.0.as_ref() {
-			Some(&(ref funding_output, _)) => DebugBytes(&funding_output.to_channel_id()[..]).fmt(f),
-			None => write!(f, "without funding output set"),
-		}
-	}
-}
-macro_rules! log_funding_option {
-	($funding_option: expr) => {
-		::util::macro_logger::DebugFundingOption(&$funding_option)
-	}
-}
-
-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)?;
-		}
-		Ok(())
-	}
-}
-macro_rules! log_route {
-	($obj: expr) => {
-		::util::macro_logger::DebugRoute(&$obj)
-	}
-}
-
-macro_rules! log_internal {
-	($self: ident, $lvl:expr, $($arg:tt)+) => (
-		&$self.logger.log(&::util::logger::Record::new($lvl, format_args!($($arg)+), module_path!(), file!(), line!()));
-	);
-}
-
-macro_rules! log_error {
-	($self: ident, $($arg:tt)*) => (
-		#[cfg(not(any(feature = "max_level_off")))]
-		log_internal!($self, $crate::util::logger::Level::Error, $($arg)*);
-	)
-}
-
-macro_rules! log_warn {
-	($self: ident, $($arg:tt)*) => (
-		#[cfg(not(any(feature = "max_level_off", feature = "max_level_error")))]
-		log_internal!($self, $crate::util::logger::Level::Warn, $($arg)*);
-	)
-}
-
-macro_rules! log_info {
-	($self: ident, $($arg:tt)*) => (
-		#[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn")))]
-		log_internal!($self, $crate::util::logger::Level::Info, $($arg)*);
-	)
-}
-
-macro_rules! log_debug {
-	($self: ident, $($arg:tt)*) => (
-		#[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info")))]
-		log_internal!($self, $crate::util::logger::Level::Debug, $($arg)*);
-	)
-}
-
-macro_rules! log_trace {
-	($self: ident, $($arg:tt)*) => (
-		#[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info", feature = "max_level_debug")))]
-		log_internal!($self, $crate::util::logger::Level::Trace, $($arg)*);
-	)
-}