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

diff --git a/lightning-invoice/src/de.rs b/lightning-invoice/src/de.rs
index 5bfa9a04..c75373ea 100644
--- a/lightning-invoice/src/de.rs
+++ b/lightning-invoice/src/de.rs
@@ -10,9 +10,9 @@ use core::str::FromStr;
 use bech32::{u5, FromBase32};
 
 use bitcoin::{PubkeyHash, ScriptHash};
-use bitcoin::util::address::WitnessVersion;
-use bitcoin_hashes::Hash;
-use bitcoin_hashes::sha256;
+use bitcoin::address::WitnessVersion;
+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,8 +726,8 @@ mod test {
 	use crate::de::Bolt11ParseError;
 	use secp256k1::PublicKey;
 	use bech32::u5;
-	use bitcoin_hashes::hex::FromHex;
-	use bitcoin_hashes::sha256;
+	use bitcoin::hashes::sha256;
+	use std::str::FromStr;
 
 	const CHARSET_REV: [i8; 128] = [
 		-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -778,7 +778,7 @@ mod test {
 			"qqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqypq".as_bytes()
 		);
 
-		let hash = sha256::Hash::from_hex(
+		let hash = sha256::Hash::from_str(
 			"0001020304050607080900010203040506070809000102030405060708090102"
 		).unwrap();
 		let expected = Ok(Sha256(hash));
@@ -855,8 +855,8 @@ mod test {
 		use crate::Fallback;
 		use bech32::FromBase32;
 		use bitcoin::{PubkeyHash, ScriptHash};
-		use bitcoin::util::address::WitnessVersion;
-		use bitcoin_hashes::Hash;
+		use bitcoin::address::WitnessVersion;
+		use bitcoin::hashes::Hash;
 
 		let cases = vec![
 			(
@@ -988,7 +988,7 @@ mod test {
 						data: RawDataPart {
 							timestamp: PositiveTimestamp::from_unix_timestamp(1496314658).unwrap(),
 							tagged_fields: vec ! [
-								PaymentHash(Sha256(sha256::Hash::from_hex(
+								PaymentHash(Sha256(sha256::Hash::from_str(
 									"0001020304050607080900010203040506070809000102030405060708090102"
 								).unwrap())).into(),
 								Description(crate::Description::new("coffee beans".to_owned()).unwrap()).into(),
@@ -1035,7 +1035,7 @@ mod test {
 					data: RawDataPart {
 					timestamp: PositiveTimestamp::from_unix_timestamp(1496314658).unwrap(),
 					tagged_fields: vec ! [
-						PaymentHash(Sha256(sha256::Hash::from_hex(
+						PaymentHash(Sha256(sha256::Hash::from_str(
 							"0001020304050607080900010203040506070809000102030405060708090102"
 						).unwrap())).into(),
 						Description(