X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fblinded_path%2Futils.rs;h=7e43f31453637a6fdea2309d4713f2b34567693f;hb=3a9fe209e104e048921ad50be77a80b18a98b45c;hp=33a2cde8c8f6666702b860a0b856bdf1d3c46ff2;hpb=fb670c8faae8c1e990496b869e62dfbde10a64f8;p=rust-lightning

diff --git a/lightning/src/blinded_path/utils.rs b/lightning/src/blinded_path/utils.rs
index 33a2cde8..7e43f314 100644
--- a/lightning/src/blinded_path/utils.rs
+++ b/lightning/src/blinded_path/utils.rs
@@ -18,11 +18,13 @@ 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::onion_message::messenger::Destination;
+use crate::crypto::streams::ChaChaPolyWriteAdapter;
 use crate::util::ser::{Readable, Writeable};
 
 use crate::io;
+
+#[allow(unused_imports)]
 use crate::prelude::*;
 
 // TODO: DRY with onion_utils::construct_onion_keys_callback
@@ -49,7 +51,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 +72,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 +82,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);