Bitcoin deps refactoring (BDR): Linearizing bitcoin_hash deps

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

diff --git a/lightning/src/util/macro_logger.rs b/lightning/src/util/macro_logger.rs
index 1f9cb1ad27e62d21f916272be115deca7d26710d..f02fced7fd86f1ce6febd315d3f7367182f83fdf 100644 (file)
--- 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::hashes::sha256d::Hash as Sha256dHash;
 use bitcoin::blockdata::transaction::Transaction;
 use secp256k1::key::PublicKey;
 
@@ -55,13 +55,10 @@ macro_rules! log_funding_channel_id {
        }
 }
 
-pub(crate) struct DebugFundingInfo<'a, T: 'a>(pub &'a Option<(OutPoint, T)>);
+pub(crate) struct DebugFundingInfo<'a, T: 'a>(pub &'a (OutPoint, T));
 impl<'a, T> std::fmt::Display for DebugFundingInfo<'a, T> {
        fn fmt(&self, f: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> {
-               match self.0.as_ref() {
-                       Some(&(ref funding_output, _)) => DebugBytes(&funding_output.to_channel_id()[..]).fmt(f),
-                       None => write!(f, "without funding output set"),
-               }
+               DebugBytes(&(self.0).0.to_channel_id()[..]).fmt(f)
        }
 }
 macro_rules! log_funding_info {