Add some useful delayed-formatting formatters to macro_logger

diff --git a/src/util/macro_logger.rs b/src/util/macro_logger.rs
index d991574910564f7d19622f0ed0ebafc9176e6333..fd9a61b39374a0b9f6d53c8866ede69daaa0261b 100644 (file)
--- a/src/util/macro_logger.rs
+++ b/src/util/macro_logger.rs
@@ -1,3 +1,55 @@
+use chain::transaction::OutPoint;
+
+use bitcoin::util::hash::Sha256dHash;
+use secp256k1::key::PublicKey;
+
+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; 32]);
+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)
+       }
+}
+
 macro_rules! log_internal {
        ($self: ident, $lvl:expr, $($arg:tt)+) => (
                &$self.logger.log(&Record::new($lvl, format_args!($($arg)+), module_path!(), file!(), line!()));