Remove unused callback arg from construct_keys_for_onion_message

Author: TheBlueMatt

lightning/src/blinded_path/utils.rs

@@ -113,9 +113,13 @@ pub(crate) fn construct_keys_for_onion_message<'a, T, I, F>(
 where
 	T: secp256k1::Signing + secp256k1::Verification,
 	I: Iterator<Item = PublicKey>,
-	F: FnMut(PublicKey, SharedSecret, PublicKey, [u8; 32], Option<PublicKey>, Option<Vec<u8>>),
+	F: FnMut(SharedSecret, PublicKey, [u8; 32], Option<PublicKey>, Option<Vec<u8>>),
 {
-	build_keys_helper!(session_priv, secp_ctx, callback);
+	let mut callback_wrapper =
+		|_, ss, pk, encrypted_payload_rho, unblinded_hop_data, encrypted_payload| {
+			callback(ss, pk, encrypted_payload_rho, unblinded_hop_data, encrypted_payload);
+		};
+	build_keys_helper!(session_priv, secp_ctx, callback_wrapper);
 
 	for pk in unblinded_path {
 		build_keys_in_loop!(pk, false, None);

lightning/src/onion_message/messenger.rs

@@ -2271,12 +2271,7 @@ fn packet_payloads_and_keys<
 		unblinded_path.into_iter(),
 		destination,
 		session_priv,
-		|_,
-		 onion_packet_ss,
-		 ephemeral_pubkey,
-		 control_tlvs_ss,
-		 unblinded_pk_opt,
-		 enc_payload_opt| {
+		|onion_packet_ss, ephemeral_pubkey, control_tlvs_ss, unblinded_pk_opt, enc_payload_opt| {
 			if num_unblinded_hops != 0 && unblinded_path_idx < num_unblinded_hops {
 				if let Some(ss) = prev_control_tlvs_ss.take() {
 					payloads.push((