X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fchain%2Fchaininterface.rs;h=d1995b44221082bb5e9d668d63efbbb73bb81581;hb=50e16c9573ef5af43abf4837e6199c6526429d42;hp=9999177de966e15a0b9ebb4c90b9f3a590c743b5;hpb=6e1318b0e28522244493c280f556e6749694b81e;p=rust-lightning

diff --git a/src/chain/chaininterface.rs b/src/chain/chaininterface.rs
index 9999177d..d1995b44 100644
--- a/src/chain/chaininterface.rs
+++ b/src/chain/chaininterface.rs
@@ -2,15 +2,15 @@
 //! 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::Sha256dHash;
+use bitcoin::util::hash::BitcoinHash;
+use bitcoin_hashes::sha256d::Hash as Sha256dHash;
 use bitcoin::network::constants::Network;
-use bitcoin::network::serialize::BitcoinHash;
 
 use util::logger::Logger;
 
@@ -144,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())
 		}
 	}
@@ -156,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; }