X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Futil%2Fmacro_logger.rs;h=1f68542773e462bd9623f24d27562d0d11339caa;hb=38098ba657b1aaf5551f882bc900dafbc027617c;hp=d991574910564f7d19622f0ed0ebafc9176e6333;hpb=ebd3bbba0f1d8383861271899f7359bf22a6422f;p=rust-lightning

diff --git a/src/util/macro_logger.rs b/src/util/macro_logger.rs
index d9915749..1f685427 100644
--- a/src/util/macro_logger.rs
+++ b/src/util/macro_logger.rs
@@ -1,6 +1,97 @@
+use chain::transaction::OutPoint;
+
+use bitcoin_hashes::sha256d::Hash as 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 DebugFundingInfo<'a, T: 'a>(pub &'a Option<(OutPoint, T)>);
+impl<'a, T> std::fmt::Display for DebugFundingInfo<'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_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)
+			}
+		}
+	}
+}
+
+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(&Record::new($lvl, format_args!($($arg)+), module_path!(), file!(), line!()));
+		&$self.logger.log(&::util::logger::Record::new($lvl, format_args!($($arg)+), module_path!(), file!(), line!()));
 	);
 }