f: formating and decloning and stuff

Author: arik-so

lightning/src/ln/onion_payment.rs

@@ -332,13 +332,13 @@ where
 				Some(next_packet_pubkey),
 			)?
 		},
-		onion_utils::Hop::Receive{hop_data, shared_secret} => {
+		onion_utils::Hop::Receive { hop_data, shared_secret } => {
 			create_recv_pending_htlc_info(
 				msgs::InboundOnionPayload::Receive(hop_data), shared_secret.secret_bytes(), msg.payment_hash, msg.amount_msat, msg.cltv_expiry,
 				None, allow_skimmed_fees, msg.skimmed_fee_msat, cur_height,
 			)?
 		},
-		onion_utils::Hop::BlindedReceive{hop_data, shared_secret} => {
+		onion_utils::Hop::BlindedReceive { hop_data, shared_secret } => {
 			create_recv_pending_htlc_info(
 				msgs::InboundOnionPayload::BlindedReceive(hop_data), shared_secret.secret_bytes(), msg.payment_hash, msg.amount_msat, msg.cltv_expiry,
 				None, allow_skimmed_fees, msg.skimmed_fee_msat, cur_height,

lightning/src/ln/onion_utils.rs

@@ -1469,12 +1469,12 @@ impl Hop {
 		}
 	}
 
-	pub(crate) fn shared_secret(&self) -> SharedSecret {
+	pub(crate) fn shared_secret(&self) -> &SharedSecret {
 		match self {
-			Hop::Forward { shared_secret, .. } => shared_secret.clone(),
-			Hop::BlindedForward { shared_secret, .. } => shared_secret.clone(),
-			Hop::Receive { shared_secret, .. } => shared_secret.clone(),
-			Hop::BlindedReceive { shared_secret, .. } => shared_secret.clone(),
+			Hop::Forward { shared_secret, .. } => shared_secret,
+			Hop::BlindedForward { shared_secret, .. } => shared_secret,
+			Hop::Receive { shared_secret, .. } => shared_secret,
+			Hop::BlindedReceive { shared_secret, .. } => shared_secret,
 		}
 	}
 }
@@ -1503,11 +1503,10 @@ where
 	});
 	let shared_secret = node_signer
 		.ecdh(recipient, hop_pubkey, blinded_node_id_tweak.as_ref())
-		.unwrap()
-		.secret_bytes();
+		.unwrap();
 
 	let decoded_hop: Result<(msgs::InboundOnionPayload, Option<_>), _> = decode_next_hop(
-		shared_secret,
+		shared_secret.secret_bytes(),
 		hop_data,
 		hmac_bytes,
 		Some(payment_hash),
@@ -1517,14 +1516,14 @@ where
 		Ok((next_hop_data, Some((next_hop_hmac, FixedSizeOnionPacket(new_packet_bytes))))) => {
 			match next_hop_data {
 				msgs::InboundOnionPayload::Forward(next_hop_data) => Ok(Hop::Forward {
-					shared_secret: SharedSecret::from_bytes(shared_secret),
+					shared_secret,
 					next_hop_data,
 					next_hop_hmac,
 					new_packet_bytes,
 				}),
 				msgs::InboundOnionPayload::BlindedForward(next_hop_data) => {
 					Ok(Hop::BlindedForward {
-						shared_secret: SharedSecret::from_bytes(shared_secret),
+						shared_secret,
 						next_hop_data,
 						next_hop_hmac,
 						new_packet_bytes,
@@ -1541,18 +1540,18 @@ where
 					Err(OnionDecodeErr::Relay {
 						err_msg: "Final Node OnionHopData provided for us as an intermediary node",
 						err_code: 0x4000 | 22,
-						shared_secret: SharedSecret::from_bytes(shared_secret),
+						shared_secret,
 					})
 				},
 			}
 		},
 		Ok((next_hop_data, None)) => match next_hop_data {
 			msgs::InboundOnionPayload::Receive(hop_data) => Ok(Hop::Receive {
-				shared_secret: SharedSecret::from_bytes(shared_secret),
+				shared_secret,
 				hop_data,
 			}),
 			msgs::InboundOnionPayload::BlindedReceive(hop_data) => Ok(Hop::BlindedReceive {
-				shared_secret: SharedSecret::from_bytes(shared_secret),
+				shared_secret,
 				hop_data,
 			}),
 			_ => {
@@ -1565,7 +1564,7 @@ where
 				Err(OnionDecodeErr::Relay {
 					err_msg: "Intermediate Node OnionHopData provided for us as a final node",
 					err_code: 0x4000 | 22,
-					shared_secret: SharedSecret::from_bytes(shared_secret),
+					shared_secret,
 				})
 			},
 		},