X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Fmacro_logger.rs;h=85484aceae31aa443c3ffdc380be2c1822f736e5;hb=d0b4f521e1376076cc1fa0f3c21ae6f1d2ba4e33;hp=196ba9ea9ea73c19c3b07fdd58d6681fdecd8a88;hpb=22daecb8e494122af8617f716014cae9dca38b9b;p=rust-lightning diff --git a/lightning/src/util/macro_logger.rs b/lightning/src/util/macro_logger.rs index 196ba9ea..85484ace 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 or the MIT license +// , 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; @@ -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(())