Skip to content

Commit b8fa547

Browse files
Rename InboundOnionPayload::Receive::outgoing_cltv_value
.. since there is no outgoing cltv for received HTLCs.
1 parent cadea5d commit b8fa547

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

lightning/src/ln/channelmanager.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12128,7 +12128,7 @@ mod tests {
1212812128
let extra_fee_msat = 10;
1212912129
let hop_data = msgs::InboundOnionPayload::Receive {
1213012130
amt_msat: 100,
12131-
outgoing_cltv_value: 42,
12131+
cltv_expiry_height: 42,
1213212132
payment_metadata: None,
1213312133
keysend_preimage: None,
1213412134
payment_data: Some(msgs::FinalOnionHopData {
@@ -12150,7 +12150,7 @@ mod tests {
1215012150
// If amt_received + extra_fee is equal to the sender intended amount, we're fine.
1215112151
let hop_data = msgs::InboundOnionPayload::Receive { // This is the same payload as above, InboundOnionPayload doesn't implement Clone
1215212152
amt_msat: 100,
12153-
outgoing_cltv_value: 42,
12153+
cltv_expiry_height: 42,
1215412154
payment_metadata: None,
1215512155
keysend_preimage: None,
1215612156
payment_data: Some(msgs::FinalOnionHopData {
@@ -12174,7 +12174,7 @@ mod tests {
1217412174
let current_height: u32 = node[0].node.best_block.read().unwrap().height();
1217512175
let result = create_recv_pending_htlc_info(msgs::InboundOnionPayload::Receive {
1217612176
amt_msat: 100,
12177-
outgoing_cltv_value: 22,
12177+
cltv_expiry_height: 22,
1217812178
payment_metadata: None,
1217912179
keysend_preimage: None,
1218012180
payment_data: Some(msgs::FinalOnionHopData {

lightning/src/ln/msgs.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1707,7 +1707,7 @@ mod fuzzy_internal_msgs {
17071707
keysend_preimage: Option<PaymentPreimage>,
17081708
custom_tlvs: Vec<(u64, Vec<u8>)>,
17091709
amt_msat: u64,
1710-
outgoing_cltv_value: u32,
1710+
cltv_expiry_height: u32,
17111711
},
17121712
BlindedForward {
17131713
short_channel_id: u64,
@@ -2433,7 +2433,7 @@ impl<NS: Deref> ReadableArgs<(Option<PublicKey>, &NS)> for InboundOnionPayload w
24332433
payment_metadata: payment_metadata.map(|w| w.0),
24342434
keysend_preimage,
24352435
amt_msat: amt.ok_or(DecodeError::InvalidValue)?,
2436-
outgoing_cltv_value: cltv_value.ok_or(DecodeError::InvalidValue)?,
2436+
cltv_expiry_height: cltv_value.ok_or(DecodeError::InvalidValue)?,
24372437
custom_tlvs,
24382438
})
24392439
}
@@ -4030,10 +4030,10 @@ mod tests {
40304030
let node_signer = test_utils::TestKeysInterface::new(&[42; 32], Network::Testnet);
40314031
let inbound_msg = ReadableArgs::read(&mut Cursor::new(&target_value[..]), (None, &&node_signer)).unwrap();
40324032
if let msgs::InboundOnionPayload::Receive {
4033-
payment_data: None, amt_msat, outgoing_cltv_value, ..
4033+
payment_data: None, amt_msat, cltv_expiry_height, ..
40344034
} = inbound_msg {
40354035
assert_eq!(amt_msat, 0x0badf00d01020304);
4036-
assert_eq!(outgoing_cltv_value, 0xffffffff);
4036+
assert_eq!(cltv_expiry_height, 0xffffffff);
40374037
} else { panic!(); }
40384038
}
40394039

@@ -4062,14 +4062,14 @@ mod tests {
40624062
payment_secret,
40634063
total_msat: 0x1badca1f
40644064
}),
4065-
amt_msat, outgoing_cltv_value,
4065+
amt_msat, cltv_expiry_height,
40664066
payment_metadata: None,
40674067
keysend_preimage: None,
40684068
custom_tlvs,
40694069
} = inbound_msg {
40704070
assert_eq!(payment_secret, expected_payment_secret);
40714071
assert_eq!(amt_msat, 0x0badf00d01020304);
4072-
assert_eq!(outgoing_cltv_value, 0xffffffff);
4072+
assert_eq!(cltv_expiry_height, 0xffffffff);
40734073
assert_eq!(custom_tlvs, vec![]);
40744074
} else { panic!(); }
40754075
}
@@ -4133,7 +4133,7 @@ mod tests {
41334133
keysend_preimage: None,
41344134
custom_tlvs,
41354135
amt_msat,
4136-
outgoing_cltv_value,
4136+
cltv_expiry_height: outgoing_cltv_value,
41374137
..
41384138
} = inbound_msg {
41394139
assert_eq!(custom_tlvs, expected_custom_tlvs);

lightning/src/ln/onion_payment.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@ pub(super) fn create_recv_pending_htlc_info(
126126
payment_metadata, requires_blinded_error
127127
) = match hop_data {
128128
msgs::InboundOnionPayload::Receive {
129-
payment_data, keysend_preimage, custom_tlvs, amt_msat, outgoing_cltv_value, payment_metadata, ..
129+
payment_data, keysend_preimage, custom_tlvs, amt_msat, cltv_expiry_height, payment_metadata, ..
130130
} =>
131-
(payment_data, keysend_preimage, custom_tlvs, amt_msat, outgoing_cltv_value, payment_metadata,
131+
(payment_data, keysend_preimage, custom_tlvs, amt_msat, cltv_expiry_height, payment_metadata,
132132
false),
133133
msgs::InboundOnionPayload::BlindedReceive {
134134
amt_msat, total_msat, outgoing_cltv_value, payment_secret, intro_node_blinding_point,

0 commit comments

Comments
 (0)