X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Flogger.rs;h=b34d1f0b782d8618756edc28e3d4a4791be0779f;hb=002a5db5b07fd317545d3aa4f1a217cd40b608e2;hp=2cf0f13633661a5ae6eed6ed180ddc3978fdaa26;hpb=47cb2939c8d618bfced370e5c9103eac4ee6ce9e;p=rust-lightning

diff --git a/lightning/src/util/logger.rs b/lightning/src/util/logger.rs
index 2cf0f136..b34d1f0b 100644
--- a/lightning/src/util/logger.rs
+++ b/lightning/src/util/logger.rs
@@ -14,26 +14,24 @@
 //! The second one, client-side by implementing check against Record Level field.
 //! Each module may have its own Logger or share one.
 
-use std::cmp;
-use std::fmt;
+use core::cmp;
+use core::fmt;
 
-static LOG_LEVEL_NAMES: [&'static str; 6] = ["OFF", "ERROR", "WARN", "INFO", "DEBUG", "TRACE"];
+static LOG_LEVEL_NAMES: [&'static str; 5] = ["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 logger being silent
-	Off,
-	/// Designates very serious errors
-	Error,
-	/// Designates hazardous situations
-	Warn,
-	/// Designates useful information
-	Info,
-	/// Designates lower priority information
-	Debug,
 	/// Designates very low priority, often extremely verbose, information
 	Trace,
+	/// Designates lower priority information
+	Debug,
+	/// Designates useful information
+	Info,
+	/// Designates hazardous situations
+	Warn,
+	/// Designates very serious errors
+	Error,
 }
 
 impl PartialOrd for Level {
@@ -126,7 +124,7 @@ pub trait Logger {
 mod tests {
 	use util::logger::{Logger, Level};
 	use util::test_utils::TestLogger;
-	use std::sync::Arc;
+	use sync::Arc;
 
 	#[test]
 	fn test_level_show() {
@@ -163,4 +161,35 @@ mod tests {
 		let wrapper = WrapperLog::new(Arc::clone(&logger));
 		wrapper.call_macros();
 	}
+
+	#[test]
+	fn test_log_ordering() {
+		assert!(Level::Error > Level::Warn);
+		assert!(Level::Error >= Level::Warn);
+		assert!(Level::Error >= Level::Error);
+		assert!(Level::Warn > Level::Info);
+		assert!(Level::Warn >= Level::Info);
+		assert!(Level::Warn >= Level::Warn);
+		assert!(Level::Info > Level::Debug);
+		assert!(Level::Info >= Level::Debug);
+		assert!(Level::Info >= Level::Info);
+		assert!(Level::Debug > Level::Trace);
+		assert!(Level::Debug >= Level::Trace);
+		assert!(Level::Debug >= Level::Debug);
+		assert!(Level::Trace >= Level::Trace);
+
+		assert!(Level::Error <= Level::Error);
+		assert!(Level::Warn < Level::Error);
+		assert!(Level::Warn <= Level::Error);
+		assert!(Level::Warn <= Level::Warn);
+		assert!(Level::Info < Level::Warn);
+		assert!(Level::Info <= Level::Warn);
+		assert!(Level::Info <= Level::Info);
+		assert!(Level::Debug < Level::Info);
+		assert!(Level::Debug <= Level::Info);
+		assert!(Level::Debug <= Level::Debug);
+		assert!(Level::Trace < Level::Debug);
+		assert!(Level::Trace <= Level::Debug);
+		assert!(Level::Trace <= Level::Trace);
+	}
 }