Make cltv_expiry_delta u16

Align LSPS2 CLTV deltas with the wire format and LDK routing
types.

Co-Authored-By: HAL 9000

Author: tnull

lightning-liquidity/src/lsps2/event.rs

@@ -63,7 +63,7 @@ pub enum LSPS2ClientEvent {
 		/// The intercept short channel id to use in the route hint.
 		intercept_scid: u64,
 		/// The `cltv_expiry_delta` to use in the route hint.
-		cltv_expiry_delta: u32,
+		cltv_expiry_delta: u16,
 		/// The initial payment size you specified.
 		payment_size_msat: Option<u64>,
 	},

lightning-liquidity/src/lsps2/msgs.rs

@@ -182,7 +182,7 @@ pub struct LSPS2BuyResponse {
 	/// The intercept short channel id used by LSP to identify need to open channel.
 	pub jit_channel_scid: LSPS2InterceptScid,
 	/// The locktime expiry delta the lsp requires.
-	pub lsp_cltv_expiry_delta: u32,
+	pub lsp_cltv_expiry_delta: u16,
 	/// Trust model flag (default: false).
 	///
 	/// false => "LSP trusts client": LSP immediately (or as soon as safe) broadcasts the

lightning-liquidity/src/lsps2/service.rs

@@ -904,7 +904,7 @@ where
 	/// [`LSPS2ServiceEvent::BuyRequest`]: crate::lsps2::event::LSPS2ServiceEvent::BuyRequest
 	pub async fn invoice_parameters_generated(
 		&self, counterparty_node_id: &PublicKey, request_id: LSPSRequestId, intercept_scid: u64,
-		cltv_expiry_delta: u32, client_trusts_lsp: bool, user_channel_id: u128,
+		cltv_expiry_delta: u16, client_trusts_lsp: bool, user_channel_id: u128,
 	) -> Result<(), APIError> {
 		let mut message_queue_notifier = self.pending_messages.notifier();
 		let mut should_persist = false;
@@ -2177,7 +2177,7 @@ where
 	/// Wraps [`LSPS2ServiceHandler::invoice_parameters_generated`].
 	pub fn invoice_parameters_generated(
 		&self, counterparty_node_id: &PublicKey, request_id: LSPSRequestId, intercept_scid: u64,
-		cltv_expiry_delta: u32, client_trusts_lsp: bool, user_channel_id: u128,
+		cltv_expiry_delta: u16, client_trusts_lsp: bool, user_channel_id: u128,
 	) -> Result<(), APIError> {
 		let mut fut = pin!(self.inner.invoice_parameters_generated(
 			counterparty_node_id,

lightning-liquidity/tests/lsps2_integration_tests.rs

@@ -116,7 +116,7 @@ fn setup_test_lsps2_nodes_with_payer<'a, 'b, 'c>(
 
 fn create_jit_invoice(
 	node: &LiquidityNode<'_, '_, '_>, service_node_id: PublicKey, intercept_scid: u64,
-	cltv_expiry_delta: u32, payment_size_msat: Option<u64>, description: &str, expiry_secs: u32,
+	cltv_expiry_delta: u16, payment_size_msat: Option<u64>, description: &str, expiry_secs: u32,
 ) -> Result<Bolt11Invoice, ()> {
 	// LSPS2 requires min_final_cltv_expiry_delta to be at least 2 more than usual.
 	let min_final_cltv_expiry_delta = MIN_FINAL_CLTV_EXPIRY_DELTA + 2;
@@ -131,7 +131,7 @@ fn create_jit_invoice(
 		src_node_id: service_node_id,
 		short_channel_id: intercept_scid,
 		fees: RoutingFees { base_msat: 0, proportional_millionths: 0 },
-		cltv_expiry_delta: cltv_expiry_delta as u16,
+		cltv_expiry_delta,
 		htlc_minimum_msat: None,
 		htlc_maximum_msat: None,
 	}]);
@@ -1286,7 +1286,7 @@ fn client_trusts_lsp_end_to_end_test() {
 
 	let intercept_scid = service_node.node.get_intercept_scid();
 	let user_channel_id = 42;
-	let cltv_expiry_delta: u32 = 144;
+	let cltv_expiry_delta: u16 = 144;
 	let payment_size_msat = Some(1_000_000);
 
 	let fee_base_msat = 1000;
@@ -1464,7 +1464,7 @@ fn client_trusts_lsp_end_to_end_test() {
 
 fn execute_lsps2_dance(
 	lsps_nodes: &LSPSNodesWithPayer, intercept_scid: u64, user_channel_id: u128,
-	cltv_expiry_delta: u32, promise_secret: [u8; 32], payment_size_msat: Option<u64>,
+	cltv_expiry_delta: u16, promise_secret: [u8; 32], payment_size_msat: Option<u64>,
 	fee_base_msat: u64,
 ) {
 	let service_node = &lsps_nodes.service_node;
@@ -1759,7 +1759,7 @@ fn late_payment_forwarded_and_safe_after_force_close_does_not_broadcast() {
 
 	let intercept_scid = service_node.node.get_intercept_scid();
 	let user_channel_id = 43u128;
-	let cltv_expiry_delta: u32 = 144;
+	let cltv_expiry_delta: u16 = 144;
 	let payment_size_msat = Some(1_000_000);
 	let fee_base_msat: u64 = 10_000;
 
@@ -1948,7 +1948,7 @@ fn htlc_timeout_before_client_claim_results_in_handling_failed() {
 
 	let intercept_scid = service_node.node.get_intercept_scid();
 	let user_channel_id = 44u128;
-	let cltv_expiry_delta: u32 = 144;
+	let cltv_expiry_delta: u16 = 144;
 	let payment_size_msat = Some(1_000_000);
 	let fee_base_msat: u64 = 10_000;
 
@@ -2282,7 +2282,7 @@ fn client_trusts_lsp_partial_fee_does_not_trigger_broadcast() {
 
 	let intercept_scid = service_node.node.get_intercept_scid();
 	let user_channel_id = 42;
-	let cltv_expiry_delta: u32 = 144;
+	let cltv_expiry_delta: u16 = 144;
 	let payment_size_msat = Some(1_000_000);
 
 	let fee_base_msat: u64 = 10_000;