X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Fmacro_logger.rs;h=e667c4d726c5f2075907d9c9f4c2ea465fb8e137;hb=df778b605a28580905cb5ca63b3ec8bbe99afc2f;hp=b94540446339d421fec525597d653878a647f621;hpb=27079e04d7b542058e48cafaf5c2e7114b3b8e15;p=rust-lightning

diff --git a/lightning/src/util/macro_logger.rs b/lightning/src/util/macro_logger.rs
index b9454044..e667c4d7 100644
--- a/lightning/src/util/macro_logger.rs
+++ b/lightning/src/util/macro_logger.rs
@@ -1,3 +1,12 @@
+// This file is Copyright its original authors, visible in version control
+// history.
+//
+// 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.
+
 use chain::transaction::OutPoint;
 use chain::keysinterface::SpendableOutputDescriptor;
 
@@ -5,7 +14,7 @@ use bitcoin::hash_types::Txid;
 use bitcoin::blockdata::transaction::Transaction;
 use bitcoin::secp256k1::key::PublicKey;
 
-use ln::router::Route;
+use routing::router::Route;
 use ln::chan_utils::HTLCType;
 
 use std;
@@ -43,7 +52,7 @@ macro_rules! log_bytes {
 pub(crate) struct DebugFundingChannelId<'a>(pub &'a Txid, pub u16);
 impl<'a> std::fmt::Display for DebugFundingChannelId<'a> {
 	fn fmt(&self, f: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> {
-		for i in OutPoint::new(self.0.clone(), self.1).to_channel_id().iter() {
+		for i in (OutPoint { txid: self.0.clone(), index: self.1 }).to_channel_id().iter() {
 			write!(f, "{:02x}", i)?;
 		}
 		Ok(())
@@ -63,7 +72,7 @@ impl<'a, T> std::fmt::Display for DebugFundingInfo<'a, T> {
 }
 macro_rules! log_funding_info {
 	($key_storage: expr) => {
-		::util::macro_logger::DebugFundingInfo(&$key_storage.funding_info)
+		::util::macro_logger::DebugFundingInfo($key_storage.get_funding_txo())
 	}
 }
 
@@ -71,9 +80,9 @@ 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> {
 		for (idx, p) in self.0.paths.iter().enumerate() {
-			write!(f, "path {}:\n", idx)?;
+			writeln!(f, "path {}:", idx)?;
 			for h in p.iter() {
-				write!(f, " node_id: {}, short_channel_id: {}, fee_msat: {}, cltv_expiry_delta: {}\n", log_pubkey!(h.pubkey), h.short_channel_id, h.fee_msat, h.cltv_expiry_delta)?;
+				writeln!(f, " node_id: {}, short_channel_id: {}, fee_msat: {}, cltv_expiry_delta: {}", log_pubkey!(h.pubkey), h.short_channel_id, h.fee_msat, h.cltv_expiry_delta)?;
 			}
 		}
 		Ok(())
@@ -127,13 +136,13 @@ impl<'a> std::fmt::Display for DebugSpendable<'a> {
 	fn fmt(&self, f: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> {
 		match self.0 {
 			&SpendableOutputDescriptor::StaticOutput { ref outpoint, .. } => {
-				write!(f, "StaticOutput {}:{} marked for spending", outpoint.txid, outpoint.vout)?;
+				write!(f, "StaticOutput {}:{} marked for spending", outpoint.txid, outpoint.index)?;
 			}
 			&SpendableOutputDescriptor::DynamicOutputP2WSH { ref outpoint, .. } => {
-				write!(f, "DynamicOutputP2WSH {}:{} marked for spending", outpoint.txid, outpoint.vout)?;
+				write!(f, "DynamicOutputP2WSH {}:{} marked for spending", outpoint.txid, outpoint.index)?;
 			}
-			&SpendableOutputDescriptor::DynamicOutputP2WPKH { ref outpoint, .. } => {
-				write!(f, "DynamicOutputP2WPKH {}:{} marked for spending", outpoint.txid, outpoint.vout)?;
+			&SpendableOutputDescriptor::StaticOutputCounterpartyPayment { ref outpoint, .. } => {
+				write!(f, "DynamicOutputP2WPKH {}:{} marked for spending", outpoint.txid, outpoint.index)?;
 			}
 		}
 		Ok(())
@@ -147,42 +156,42 @@ macro_rules! log_spendable {
 }
 
 macro_rules! log_internal {
-	($self: ident, $lvl:expr, $($arg:tt)+) => (
-		&$self.logger.log(&::util::logger::Record::new($lvl, format_args!($($arg)+), module_path!(), file!(), line!()));
+	($logger: expr, $lvl:expr, $($arg:tt)+) => (
+		$logger.log(&::util::logger::Record::new($lvl, format_args!($($arg)+), module_path!(), file!(), line!()));
 	);
 }
 
 macro_rules! log_error {
-	($self: ident, $($arg:tt)*) => (
+	($logger: expr, $($arg:tt)*) => (
 		#[cfg(not(any(feature = "max_level_off")))]
-		log_internal!($self, $crate::util::logger::Level::Error, $($arg)*);
+		log_internal!($logger, $crate::util::logger::Level::Error, $($arg)*);
 	)
 }
 
 macro_rules! log_warn {
-	($self: ident, $($arg:tt)*) => (
+	($logger: expr, $($arg:tt)*) => (
 		#[cfg(not(any(feature = "max_level_off", feature = "max_level_error")))]
-		log_internal!($self, $crate::util::logger::Level::Warn, $($arg)*);
+		log_internal!($logger, $crate::util::logger::Level::Warn, $($arg)*);
 	)
 }
 
 macro_rules! log_info {
-	($self: ident, $($arg:tt)*) => (
+	($logger: expr, $($arg:tt)*) => (
 		#[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn")))]
-		log_internal!($self, $crate::util::logger::Level::Info, $($arg)*);
+		log_internal!($logger, $crate::util::logger::Level::Info, $($arg)*);
 	)
 }
 
 macro_rules! log_debug {
-	($self: ident, $($arg:tt)*) => (
+	($logger: expr, $($arg:tt)*) => (
 		#[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info")))]
-		log_internal!($self, $crate::util::logger::Level::Debug, $($arg)*);
+		log_internal!($logger, $crate::util::logger::Level::Debug, $($arg)*);
 	)
 }
 
 macro_rules! log_trace {
-	($self: ident, $($arg:tt)*) => (
+	($logger: expr, $($arg:tt)*) => (
 		#[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info", feature = "max_level_debug")))]
-		log_internal!($self, $crate::util::logger::Level::Trace, $($arg)*);
+		log_internal!($logger, $crate::util::logger::Level::Trace, $($arg)*);
 	)
 }