f - Use name final_cltv_expiry_delta

Author: jkczyz

lightning/src/routing/router.rs

@@ -143,13 +143,13 @@ pub struct PaymentPathRetry {
 	pub final_value_msat: u64,
 
 	/// The CLTV on the final hop of the failed payment path.
-	pub final_cltv: u32,
+	pub final_cltv_expiry_delta: u32,
 }
 
 impl_writeable_tlv_based!(PaymentPathRetry, {
 	(0, payee, required),
 	(2, final_value_msat, required),
-	(4, final_cltv, required),
+	(4, final_cltv_expiry_delta, required),
 });
 
 /// The recipient of a payment.
@@ -474,13 +474,14 @@ fn compute_fees(amount_msat: u64, channel_fees: RoutingFees) -> Option<u64> {
 pub fn get_keysend_route<L: Deref, S: routing::Score>(
 	our_node_pubkey: &PublicKey, network: &NetworkGraph, payee: &PublicKey,
 	first_hops: Option<&[&ChannelDetails]>, last_hops: &[&RouteHint], final_value_msat: u64,
-	final_cltv: u32, logger: L, scorer: &S
+	final_cltv_expiry_delta: u32, logger: L, scorer: &S
 ) -> Result<Route, LightningError>
 where L::Target: Logger {
 	let route_hints = last_hops.iter().map(|hint| (*hint).clone()).collect();
 	let payee = Payee::for_keysend(*payee).with_route_hints(route_hints);
 	get_route(
-		our_node_pubkey, &payee, network, first_hops, final_value_msat, final_cltv, logger, scorer
+		our_node_pubkey, &payee, network, first_hops, final_value_msat, final_cltv_expiry_delta,
+		logger, scorer
 	)
 }
 
@@ -497,7 +498,7 @@ pub fn get_retry_route<L: Deref, S: routing::Score>(
 where L::Target: Logger {
 	get_route(
 		our_node_pubkey, &retry.payee, network, first_hops, retry.final_value_msat,
-		retry.final_cltv, logger, scorer
+		retry.final_cltv_expiry_delta, logger, scorer
 	)
 }
 
@@ -521,8 +522,8 @@ where L::Target: Logger {
 /// htlc_minimum_msat/htlc_maximum_msat *are* checked as they may change based on the receiving node.
 pub fn get_route<L: Deref, S: routing::Score>(
 	our_node_pubkey: &PublicKey, payee: &Payee, network: &NetworkGraph,
-	first_hops: Option<&[&ChannelDetails]>, final_value_msat: u64, final_cltv: u32, logger: L,
-	scorer: &S
+	first_hops: Option<&[&ChannelDetails]>, final_value_msat: u64, final_cltv_expiry_delta: u32,
+	logger: L, scorer: &S
 ) -> Result<Route, LightningError>
 where L::Target: Logger {
 	let payee_node_id = NodeId::from_pubkey(&payee.pubkey);
@@ -1232,7 +1233,7 @@ where L::Target: Logger {
 				}
 				ordered_hops.last_mut().unwrap().0.fee_msat = value_contribution_msat;
 				ordered_hops.last_mut().unwrap().0.hop_use_fee_msat = 0;
-				ordered_hops.last_mut().unwrap().0.cltv_expiry_delta = final_cltv;
+				ordered_hops.last_mut().unwrap().0.cltv_expiry_delta = final_cltv_expiry_delta;
 
 				log_trace!(logger, "Found a path back to us from the target with {} hops contributing up to {} msat: {:?}",
 					ordered_hops.len(), value_contribution_msat, ordered_hops);