Merge pull request #386 from TheBlueMatt/2019-10-useless-lints

[rust-lightning] / src / util / macro_logger.rs

diff --git a/src/util/macro_logger.rs b/src/util/macro_logger.rs
index fd9a61b39374a0b9f6d53c8866ede69daaa0261b..1f68542773e462bd9623f24d27562d0d11339caa 100644 (file)
--- a/src/util/macro_logger.rs
+++ b/src/util/macro_logger.rs
@@ -1,8 +1,10 @@
 use chain::transaction::OutPoint;
 
-use bitcoin::util::hash::Sha256dHash;
+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);
@@ -20,7 +22,7 @@ macro_rules! log_pubkey {
        }
 }
 
-pub(crate) struct DebugBytes<'a>(pub &'a [u8; 32]);
+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 {
@@ -50,9 +52,46 @@ macro_rules! log_funding_channel_id {
        }
 }
 
+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!()));
        );
 }