f split iter into intermediate vars

Author: valentinewallace

lightning/src/ln/onion_utils.rs

@@ -114,11 +114,11 @@ where
 	let mut blinded_priv = session_priv.clone();
 	let mut blinded_pub = PublicKey::from_secret_key(secp_ctx, &blinded_priv);
 
-	for (idx, (pubkey, route_hop_opt)) in path.hops.iter().map(|h| (h.pubkey, Some(h)))
-		.chain(path.blinded_tail.as_ref().map(|t| t.hops.iter()).unwrap_or([].iter()).skip(1)
-			.map(|h| (h.blinded_node_id, None)))
-		.enumerate()
-	{
+	let unblinded_hops_iter = path.hops.iter().map(|h| (h.pubkey, Some(h)));
+	let blinded_pks_iter = path.blinded_tail.as_ref()
+		.map(|t| t.hops.iter()).unwrap_or([].iter()).skip(1) // Skip the intro node because it's included in the unblinded hops
+		.map(|h| (h.blinded_node_id, None));
+	for (idx, (pubkey, route_hop_opt)) in unblinded_hops_iter.chain(blinded_pks_iter).enumerate() {
 		let shared_secret = SharedSecret::new(&pubkey, &blinded_priv);
 
 		let mut sha = Sha256::engine();