Refactor KeyStorage as Storage

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

diff --git a/src/util/macro_logger.rs b/src/util/macro_logger.rs
index 47ba876dcfa13a64df7c3d59b5f660372e39b7f0..fb38e347c2adec973351d0d4f4cc6204781630e5 100644 (file)
--- a/src/util/macro_logger.rs
+++ b/src/util/macro_logger.rs
@@ -52,6 +52,28 @@ 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> {