f

Author: TheBlueMatt

lightning/src/blinded_path/utils.rs

@@ -138,21 +138,13 @@ where
 }
 
 fn construct_keys_for_blinded_path<'a, T, I, F, H>(
-	secp_ctx: &Secp256k1<T>, unblinded_path: I, session_priv: &SecretKey,
-	mut callback: F,
+	secp_ctx: &Secp256k1<T>, unblinded_path: I, session_priv: &SecretKey, mut callback: F,
 ) -> Result<(), secp256k1::Error>
 where
 	T: secp256k1::Signing + secp256k1::Verification,
 	H: Borrow<PublicKey>,
 	I: Iterator<Item = H>,
-	F: FnMut(
-		PublicKey,
-		SharedSecret,
-		PublicKey,
-		[u8; 32],
-		Option<H>,
-		Option<Vec<u8>>,
-	),
+	F: FnMut(PublicKey, SharedSecret, PublicKey, [u8; 32], Option<H>, Option<Vec<u8>>),
 {
 	build_keys_helper!(session_priv, secp_ctx, callback);
 
@@ -186,8 +178,10 @@ where
 	let mut blinded_hops = Vec::with_capacity(unblinded_path.size_hint().0);
 	construct_keys_for_blinded_path(
 		secp_ctx,
-		unblinded_path.map(|((pubkey, hop_recv_key), tlvs)| {
-			PublicKeyWithTlvs { pubkey, hop_recv_key, tlvs }
+		unblinded_path.map(|((pubkey, hop_recv_key), tlvs)| PublicKeyWithTlvs {
+			pubkey,
+			hop_recv_key,
+			tlvs,
 		}),
 		session_priv,
 		|blinded_node_id, _, _, encrypted_payload_rho, unblinded_hop_data, _| {

lightning/src/onion_message/messenger.rs

@@ -2298,7 +2298,12 @@ fn packet_payloads_and_keys<
 
 	if let Some(control_tlvs) = final_control_tlvs {
 		payloads.push((
-			Payload::Receive { control_tlvs, reply_path: reply_path.take(), message, control_tlvs_authenticated: false, },
+			Payload::Receive {
+				control_tlvs,
+				reply_path: reply_path.take(),
+				message,
+				control_tlvs_authenticated: false,
+			},
 			prev_control_tlvs_ss.unwrap(),
 		));
 	} else {

lightning/src/onion_message/packet.rs

@@ -116,7 +116,10 @@ pub(super) enum Payload<T: OnionMessageContents> {
 		/// The [`ReceiveControlTlvs`] were authenticated with the additional key which was
 		/// provided to [`ReadableArgs::read`].
 		control_tlvs_authenticated: bool,
-		control_tlvs: ReceiveControlTlvs, reply_path: Option<BlindedMessagePath>, message: T },
+		control_tlvs: ReceiveControlTlvs,
+		reply_path: Option<BlindedMessagePath>,
+		message: T,
+	},
 }
 
 /// The contents of an [`OnionMessage`] as read from the wire.
@@ -258,10 +261,13 @@ impl<T: OnionMessageContents> Writeable for (Payload<T>, [u8; 32]) {
 }
 
 // Uses the provided secret to simultaneously decode and decrypt the control TLVs and data TLV.
-impl<H: CustomOnionMessageHandler + ?Sized, L: Logger + ?Sized> ReadableArgs<(SharedSecret, &H, [u8; 32], &L)>
+impl<H: CustomOnionMessageHandler + ?Sized, L: Logger + ?Sized>
+	ReadableArgs<(SharedSecret, &H, [u8; 32], &L)>
 	for Payload<ParsedOnionMessageContents<<H as CustomOnionMessageHandler>::CustomMessage>>
 {
-	fn read<R: Read>(r: &mut R, args: (SharedSecret, &H, [u8; 32], &L)) -> Result<Self, DecodeError> {
+	fn read<R: Read>(
+		r: &mut R, args: (SharedSecret, &H, [u8; 32], &L),
+	) -> Result<Self, DecodeError> {
 		let (encrypted_tlvs_ss, handler, receive_tlvs_key, logger) = args;
 
 		let v: BigSize = Readable::read(r)?;