X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Futil%2Fmacro_logger.rs;h=47ba876dcfa13a64df7c3d59b5f660372e39b7f0;hb=c962a27156c92888f9f3cb0bc6565a73525c8da8;hp=607f8fe4e581bdeb8ef7c0cdf26a8fb139045c20;hpb=1a9ef40203da58e03defd13379983e6474c20d1b;p=rust-lightning

diff --git a/src/util/macro_logger.rs b/src/util/macro_logger.rs
index 607f8fe4..47ba876d 100644
--- a/src/util/macro_logger.rs
+++ b/src/util/macro_logger.rs
@@ -1,8 +1,75 @@
-use util::logger::Record;
+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 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!()));
 	);
 }