X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=rust-lightning;a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Fmacro_logger.rs;h=b94540446339d421fec525597d653878a647f621;hp=b6f89fe9b191cc98dc3e9acfcb59ca4be77568da;hb=27079e04d7b542058e48cafaf5c2e7114b3b8e15;hpb=eff8af21103e43f763cb10ae6a75c1543a2d4068 diff --git a/lightning/src/util/macro_logger.rs b/lightning/src/util/macro_logger.rs index b6f89fe9..b9454044 100644 --- a/lightning/src/util/macro_logger.rs +++ b/lightning/src/util/macro_logger.rs @@ -1,7 +1,7 @@ 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 bitcoin::secp256k1::key::PublicKey; @@ -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() {