X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Fmacro_logger.rs;h=5a6002d8594201f8d0a30b0c32dde75d0d03fc1f;hb=87126b391b895098484a86dc484a381b825e9a31;hp=bee0f0d26f9a68e3ea4b00635ddd3994781c28c0;hpb=0d755456328d68151cdb66a1d8280912de7eb50c;p=rust-lightning

diff --git a/lightning/src/util/macro_logger.rs b/lightning/src/util/macro_logger.rs
index bee0f0d2..5a6002d8 100644
--- a/lightning/src/util/macro_logger.rs
+++ b/lightning/src/util/macro_logger.rs
@@ -1,11 +1,11 @@
 use chain::transaction::OutPoint;
 use chain::keysinterface::SpendableOutputDescriptor;
 
-use bitcoin_hashes::sha256d::Hash as Sha256dHash;
+use bitcoin::hash_types::Txid;
 use bitcoin::blockdata::transaction::Transaction;
-use secp256k1::key::PublicKey;
+use bitcoin::secp256k1::key::PublicKey;
 
-use ln::router::Route;
+use routing::router::Route;
 use ln::chan_utils::HTLCType;
 
 use std;
@@ -40,7 +40,7 @@ macro_rules! log_bytes {
 	}
 }
 
-pub(crate) struct DebugFundingChannelId<'a>(pub &'a Sha256dHash, pub u16);
+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() {
@@ -147,42 +147,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)*);
 	)
 }