f: formating

Author: arik-so

lightning/src/ln/onion_utils.rs

@@ -33,10 +33,10 @@ use bitcoin::secp256k1::ecdh::SharedSecret;
 use bitcoin::secp256k1::{PublicKey, Scalar, Secp256k1, SecretKey};
 
 use crate::io::{Cursor, Read};
-use core::ops::Deref;
 use crate::ln::msgs::InboundOnionPayload;
 #[allow(unused_imports)]
 use crate::prelude::*;
+use core::ops::Deref;
 
 pub(crate) struct OnionKeys {
 	#[cfg(test)]
@@ -1434,7 +1434,7 @@ pub(crate) enum Hop {
 		next_trampoline_hop_data: msgs::InboundTrampolineForwardPayload,
 		trampoline_shared_secret: SharedSecret,
 		next_trampoline_hop_hmac: [u8; 32],
-		new_trampoline_packet_bytes: Vec<u8>
+		new_trampoline_packet_bytes: Vec<u8>,
 	},
 	/// This onion payload needs to be forwarded to a next-hop.
 	BlindedForward {
@@ -1563,43 +1563,54 @@ where
 				Ok(Hop::BlindedReceive { shared_secret, hop_data })
 			},
 			msgs::InboundOnionPayload::TrampolineEntrypoint(hop_data) => {
-				let trampoline_shared_secret = node_signer.ecdh(
-					recipient, &hop_data.trampoline_packet.public_key, blinded_node_id_tweak.as_ref(),
-				).unwrap().secret_bytes();
-				let decoded_trampoline_hop: Result<(msgs::InboundOnionPayload, Option<([u8; 32], Vec<u8>)>), _> = decode_next_hop(
+				let trampoline_shared_secret = node_signer
+					.ecdh(
+						recipient,
+						&hop_data.trampoline_packet.public_key,
+						blinded_node_id_tweak.as_ref(),
+					)
+					.unwrap()
+					.secret_bytes();
+				let decoded_trampoline_hop: Result<
+					(msgs::InboundOnionPayload, Option<([u8; 32], Vec<u8>)>),
+					_,
+				> = decode_next_hop(
 					trampoline_shared_secret,
 					&hop_data.trampoline_packet.hop_data,
 					hop_data.trampoline_packet.hmac,
 					Some(payment_hash),
 					(blinding_point, node_signer),
 				);
 				match decoded_trampoline_hop {
-					Ok((next_trampoline_hop_data, Some((next_trampoline_hop_hmac, new_trampoline_packet_bytes)))) => {
+					Ok((
+						next_trampoline_hop_data,
+						Some((next_trampoline_hop_hmac, new_trampoline_packet_bytes)),
+					)) => {
 						match next_trampoline_hop_data {
 							InboundOnionPayload::TrampolineForward(trampoline_hop_data) => {
 								Ok(Hop::TrampolineForward {
 									outer_hop_data: hop_data,
 									outer_shared_secret: shared_secret,
 									next_trampoline_hop_data: trampoline_hop_data,
-									trampoline_shared_secret: SharedSecret::from_bytes(trampoline_shared_secret),
+									trampoline_shared_secret: SharedSecret::from_bytes(
+										trampoline_shared_secret,
+									),
 									next_trampoline_hop_hmac,
 									new_trampoline_packet_bytes,
 								})
-							}
+							},
 							_ => Err(OnionDecodeErr::Malformed {
 								err_msg: "Non-Trampoline onion data provided to us as inner onion",
 								// todo: find more suitable error code
 								err_code: 0x4000 | 22,
-							})
+							}),
 						}
-					}
+					},
 					Ok((_next_trampoline_hop_data, None)) => {
 						// this is a trampoline receive
 						todo!()
 					},
-					Err(e) => {
-						Err(e)
-					}
+					Err(e) => Err(e),
 				}
 			},
 			_ => {