Merge pull request #2434 from TheBlueMatt/2023-07-116-bindings-part-2

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

diff --git a/lightning/src/util/logger.rs b/lightning/src/util/logger.rs
index ff576e26ddf4ca485d648c943ad3f36384b30653..dbca9b785e85dfbaf3c68253e7e47b91225c6bdc 100644 (file)
--- a/lightning/src/util/logger.rs
+++ b/lightning/src/util/logger.rs
@@ -14,11 +14,13 @@
 //! The second one, client-side by implementing check against Record Level field.
 //! Each module may have its own Logger or share one.
 
+use bitcoin::secp256k1::PublicKey;
+
 use core::cmp;
 use core::fmt;
 
 #[cfg(c_bindings)]
-use prelude::*; // Needed for String
+use crate::prelude::*; // Needed for String
 
 static LOG_LEVEL_NAMES: [&'static str; 6] = ["GOSSIP", "TRACE", "DEBUG", "INFO", "WARN", "ERROR"];
 
@@ -114,7 +116,8 @@ pub struct Record<'a> {
 
 impl<'a> Record<'a> {
        /// Returns a new Record.
-       /// (C-not exported) as fmt can't be used in C
+       ///
+       /// This is not exported to bindings users as fmt can't be used in C
        #[inline]
        pub fn new(level: Level, args: fmt::Arguments<'a>, module_path: &'static str, file: &'static str, line: u32) -> Record<'a> {
                Record {
@@ -138,8 +141,23 @@ pub trait Logger {
        fn log(&self, record: &Record);
 }
 
+/// Wrapper for logging a [`PublicKey`] in hex format.
+///
+/// This is not exported to bindings users as fmt can't be used in C
+#[doc(hidden)]
+pub struct DebugPubKey<'a>(pub &'a PublicKey);
+impl<'a> core::fmt::Display for DebugPubKey<'a> {
+       fn fmt(&self, f: &mut core::fmt::Formatter) -> Result<(), core::fmt::Error> {
+               for i in self.0.serialize().iter() {
+                       write!(f, "{:02x}", i)?;
+               }
+               Ok(())
+       }
+}
+
 /// Wrapper for logging byte slices in hex format.
-/// (C-not exported) as fmt can't be used in C
+///
+/// This is not exported to bindings users as fmt can't be used in C
 #[doc(hidden)]
 pub struct DebugBytes<'a>(pub &'a [u8]);
 impl<'a> core::fmt::Display for DebugBytes<'a> {
@@ -151,11 +169,31 @@ impl<'a> core::fmt::Display for DebugBytes<'a> {
        }
 }
 
+/// Wrapper for logging `Iterator`s.
+///
+/// This is not exported to bindings users as fmt can't be used in C
+#[doc(hidden)]
+pub struct DebugIter<T: fmt::Display, I: core::iter::Iterator<Item = T> + Clone>(pub I);
+impl<T: fmt::Display, I: core::iter::Iterator<Item = T> + Clone> fmt::Display for DebugIter<T, I> {
+       fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+               write!(f, "[")?;
+               let mut iter = self.0.clone();
+               if let Some(item) = iter.next() {
+                       write!(f, "{}", item)?;
+               }
+               while let Some(item) = iter.next() {
+                       write!(f, ", {}", item)?;
+               }
+               write!(f, "]")?;
+               Ok(())
+       }
+}
+
 #[cfg(test)]
 mod tests {
-       use util::logger::{Logger, Level};
-       use util::test_utils::TestLogger;
-       use sync::Arc;
+       use crate::util::logger::{Logger, Level};
+       use crate::util::test_utils::TestLogger;
+       use crate::sync::Arc;
 
        #[test]
        fn test_level_show() {