X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fblinded_path%2Futils.rs;h=d4894a86aa1a9069abdc9b2e073cd0a31c789048;hb=47954e95dff860d2a578f7d9f35f3599ac314926;hp=9b1ce50b10ebefa61943680694c5ce5852d20d43;hpb=d224f980ed208445d2425f697eb4563aaa432fa3;p=rust-lightning

diff --git a/lightning/src/blinded_path/utils.rs b/lightning/src/blinded_path/utils.rs
index 9b1ce50b..d4894a86 100644
--- a/lightning/src/blinded_path/utils.rs
+++ b/lightning/src/blinded_path/utils.rs
@@ -18,9 +18,9 @@ use bitcoin::secp256k1::ecdh::SharedSecret;
 use super::{BlindedHop, BlindedPath};
 use crate::ln::msgs::DecodeError;
 use crate::ln::onion_utils;
-use crate::onion_message::Destination;
-use crate::util::chacha20poly1305rfc::ChaChaPolyWriteAdapter;
-use crate::util::ser::{Readable, VecWriter, Writeable};
+use crate::onion_message::messenger::Destination;
+use crate::crypto::streams::ChaChaPolyWriteAdapter;
+use crate::util::ser::{Readable, Writeable};
 
 use crate::io;
 use crate::prelude::*;
@@ -49,7 +49,7 @@ where
 				let hop_pk_blinding_factor = {
 					let mut hmac = HmacEngine::<Sha256>::new(b"blinded_node_id");
 					hmac.input(encrypted_data_ss.as_ref());
-					Hmac::from_engine(hmac).into_inner()
+					Hmac::from_engine(hmac).to_byte_array()
 				};
 				$pk.mul_tweak(secp_ctx, &Scalar::from_be_bytes(hop_pk_blinding_factor).unwrap())?
 			};
@@ -70,7 +70,7 @@ where
 				let mut sha = Sha256::engine();
 				sha.input(&msg_blinding_point.serialize()[..]);
 				sha.input(encrypted_data_ss.as_ref());
-				Sha256::from_engine(sha).into_inner()
+				Sha256::from_engine(sha).to_byte_array()
 			};
 
 			msg_blinding_point_priv = msg_blinding_point_priv.mul_tweak(&Scalar::from_be_bytes(msg_blinding_point_blinding_factor).unwrap())?;
@@ -80,7 +80,7 @@ where
 				let mut sha = Sha256::engine();
 				sha.input(&onion_packet_pubkey.serialize()[..]);
 				sha.input(onion_packet_ss.as_ref());
-				Sha256::from_engine(sha).into_inner()
+				Sha256::from_engine(sha).to_byte_array()
 			};
 			onion_packet_pubkey_priv = onion_packet_pubkey_priv.mul_tweak(&Scalar::from_be_bytes(onion_packet_pubkey_blinding_factor).unwrap())?;
 			onion_packet_pubkey = PublicKey::from_secret_key(secp_ctx, &onion_packet_pubkey_priv);
@@ -111,11 +111,11 @@ pub(super) fn construct_blinded_hops<'a, T, I1, I2>(
 ) -> Result<Vec<BlindedHop>, secp256k1::Error>
 where
 	T: secp256k1::Signing + secp256k1::Verification,
-	I1: ExactSizeIterator<Item=&'a PublicKey>,
+	I1: Iterator<Item=&'a PublicKey>,
 	I2: Iterator,
 	I2::Item: Writeable
 {
-	let mut blinded_hops = Vec::with_capacity(unblinded_pks.len());
+	let mut blinded_hops = Vec::with_capacity(unblinded_pks.size_hint().0);
 	construct_keys_callback(
 		secp_ctx, unblinded_pks, None, session_priv,
 		|blinded_node_id, _, _, encrypted_payload_rho, _, _| {
@@ -128,11 +128,9 @@ where
 }
 
 /// Encrypt TLV payload to be used as a [`crate::blinded_path::BlindedHop::encrypted_payload`].
-fn encrypt_payload<P: Writeable>(payload: P, encrypted_tlvs_ss: [u8; 32]) -> Vec<u8> {
-	let mut writer = VecWriter(Vec::new());
-	let write_adapter = ChaChaPolyWriteAdapter::new(encrypted_tlvs_ss, &payload);
-	write_adapter.write(&mut writer).expect("In-memory writes cannot fail");
-	writer.0
+fn encrypt_payload<P: Writeable>(payload: P, encrypted_tlvs_rho: [u8; 32]) -> Vec<u8> {
+	let write_adapter = ChaChaPolyWriteAdapter::new(encrypted_tlvs_rho, &payload);
+	write_adapter.encode()
 }
 
 /// Blinded path encrypted payloads may be padded to ensure they are equal length.