]> git.bitcoin.ninja Git - rust-lightning/commitdiff
Rename InboundOnionPayload::BlindedReceive::outgoing_cltv_value.
authorValentine Wallace <vwallace@protonmail.com>
Wed, 13 Dec 2023 21:43:27 +0000 (16:43 -0500)
committerValentine Wallace <vwallace@protonmail.com>
Wed, 10 Jan 2024 15:56:24 +0000 (10:56 -0500)
There is no outgoing HTLC for received HTLCs, so rename to be more accurate.

lightning/src/ln/msgs.rs
lightning/src/ln/onion_payment.rs

index 574f1b7cf05f8e8d3891e7eefed95e96135dc95d..d9b5cda4bcbc8e9f9b820b57139e32d4827a2c05 100644 (file)
@@ -1719,7 +1719,7 @@ mod fuzzy_internal_msgs {
                BlindedReceive {
                        amt_msat: u64,
                        total_msat: u64,
-                       outgoing_cltv_value: u32,
+                       cltv_expiry_height: u32,
                        payment_secret: PaymentSecret,
                        payment_constraints: PaymentConstraints,
                        intro_node_blinding_point: Option<PublicKey>,
@@ -2403,7 +2403,7 @@ impl<NS: Deref> ReadableArgs<(Option<PublicKey>, &NS)> for InboundOnionPayload w
                                        Ok(Self::BlindedReceive {
                                                amt_msat: amt.ok_or(DecodeError::InvalidValue)?,
                                                total_msat: total_msat.ok_or(DecodeError::InvalidValue)?,
-                                               outgoing_cltv_value: cltv_value.ok_or(DecodeError::InvalidValue)?,
+                                               cltv_expiry_height: cltv_value.ok_or(DecodeError::InvalidValue)?,
                                                payment_secret,
                                                payment_constraints,
                                                intro_node_blinding_point,
index ae602fb1103d5dab77c24a9c26bc27518453d97b..cba3ef0fb3d542a8923948e8a8c110b9e26272ba 100644 (file)
@@ -131,7 +131,7 @@ pub(super) fn create_recv_pending_htlc_info(
                        (payment_data, keysend_preimage, custom_tlvs, amt_msat, cltv_expiry_height, payment_metadata,
                         false),
                msgs::InboundOnionPayload::BlindedReceive {
-                       amt_msat, total_msat, outgoing_cltv_value, payment_secret, intro_node_blinding_point,
+                       amt_msat, total_msat, cltv_expiry_height, payment_secret, intro_node_blinding_point,
                        payment_constraints, ..
                } => {
                        check_blinded_payment_constraints(amt_msat, cltv_expiry, &payment_constraints)
@@ -143,7 +143,7 @@ pub(super) fn create_recv_pending_htlc_info(
                                        }
                                })?;
                        let payment_data = msgs::FinalOnionHopData { payment_secret, total_msat };
-                       (Some(payment_data), None, Vec::new(), amt_msat, outgoing_cltv_value, None,
+                       (Some(payment_data), None, Vec::new(), amt_msat, cltv_expiry_height, None,
                         intro_node_blinding_point.is_none())
                }
                msgs::InboundOnionPayload::Forward { .. } => {