Fix compilation with the max_level_trace feature

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

diff --git a/lightning/src/util/logger.rs b/lightning/src/util/logger.rs
index 98037aac298280a5b418b9c84bb94b948ae3bc30..103f89891cf30115c238f0a9494379c8e6719169 100644 (file)
--- a/lightning/src/util/logger.rs
+++ b/lightning/src/util/logger.rs
@@ -17,11 +17,13 @@
 use core::cmp;
 use core::fmt;
 
-static LOG_LEVEL_NAMES: [&'static str; 5] = ["TRACE", "DEBUG", "INFO", "WARN", "ERROR"];
+static LOG_LEVEL_NAMES: [&'static str; 6] = ["GOSSIP", "TRACE", "DEBUG", "INFO", "WARN", "ERROR"];
 
 /// An enum representing the available verbosity levels of the logger.
 #[derive(Copy, Clone, PartialEq, Eq, Debug, Hash)]
 pub enum Level {
+       /// Designates extremely verbose information, including gossip-induced messages
+       Gossip,
        /// Designates very low priority, often extremely verbose, information
        Trace,
        /// Designates lower priority information
@@ -78,7 +80,7 @@ impl Level {
        /// Returns the most verbose logging level.
        #[inline]
        pub fn max() -> Level {
-               Level::Trace
+               Level::Gossip
        }
 }
 
@@ -120,11 +122,24 @@ pub trait Logger {
        fn log(&self, record: &Record);
 }
 
+/// Wrapper for logging byte slices in hex format.
+/// (C-not exported) 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> {
+       fn fmt(&self, f: &mut core::fmt::Formatter) -> Result<(), core::fmt::Error> {
+               for i in self.0 {
+                       write!(f, "{:02x}", i)?;
+               }
+               Ok(())
+       }
+}
+
 #[cfg(test)]
 mod tests {
        use util::logger::{Logger, Level};
        use util::test_utils::TestLogger;
-       use std::sync::Arc;
+       use sync::Arc;
 
        #[test]
        fn test_level_show() {
@@ -150,13 +165,14 @@ mod tests {
                        log_info!(self.logger, "This is an info");
                        log_debug!(self.logger, "This is a debug");
                        log_trace!(self.logger, "This is a trace");
+                       log_gossip!(self.logger, "This is a gossip");
                }
        }
 
        #[test]
        fn test_logging_macros() {
                let mut logger = TestLogger::new();
-               logger.enable(Level::Trace);
+               logger.enable(Level::Gossip);
                let logger : Arc<Logger> = Arc::new(logger);
                let wrapper = WrapperLog::new(Arc::clone(&logger));
                wrapper.call_macros();
@@ -176,7 +192,10 @@ mod tests {
                assert!(Level::Debug > Level::Trace);
                assert!(Level::Debug >= Level::Trace);
                assert!(Level::Debug >= Level::Debug);
+               assert!(Level::Trace > Level::Gossip);
+               assert!(Level::Trace >= Level::Gossip);
                assert!(Level::Trace >= Level::Trace);
+               assert!(Level::Gossip >= Level::Gossip);
 
                assert!(Level::Error <= Level::Error);
                assert!(Level::Warn < Level::Error);
@@ -191,5 +210,8 @@ mod tests {
                assert!(Level::Trace < Level::Debug);
                assert!(Level::Trace <= Level::Debug);
                assert!(Level::Trace <= Level::Trace);
+               assert!(Level::Gossip < Level::Trace);
+               assert!(Level::Gossip <= Level::Trace);
+               assert!(Level::Gossip <= Level::Gossip);
        }
 }