From b20a9ad2703e0bcc066e05142ea23c162d0ad6d7 Mon Sep 17 00:00:00 2001 From: Valentine Wallace Date: Thu, 14 Dec 2023 15:34:51 -0500 Subject: [PATCH] Rename OutboundOnionPayload::BlindedReceive::amt_msat to be more descriptive. --- lightning/src/ln/msgs.rs | 7 ++++--- lightning/src/ln/onion_utils.rs | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lightning/src/ln/msgs.rs b/lightning/src/ln/msgs.rs index ff9d2c195..41d8974f2 100644 --- a/lightning/src/ln/msgs.rs +++ b/lightning/src/ln/msgs.rs @@ -1746,7 +1746,7 @@ mod fuzzy_internal_msgs { intro_node_blinding_point: Option, }, BlindedReceive { - amt_msat: u64, + sender_intended_htlc_amt_msat: u64, total_msat: u64, cltv_expiry_height: u32, encrypted_tlvs: Vec, @@ -2312,10 +2312,11 @@ impl Writeable for OutboundOnionPayload { }); }, Self::BlindedReceive { - amt_msat, total_msat, cltv_expiry_height, encrypted_tlvs, intro_node_blinding_point, + sender_intended_htlc_amt_msat, total_msat, cltv_expiry_height, encrypted_tlvs, + intro_node_blinding_point, } => { _encode_varint_length_prefixed_tlv!(w, { - (2, HighZeroBytesDroppedBigSize(*amt_msat), required), + (2, HighZeroBytesDroppedBigSize(*sender_intended_htlc_amt_msat), required), (4, HighZeroBytesDroppedBigSize(*cltv_expiry_height), required), (10, *encrypted_tlvs, required_vec), (12, intro_node_blinding_point, option), diff --git a/lightning/src/ln/onion_utils.rs b/lightning/src/ln/onion_utils.rs index f3112c207..ac0bb6189 100644 --- a/lightning/src/ln/onion_utils.rs +++ b/lightning/src/ln/onion_utils.rs @@ -190,7 +190,7 @@ pub(super) fn build_onion_payloads(path: &Path, total_msat: u64, mut recipient_o cur_value_msat += final_value_msat; cur_cltv += excess_final_cltv_expiry_delta; res.push(msgs::OutboundOnionPayload::BlindedReceive { - amt_msat: *final_value_msat, + sender_intended_htlc_amt_msat: *final_value_msat, total_msat, cltv_expiry_height: cltv, encrypted_tlvs: blinded_hop.encrypted_payload.clone(), -- 2.39.5