X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning-invoice%2Fsrc%2Fde.rs;h=c75373ea9dac3d127575b95d78954400164d1dc9;hb=a1759582ada5531d85f91e56a60b9c4d66341511;hp=0276b742f28405b21c2099adeb4333654784c231;hpb=a0183d7ef1bdf95eb009b1c85849585e3faa0217;p=rust-lightning

diff --git a/lightning-invoice/src/de.rs b/lightning-invoice/src/de.rs
index 0276b742..c75373ea 100644
--- a/lightning-invoice/src/de.rs
+++ b/lightning-invoice/src/de.rs
@@ -11,8 +11,8 @@ use bech32::{u5, FromBase32};
 
 use bitcoin::{PubkeyHash, ScriptHash};
 use bitcoin::address::WitnessVersion;
-use bitcoin_hashes::Hash;
-use bitcoin_hashes::sha256;
+use bitcoin::hashes::Hash;
+use bitcoin::hashes::sha256;
 use crate::prelude::*;
 use lightning::ln::PaymentSecret;
 use lightning::routing::gossip::RoutingFees;
@@ -564,14 +564,14 @@ impl FromBase32 for Fallback {
 			17 => {
 				let pkh = match PubkeyHash::from_slice(&bytes) {
 					Ok(pkh) => pkh,
-					Err(bitcoin_hashes::Error::InvalidLength(_, _)) => return Err(Bolt11ParseError::InvalidPubKeyHashLength),
+					Err(bitcoin::hashes::Error::InvalidLength(_, _)) => return Err(Bolt11ParseError::InvalidPubKeyHashLength),
 				};
 				Ok(Fallback::PubKeyHash(pkh))
 			}
 			18 => {
 				let sh = match ScriptHash::from_slice(&bytes) {
 					Ok(sh) => sh,
-					Err(bitcoin_hashes::Error::InvalidLength(_, _)) => return Err(Bolt11ParseError::InvalidScriptHashLength),
+					Err(bitcoin::hashes::Error::InvalidLength(_, _)) => return Err(Bolt11ParseError::InvalidScriptHashLength),
 				};
 				Ok(Fallback::ScriptHash(sh))
 			}
@@ -726,7 +726,7 @@ mod test {
 	use crate::de::Bolt11ParseError;
 	use secp256k1::PublicKey;
 	use bech32::u5;
-	use bitcoin_hashes::sha256;
+	use bitcoin::hashes::sha256;
 	use std::str::FromStr;
 
 	const CHARSET_REV: [i8; 128] = [
@@ -856,7 +856,7 @@ mod test {
 		use bech32::FromBase32;
 		use bitcoin::{PubkeyHash, ScriptHash};
 		use bitcoin::address::WitnessVersion;
-		use bitcoin_hashes::Hash;
+		use bitcoin::hashes::Hash;
 
 		let cases = vec![
 			(