migration to rust-bitcoin 0.17

[rust-lightning] / src / chain / chaininterface.rs

diff --git a/src/chain/chaininterface.rs b/src/chain/chaininterface.rs
index 7b5e0d0749832a7cf2ffcfcd560156d085fd53f7..d1995b44221082bb5e9d668d63efbbb73bb81581 100644 (file)
--- a/src/chain/chaininterface.rs
+++ b/src/chain/chaininterface.rs
@@ -2,13 +2,14 @@
 //! blockchain.
 //!
 //! Includes traits for monitoring and receiving notifications of new blocks and block
-//! disconnections, transactio broadcasting, and feerate information requests.
+//! disconnections, transaction broadcasting, and feerate information requests.
 
 use bitcoin::blockdata::block::{Block, BlockHeader};
 use bitcoin::blockdata::transaction::Transaction;
 use bitcoin::blockdata::script::Script;
 use bitcoin::blockdata::constants::genesis_block;
-use bitcoin::util::hash::{BitcoinHash, Sha256dHash};
+use bitcoin::util::hash::BitcoinHash;
+use bitcoin_hashes::sha256d::Hash as Sha256dHash;
 use bitcoin::network::constants::Network;
 
 use util::logger::Logger;
@@ -143,7 +144,7 @@ impl ChainWatchedUtil {
                }
                #[cfg(not(test))]
                {
-                       let _tx_unused = txid; // Its used in cfg(test), though
+                       let _tx_unused = txid; // It's used in cfg(test), though
                        self.watched_txn.insert(script_pub_key.clone())
                }
        }
@@ -155,7 +156,7 @@ impl ChainWatchedUtil {
                self.watched_outpoints.insert(outpoint)
        }
 
-       /// Sets us to match all transactions, returning true if this is a new setting anf false if
+       /// Sets us to match all transactions, returning true if this is a new setting and false if
        /// we'd already been set to match everything.
        pub fn watch_all(&mut self) -> bool {
                if self.watch_all { return false; }