f add coverage for custom expiry

Author: dunxen

lightning-invoice/src/utils.rs

@@ -157,7 +157,7 @@ where
 				.duration_since(UNIX_EPOCH)
 				.expect("Time must be > 1970")
 				.as_secs(),
-			None,
+			min_final_cltv_expiry_delta,
 		)
 		.map_err(|_| SignOrCreationError::CreationError(CreationError::InvalidAmount))?;
 		(payment_hash, payment_secret)
@@ -171,7 +171,7 @@ where
 				.duration_since(UNIX_EPOCH)
 				.expect("Time must be > 1970")
 				.as_secs(),
-			None,
+			min_final_cltv_expiry_delta,
 		)
 		.map_err(|_| SignOrCreationError::CreationError(CreationError::InvalidAmount))?
 	};
@@ -722,6 +722,22 @@ mod test {
 		assert_eq!(events.len(), 2);
 	}
 
+	#[test]
+	fn test_create_invoice_with_custom_min_final_cltv_delta() {
+		let chanmon_cfgs = create_chanmon_cfgs(2);
+		let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
+		let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
+		let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
+		let description_hash = crate::Sha256(Hash::hash("Testing description_hash".as_bytes()));
+		let invoice = crate::utils::create_invoice_from_channelmanager_with_description_hash_and_duration_since_epoch(
+			&nodes[1].node, nodes[1].keys_manager, nodes[1].logger, Currency::BitcoinTestnet,
+			Some(10_000), description_hash, Duration::from_secs(1234567), 3600, None,
+		).unwrap();
+		assert_eq!(invoice.amount_pico_btc(), Some(100_000));
+		assert_eq!(invoice.min_final_cltv_expiry_delta(), MIN_FINAL_CLTV_EXPIRY_DELTA as u64);
+		assert_eq!(invoice.description(), InvoiceDescription::Hash(&crate::Sha256(Sha256::hash("Testing description_hash".as_bytes()))));
+	}
+
 	#[test]
 	fn test_create_invoice_with_description_hash() {
 		let chanmon_cfgs = create_chanmon_cfgs(2);
@@ -1141,6 +1157,35 @@ mod test {
 		assert_eq!(invoice.description(), InvoiceDescription::Hash(&crate::Sha256(Sha256::hash("Description hash phantom invoice".as_bytes()))));
 	}
 
+	#[test]
+	#[cfg(feature = "std")]
+	fn create_phantom_invoice_with_custom_payment_hash_and_custom_min_final_cltv_delta() {
+		let chanmon_cfgs = create_chanmon_cfgs(3);
+		let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
+		let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &[None, None, None]);
+		let nodes = create_network(3, &node_cfgs, &node_chanmgrs);
+
+		let payment_amt = 20_000;
+		let route_hints = vec![
+			nodes[1].node.get_phantom_route_hints(),
+			nodes[2].node.get_phantom_route_hints(),
+		];
+		let user_payment_preimage = PaymentPreimage([1; 32]);
+		let payment_hash = Some(PaymentHash(Sha256::hash(&user_payment_preimage.0[..]).into_inner()));
+		let non_default_invoice_expiry_secs = 4200;
+		let min_final_cltv_expiry_delta = Some(100);
+		let invoice = crate::utils::create_phantom_invoice::<
+			&test_utils::TestKeysInterface, &test_utils::TestLogger,
+		>(
+			Some(payment_amt), payment_hash, "".into(), non_default_invoice_expiry_secs, route_hints,
+			&nodes[1].keys_manager, &nodes[1].logger, Currency::BitcoinTestnet, min_final_cltv_expiry_delta,
+		)
+		.unwrap();
+		assert_eq!(invoice.amount_pico_btc(), Some(200_000));
+		assert_eq!(invoice.min_final_cltv_expiry_delta(), min_final_cltv_expiry_delta.unwrap() as u64);
+		assert_eq!(invoice.expiry_time(), Duration::from_secs(non_default_invoice_expiry_secs.into()));
+	}
+
 	#[test]
 	#[cfg(feature = "std")]
 	fn test_multi_node_hints_includes_single_channels_to_participating_nodes() {