Fold sign_holder_commitment_htlc_transactions into sign_holder_commitment

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

diff --git a/lightning/src/util/logger.rs b/lightning/src/util/logger.rs
index e727723c16dedbc6bb4713b4bd137238884ce0b5..acd6d323e8f319e9b3c84550ab099d2258f486cb 100644 (file)
--- a/lightning/src/util/logger.rs
+++ b/lightning/src/util/logger.rs
@@ -1,11 +1,11 @@
 // Pruned copy of crate rust log, without global logger
 // https://github.com/rust-lang-nursery/log #7a60286
 //
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
+// This file is licensed under the Apache License, Version 2.0 <LICENSE-APACHE
+// or http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your option.
+// You may not use this file except in accordance with one or both of these
+// licenses.
 
 //! Log traits live here, which are called throughout the library to provide useful information for
 //! debugging purposes.
@@ -16,7 +16,6 @@
 
 use std::cmp;
 use std::fmt;
-use std::sync::Arc;
 
 static LOG_LEVEL_NAMES: [&'static str; 6] = ["OFF", "ERROR", "WARN", "INFO", "DEBUG", "TRACE"];
 
@@ -87,6 +86,7 @@ impl Level {
 
 /// A Record, unit of logging output with Metadata to enable filtering
 /// Module_path, file, line to inform on log's source
+/// (C-not exported) - we convert to a const char* instead
 #[derive(Clone,Debug)]
 pub struct Record<'a> {
        /// The verbosity level of the message.
@@ -103,6 +103,7 @@ pub struct Record<'a> {
 
 impl<'a> Record<'a> {
        /// Returns a new Record.
+       /// (C-not exported) as fmt can't be used in C
        #[inline]
        pub fn new(level: Level, args: fmt::Arguments<'a>, module_path: &'a str, file: &'a str, line: u32) -> Record<'a> {
                Record {
@@ -121,13 +122,11 @@ pub trait Logger: Sync + Send {
        fn log(&self, record: &Record);
 }
 
-pub(crate) struct LogHolder<'a> { pub(crate) logger: &'a Arc<Logger> }
-
 #[cfg(test)]
 mod tests {
        use util::logger::{Logger, Level};
        use util::test_utils::TestLogger;
-       use std::sync::{Arc};
+       use std::sync::Arc;
 
        #[test]
        fn test_level_show() {
@@ -148,11 +147,11 @@ mod tests {
                }
 
                fn call_macros(&self) {
-                       log_error!(self, "This is an error");
-                       log_warn!(self, "This is a warning");
-                       log_info!(self, "This is an info");
-                       log_debug!(self, "This is a debug");
-                       log_trace!(self, "This is a trace");
+                       log_error!(self.logger, "This is an error");
+                       log_warn!(self.logger, "This is a warning");
+                       log_info!(self.logger, "This is an info");
+                       log_debug!(self.logger, "This is a debug");
+                       log_trace!(self.logger, "This is a trace");
                }
        }