Move and rename CTLV delta limit.

Author: Elias Rohrer

lightning-invoice/src/payment.rs

@@ -140,10 +140,10 @@ use bitcoin_hashes::sha256::Hash as Sha256;
 
 use crate::prelude::*;
 use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
-use lightning::ln::channelmanager::{ChannelDetails, PaymentId, PaymentSendFailure, MAX_TOTAL_CLTV_EXPIRY_DELTA};
+use lightning::ln::channelmanager::{ChannelDetails, PaymentId, PaymentSendFailure};
 use lightning::ln::msgs::LightningError;
 use lightning::routing::scoring::{LockableScore, Score};
-use lightning::routing::router::{Payee, Route, RouteParameters};
+use lightning::routing::router::{Payee, Route, RouteParameters, DEFAULT_MAX_TOTAL_CLTV_DELTA};
 use lightning::util::events::{Event, EventHandler};
 use lightning::util::logger::Logger;
 use crate::sync::Mutex;
@@ -306,7 +306,7 @@ where
 			payee,
 			final_value_msat: invoice.amount_milli_satoshis().or(amount_msats).unwrap(),
 			final_cltv_expiry_delta: invoice.min_final_cltv_expiry() as u32,
-			max_total_cltv_expiry_delta: MAX_TOTAL_CLTV_EXPIRY_DELTA,
+			max_total_cltv_expiry_delta: DEFAULT_MAX_TOTAL_CLTV_DELTA,
 		};
 
 		let send_payment = |route: &Route| {
@@ -335,7 +335,7 @@ where
 			payee: Payee::for_keysend(pubkey),
 			final_value_msat: amount_msats,
 			final_cltv_expiry_delta,
-			max_total_cltv_expiry_delta: MAX_TOTAL_CLTV_EXPIRY_DELTA,
+			max_total_cltv_expiry_delta: DEFAULT_MAX_TOTAL_CLTV_DELTA,
 		};
 
 		let send_payment = |route: &Route| {
@@ -1275,7 +1275,7 @@ mod tests {
 				payee,
 				final_value_msat,
 				final_cltv_expiry_delta: invoice.min_final_cltv_expiry() as u32,
-				max_total_cltv_expiry_delta: MAX_TOTAL_CLTV_EXPIRY_DELTA,
+				max_total_cltv_expiry_delta: DEFAULT_MAX_TOTAL_CLTV_DELTA,
 			}
 		}
 	}

lightning-invoice/src/utils.rs

@@ -194,11 +194,11 @@ mod test {
 	use core::time::Duration;
 	use {Currency, Description, InvoiceDescription};
 	use lightning::ln::PaymentHash;
-	use lightning::ln::channelmanager::{MIN_FINAL_CLTV_EXPIRY,MAX_TOTAL_CLTV_EXPIRY_DELTA};
+	use lightning::ln::channelmanager::MIN_FINAL_CLTV_EXPIRY;
 	use lightning::ln::functional_test_utils::*;
 	use lightning::ln::features::InitFeatures;
 	use lightning::ln::msgs::ChannelMessageHandler;
-	use lightning::routing::router::{Payee, RouteParameters, find_route};
+	use lightning::routing::router::{Payee, RouteParameters, find_route, DEFAULT_MAX_TOTAL_CLTV_DELTA};
 	use lightning::util::events::MessageSendEventsProvider;
 	use lightning::util::test_utils;
 	use utils::create_invoice_from_channelmanager_and_duration_since_epoch;
@@ -224,7 +224,7 @@ mod test {
 			payee,
 			final_value_msat: invoice.amount_milli_satoshis().unwrap(),
 			final_cltv_expiry_delta: invoice.min_final_cltv_expiry() as u32,
-			max_total_cltv_expiry_delta: MAX_TOTAL_CLTV_EXPIRY_DELTA,
+			max_total_cltv_expiry_delta: DEFAULT_MAX_TOTAL_CLTV_DELTA,
 		};
 		let first_hops = nodes[0].node.list_usable_channels();
 		let network_graph = node_cfgs[0].network_graph;

lightning/src/ln/channelmanager.rs

@@ -45,7 +45,7 @@ use chain::transaction::{OutPoint, TransactionData};
 use ln::{PaymentHash, PaymentPreimage, PaymentSecret};
 use ln::channel::{Channel, ChannelError, ChannelUpdateStatus, UpdateFulfillCommitFetch};
 use ln::features::{InitFeatures, NodeFeatures};
-use routing::router::{Payee, Route, RouteHop, RoutePath, RouteParameters};
+use routing::router::{Payee, Route, RouteHop, RoutePath, RouteParameters, DEFAULT_MAX_TOTAL_CLTV_DELTA};
 use ln::msgs;
 use ln::msgs::NetAddress;
 use ln::onion_utils;
@@ -1119,9 +1119,6 @@ pub(super) const CLTV_FAR_FAR_AWAY: u32 = 6 * 24 * 7; //TODO?
 // a payment was being routed, so we add an extra block to be safe.
 pub const MIN_FINAL_CLTV_EXPIRY: u32 = HTLC_FAIL_BACK_BUFFER + 3;
 
-/// Maximum total CTLV difference we allow for a full payment path
-pub const MAX_TOTAL_CLTV_EXPIRY_DELTA: u32 = 1000;
-
 // Check that our CLTV_EXPIRY is at least CLTV_CLAIM_BUFFER + ANTI_REORG_DELAY + LATENCY_GRACE_PERIOD_BLOCKS,
 // ie that if the next-hop peer fails the HTLC within
 // LATENCY_GRACE_PERIOD_BLOCKS then we'll still have CLTV_CLAIM_BUFFER left to timeout it onchain,
@@ -2654,7 +2651,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 							payee: payee.clone(),
 							final_value_msat: pending_amt_unsent,
 							final_cltv_expiry_delta: max_unsent_cltv_delta,
-							max_total_cltv_expiry_delta: MAX_TOTAL_CLTV_EXPIRY_DELTA,
+							max_total_cltv_expiry_delta: DEFAULT_MAX_TOTAL_CLTV_DELTA,
 						})
 					} else { None }
 				} else { None },
@@ -3601,7 +3598,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 									payee: payee_data,
 									final_value_msat: path_last_hop.fee_msat,
 									final_cltv_expiry_delta: path_last_hop.cltv_expiry_delta,
-									max_total_cltv_expiry_delta: MAX_TOTAL_CLTV_EXPIRY_DELTA,
+									max_total_cltv_expiry_delta: DEFAULT_MAX_TOTAL_CLTV_DELTA,
 								})
 							} else { None };
 							let mut pending_events = self.pending_events.lock().unwrap();
@@ -3687,7 +3684,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 						payee: payee_data.clone(),
 						final_value_msat: path_last_hop.fee_msat,
 						final_cltv_expiry_delta: path_last_hop.cltv_expiry_delta,
-						max_total_cltv_expiry_delta: MAX_TOTAL_CLTV_EXPIRY_DELTA,
+						max_total_cltv_expiry_delta: DEFAULT_MAX_TOTAL_CLTV_DELTA,
 					})
 				} else { None };
 				log_trace!(self.logger, "Failing outbound payment HTLC with payment_hash {}", log_bytes!(payment_hash.0));

lightning/src/routing/router.rs

@@ -177,6 +177,10 @@ impl_writeable_tlv_based!(RouteParameters, {
 	(6, max_total_cltv_expiry_delta, required),
 });
 
+/// Maximum total CTLV difference we allow for a full payment path
+pub const DEFAULT_MAX_TOTAL_CLTV_DELTA: u32 = 1000;
+
+
 /// The recipient of a payment.
 #[derive(Clone, Debug, Hash, PartialEq, Eq)]
 pub struct Payee {