mirrors/rust-lightning
1
0
Fork 0
mirror of https://github.com/lightningdevkit/rust-lightning.git synced 2025-02-25 15:20:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rename OutboundOnionPayload::Receive::outgoing_cltv_value.

Browse source 
There is no outgoing HTLC for received HTLCs, so rename to be more accurate.
This commit is contained in:
Valentine Wallace 2023-12-13 17:18:56 -05:00
parent 7c3ef195c4
commit 4d38ee65c3
No known key found for this signature in database
GPG key ID: FD3E106A2CE099B4
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lightning/src/ln/msgs.rs
View file

@ -1739,7 +1739,7 @@ mod fuzzy_internal_msgs {
keysend_preimage: Option<PaymentPreimage>, keysend_preimage: Option<PaymentPreimage>,
custom_tlvs: Vec<(u64, Vec<u8>)>, custom_tlvs: Vec<(u64, Vec<u8>)>,
amt_msat: u64, amt_msat: u64,
outgoing_cltv_value: u32, cltv_expiry_height: u32,
}, },
BlindedForward { BlindedForward {
encrypted_tlvs: Vec<u8>, encrypted_tlvs: Vec<u8>,
@ -2289,8 +2289,8 @@ impl Writeable for OutboundOnionPayload {
}); });
}, },
Self::Receive { Self::Receive {
ref payment_data, ref payment_metadata, ref keysend_preimage, amt_msat, ref payment_data, ref payment_metadata, ref keysend_preimage, amt_msat, cltv_expiry_height,
outgoing_cltv_value, ref custom_tlvs, ref custom_tlvs,
} => { } => {
// We need to update [`ln::outbound_payment::RecipientOnionFields::with_custom_tlvs`] // We need to update [`ln::outbound_payment::RecipientOnionFields::with_custom_tlvs`]
// to reject any reserved types in the experimental range if new ones are ever // to reject any reserved types in the experimental range if new ones are ever
@ -2300,7 +2300,7 @@ impl Writeable for OutboundOnionPayload {
custom_tlvs.sort_unstable_by_key(|(typ, _)| *typ); custom_tlvs.sort_unstable_by_key(|(typ, _)| *typ);
_encode_varint_length_prefixed_tlv!(w, { _encode_varint_length_prefixed_tlv!(w, {
(2, HighZeroBytesDroppedBigSize(*amt_msat), required), (2, HighZeroBytesDroppedBigSize(*amt_msat), required),
(4, HighZeroBytesDroppedBigSize(*outgoing_cltv_value), required), (4, HighZeroBytesDroppedBigSize(*cltv_expiry_height), required),
(8, payment_data, option), (8, payment_data, option),
(16, payment_metadata.as_ref().map(|m| WithoutLength(m)), option) (16, payment_metadata.as_ref().map(|m| WithoutLength(m)), option)
}, custom_tlvs.iter()); }, custom_tlvs.iter());
@ -4020,7 +4020,7 @@ mod tests {
payment_metadata: None, payment_metadata: None,
keysend_preimage: None, keysend_preimage: None,
amt_msat: 0x0badf00d01020304, amt_msat: 0x0badf00d01020304,
outgoing_cltv_value: 0xffffffff, cltv_expiry_height: 0xffffffff,
custom_tlvs: vec![], custom_tlvs: vec![],
}; };
let encoded_value = outbound_msg.encode(); let encoded_value = outbound_msg.encode();
@ -4048,7 +4048,7 @@ mod tests {
payment_metadata: None, payment_metadata: None,
keysend_preimage: None, keysend_preimage: None,
amt_msat: 0x0badf00d01020304, amt_msat: 0x0badf00d01020304,
outgoing_cltv_value: 0xffffffff, cltv_expiry_height: 0xffffffff,
custom_tlvs: vec![], custom_tlvs: vec![],
}; };
let encoded_value = outbound_msg.encode(); let encoded_value = outbound_msg.encode();
@ -4088,7 +4088,7 @@ mod tests {
keysend_preimage: None, keysend_preimage: None,
custom_tlvs: bad_type_range_tlvs, custom_tlvs: bad_type_range_tlvs,
amt_msat: 0x0badf00d01020304, amt_msat: 0x0badf00d01020304,
outgoing_cltv_value: 0xffffffff, cltv_expiry_height: 0xffffffff,
}; };
let encoded_value = msg.encode(); let encoded_value = msg.encode();
let node_signer = test_utils::TestKeysInterface::new(&[42; 32], Network::Testnet); let node_signer = test_utils::TestKeysInterface::new(&[42; 32], Network::Testnet);
@ -4120,7 +4120,7 @@ mod tests {
keysend_preimage: None, keysend_preimage: None,
custom_tlvs: expected_custom_tlvs.clone(), custom_tlvs: expected_custom_tlvs.clone(),
amt_msat: 0x0badf00d01020304, amt_msat: 0x0badf00d01020304,
outgoing_cltv_value: 0xffffffff, cltv_expiry_height: 0xffffffff,
}; };
let encoded_value = msg.encode(); let encoded_value = msg.encode();
let target_value = <Vec<u8>>::from_hex("2e02080badf00d010203040404ffffffffff0000000146c6616b021234ff0000000146c6616f084242424242424242").unwrap(); let target_value = <Vec<u8>>::from_hex("2e02080badf00d010203040404ffffffffff0000000146c6616b021234ff0000000146c6616f084242424242424242").unwrap();

2
lightning/src/ln/onion_utils.rs
View file

@ -215,7 +215,7 @@ pub(super) fn build_onion_payloads(path: &Path, total_msat: u64, mut recipient_o
keysend_preimage: *keysend_preimage, keysend_preimage: *keysend_preimage,
custom_tlvs: recipient_onion.custom_tlvs.clone(), custom_tlvs: recipient_onion.custom_tlvs.clone(),
amt_msat: value_msat, amt_msat: value_msat,
outgoing_cltv_value: cltv, cltv_expiry_height: cltv,
}); });
} }
} else { } else {