X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Foffers%2Fmerkle.rs;h=11f1d971330c7f1c3f7447aa2f2b7ee5a5f5ddd7;hb=1e580668684d4dbf11d69d75e5d4a5c4f8cc40bf;hp=a3979866926170e8b5dc467ef10c59aae9c91c54;hpb=0e22b1245af2ddd5b226d989801d5427053dd9ed;p=rust-lightning

diff --git a/lightning/src/offers/merkle.rs b/lightning/src/offers/merkle.rs
index a3979866..11f1d971 100644
--- a/lightning/src/offers/merkle.rs
+++ b/lightning/src/offers/merkle.rs
@@ -54,7 +54,7 @@ impl TaggedHash {
 	) -> Self {
 		let tag_hash = sha256::Hash::hash(tag.as_bytes());
 		let merkle_root = root_hash(tlv_stream);
-		let digest = Message::from_slice(tagged_hash(tag_hash, merkle_root).as_byte_array()).unwrap();
+		let digest = Message::from_digest(tagged_hash(tag_hash, merkle_root).to_byte_array());
 		Self {
 			tag,
 			merkle_root,
@@ -305,7 +305,7 @@ mod tests {
 
 	use bitcoin::hashes::{Hash, sha256};
 	use bitcoin::hashes::hex::FromHex;
-	use bitcoin::secp256k1::{KeyPair, Message, Secp256k1, SecretKey};
+	use bitcoin::secp256k1::{Keypair, Message, Secp256k1, SecretKey};
 	use bitcoin::secp256k1::schnorr::Signature;
 	use crate::offers::offer::{Amount, OfferBuilder};
 	use crate::offers::invoice_request::{InvoiceRequest, UnsignedInvoiceRequest};
@@ -338,15 +338,16 @@ mod tests {
 		let secp_ctx = Secp256k1::new();
 		let recipient_pubkey = {
 			let secret_key = SecretKey::from_slice(&<Vec<u8>>::from_hex("4141414141414141414141414141414141414141414141414141414141414141").unwrap()).unwrap();
-			KeyPair::from_secret_key(&secp_ctx, &secret_key).public_key()
+			Keypair::from_secret_key(&secp_ctx, &secret_key).public_key()
 		};
 		let payer_keys = {
 			let secret_key = SecretKey::from_slice(&<Vec<u8>>::from_hex("4242424242424242424242424242424242424242424242424242424242424242").unwrap()).unwrap();
-			KeyPair::from_secret_key(&secp_ctx, &secret_key)
+			Keypair::from_secret_key(&secp_ctx, &secret_key)
 		};
 
 		// BOLT 12 test vectors
-		let invoice_request = OfferBuilder::new("A Mathematical Treatise".into(), recipient_pubkey)
+		let invoice_request = OfferBuilder::new(recipient_pubkey)
+			.description("A Mathematical Treatise".into())
 			.amount(Amount::Currency { iso4217_code: *b"USD", amount: 100 })
 			.build_unchecked()
 			.request_invoice(vec![0; 8], payer_keys.public_key()).unwrap()
@@ -371,7 +372,7 @@ mod tests {
 
         #[test]
         fn compute_tagged_hash() {
-                let unsigned_invoice_request = OfferBuilder::new("foo".into(), recipient_pubkey())
+                let unsigned_invoice_request = OfferBuilder::new(recipient_pubkey())
                         .amount_msats(1000)
                         .build().unwrap()
                         .request_invoice(vec![1; 32], payer_pubkey()).unwrap()
@@ -383,8 +384,7 @@ mod tests {
                 let tagged_hash = unsigned_invoice_request.as_ref();
                 let expected_digest = unsigned_invoice_request.as_ref().as_digest();
                 let tag = sha256::Hash::hash(tagged_hash.tag().as_bytes());
-                let actual_digest = Message::from_slice(super::tagged_hash(tag, tagged_hash.merkle_root()).as_byte_array())
-                        .unwrap();
+                let actual_digest = Message::from_digest(super::tagged_hash(tag, tagged_hash.merkle_root()).to_byte_array());
                 assert_eq!(*expected_digest, actual_digest);
         }
 
@@ -393,14 +393,14 @@ mod tests {
 		let secp_ctx = Secp256k1::new();
 		let recipient_pubkey = {
 			let secret_key = SecretKey::from_slice(&[41; 32]).unwrap();
-			KeyPair::from_secret_key(&secp_ctx, &secret_key).public_key()
+			Keypair::from_secret_key(&secp_ctx, &secret_key).public_key()
 		};
 		let payer_keys = {
 			let secret_key = SecretKey::from_slice(&[42; 32]).unwrap();
-			KeyPair::from_secret_key(&secp_ctx, &secret_key)
+			Keypair::from_secret_key(&secp_ctx, &secret_key)
 		};
 
-		let invoice_request = OfferBuilder::new("foo".into(), recipient_pubkey)
+		let invoice_request = OfferBuilder::new(recipient_pubkey)
 			.amount_msats(100)
 			.build_unchecked()
 			.request_invoice(vec![0; 8], payer_keys.public_key()).unwrap()
@@ -425,14 +425,14 @@ mod tests {
 		let secp_ctx = Secp256k1::new();
 		let recipient_pubkey = {
 			let secret_key = SecretKey::from_slice(&[41; 32]).unwrap();
-			KeyPair::from_secret_key(&secp_ctx, &secret_key).public_key()
+			Keypair::from_secret_key(&secp_ctx, &secret_key).public_key()
 		};
 		let payer_keys = {
 			let secret_key = SecretKey::from_slice(&[42; 32]).unwrap();
-			KeyPair::from_secret_key(&secp_ctx, &secret_key)
+			Keypair::from_secret_key(&secp_ctx, &secret_key)
 		};
 
-		let invoice_request = OfferBuilder::new("foo".into(), recipient_pubkey)
+		let invoice_request = OfferBuilder::new(recipient_pubkey)
 			.amount_msats(100)
 			.build_unchecked()
 			.request_invoice(vec![0; 8], payer_keys.public_key()).unwrap()