f update tests for added buffer to amt and cltv delta

Author: valentinewallace

lightning/src/ln/max_payment_path_len_tests.rs

@@ -22,7 +22,7 @@ use crate::ln::msgs;
 use crate::ln::onion_utils;
 use crate::ln::outbound_payment::{RecipientOnionFields, Retry, RetryableSendFailure};
 use crate::prelude::*;
-use crate::routing::router::{PaymentParameters, RouteParameters};
+use crate::routing::router::{DEFAULT_MAX_TOTAL_CLTV_EXPIRY_DELTA, PaymentParameters, RouteParameters};
 use crate::util::errors::APIError;
 use crate::util::ser::Writeable;
 use crate::util::test_utils;
@@ -34,6 +34,9 @@ const INTERMED_PAYLOAD_LEN_ESTIMATE: usize = 61;
 // Length of the HMAC of an onion payload when encoded into the packet.
 const PAYLOAD_HMAC_LEN: usize = 32;
 
+// Copied from onion_utils.
+const MIN_FINAL_VALUE_ESTIMATE_WITH_OVERPAY: u64 = 100_000_000;
+
 #[test]
 fn large_payment_metadata() {
 	// Test that we'll limit our maximum path length based on the size of the provided
@@ -51,24 +54,24 @@ fn large_payment_metadata() {
 	// without exceeding the max onion packet size.
 	let final_payload_len_without_metadata = msgs::OutboundOnionPayload::Receive {
 		payment_data: Some(msgs::FinalOnionHopData {
-			payment_secret: PaymentSecret([0; 32]), total_msat: amt_msat
+			payment_secret: PaymentSecret([0; 32]), total_msat: MIN_FINAL_VALUE_ESTIMATE_WITH_OVERPAY
 		}),
 		payment_metadata: None,
 		keysend_preimage: None,
 		custom_tlvs: &Vec::new(),
-		sender_intended_htlc_amt_msat: amt_msat,
-		cltv_expiry_height: nodes[0].best_block_info().1 + TEST_FINAL_CLTV,
+		sender_intended_htlc_amt_msat: MIN_FINAL_VALUE_ESTIMATE_WITH_OVERPAY,
+		cltv_expiry_height: nodes[0].best_block_info().1 + DEFAULT_MAX_TOTAL_CLTV_EXPIRY_DELTA,
 	}.serialized_length();
 	let max_metadata_len = 1300
-		- 1 // metdata type
+		- 1 // metadata type
 		- crate::util::ser::BigSize(1200).serialized_length() // metadata length
 		- 2 // onion payload varint prefix increased ser size due to metadata
 		- PAYLOAD_HMAC_LEN
 		- final_payload_len_without_metadata;
 	let mut payment_metadata = vec![42; max_metadata_len];
 
 	// Check that the maximum-size metadata is sendable.
-	let (route_0_1, payment_hash, payment_preimage, payment_secret) = get_route_and_payment_hash!(&nodes[0], &nodes[1], amt_msat);
+	let (mut route_0_1, payment_hash, payment_preimage, payment_secret) = get_route_and_payment_hash!(&nodes[0], &nodes[1], amt_msat);
 	let mut recipient_onion_max_md_size = RecipientOnionFields {
 		payment_secret: Some(payment_secret),
 		payment_metadata: Some(payment_metadata.clone()),
@@ -103,7 +106,9 @@ fn large_payment_metadata() {
 	// Confirm that we'll fail to construct an onion packet given this payment_metadata that's too
 	// large for even a 1-hop path.
 	let secp_ctx = Secp256k1::signing_only();
-	let err = onion_utils::create_payment_onion(&secp_ctx, &route_0_1.paths[0], &test_utils::privkey(42), amt_msat, &recipient_onion_too_large_md, nodes[0].best_block_info().1, &payment_hash, &None, [0; 32]).unwrap_err();
+	route_0_1.paths[0].hops[0].fee_msat = MIN_FINAL_VALUE_ESTIMATE_WITH_OVERPAY;
+	route_0_1.paths[0].hops[0].cltv_expiry_delta = DEFAULT_MAX_TOTAL_CLTV_EXPIRY_DELTA;
+	let err = onion_utils::create_payment_onion(&secp_ctx, &route_0_1.paths[0], &test_utils::privkey(42), MIN_FINAL_VALUE_ESTIMATE_WITH_OVERPAY, &recipient_onion_too_large_md, nodes[0].best_block_info().1 + DEFAULT_MAX_TOTAL_CLTV_EXPIRY_DELTA, &payment_hash, &None, [0; 32]).unwrap_err();
 	match err {
 		APIError::InvalidRoute { err } => {
 			assert_eq!(err, "Route size too large considering onion data");
@@ -113,22 +118,22 @@ fn large_payment_metadata() {
 
 	// If we remove enough payment_metadata bytes to allow for 2 hops, we're now able to send to
 	// nodes[2].
-	let mut recipient_onion_allws_2_hops = RecipientOnionFields {
+	let mut recipient_onion_allows_2_hops = RecipientOnionFields {
 		payment_secret: Some(payment_secret_2),
 		payment_metadata: Some(vec![42; max_metadata_len - INTERMED_PAYLOAD_LEN_ESTIMATE]),
 		custom_tlvs: Vec::new(),
 	};
 	let mut route_params_0_2 = route_0_2.route_params.clone().unwrap();
 	route_params_0_2.payment_params.max_path_length = 2;
 	nodes[0].router.expect_find_route_query(route_params_0_2);
-	nodes[0].node.send_payment(payment_hash_2, recipient_onion_allws_2_hops.clone(), PaymentId(payment_hash_2.0), route_0_2.route_params.unwrap(), Retry::Attempts(0)).unwrap();
+	nodes[0].node.send_payment(payment_hash_2, recipient_onion_allows_2_hops.clone(), PaymentId(payment_hash_2.0), route_0_2.route_params.unwrap(), Retry::Attempts(0)).unwrap();
 	check_added_monitors!(nodes[0], 1);
 	let mut events = nodes[0].node.get_and_clear_pending_msg_events();
 	assert_eq!(events.len(), 1);
 	let path = &[&nodes[1], &nodes[2]];
 	let args = PassAlongPathArgs::new(&nodes[0], path, amt_msat, payment_hash_2, events.pop().unwrap())
 		.with_payment_secret(payment_secret_2)
-		.with_payment_metadata(recipient_onion_allws_2_hops.payment_metadata.unwrap());
+		.with_payment_metadata(recipient_onion_allows_2_hops.payment_metadata.unwrap());
 	do_pass_along_path(args);
 	claim_payment_along_route(&nodes[0], &[&[&nodes[1], &nodes[2]]], false, payment_preimage_2);
 }
@@ -169,9 +174,9 @@ fn one_hop_blinded_path_with_custom_tlv() {
 	// Calculate the maximum custom TLV value size where a valid onion packet is still possible.
 	const CUSTOM_TLV_TYPE: u64 = 65537;
 	let final_payload_len_without_custom_tlv = msgs::OutboundOnionPayload::BlindedReceive {
-		sender_intended_htlc_amt_msat: amt_msat,
-		total_msat: amt_msat,
-		cltv_expiry_height: nodes[0].best_block_info().1 + TEST_FINAL_CLTV,
+		sender_intended_htlc_amt_msat: MIN_FINAL_VALUE_ESTIMATE_WITH_OVERPAY,
+		total_msat: MIN_FINAL_VALUE_ESTIMATE_WITH_OVERPAY,
+		cltv_expiry_height: nodes[0].best_block_info().1 + DEFAULT_MAX_TOTAL_CLTV_EXPIRY_DELTA,
 		encrypted_tlvs: &blinded_path.1.blinded_hops[0].encrypted_payload,
 		intro_node_blinding_point: Some(blinded_path.1.blinding_point),
 		keysend_preimage: None,
@@ -180,7 +185,7 @@ fn one_hop_blinded_path_with_custom_tlv() {
 	let max_custom_tlv_len = 1300
 		- crate::util::ser::BigSize(CUSTOM_TLV_TYPE).serialized_length() // custom TLV type
 		- crate::util::ser::BigSize(1200).serialized_length() // custom TLV length
-		- 2 // onion payload varint prefix increased ser size due to custom TLV
+		- 1 // onion payload varint prefix increased ser size due to custom TLV
 		- PAYLOAD_HMAC_LEN
 		- final_payload_len_without_custom_tlv;
 
@@ -251,8 +256,9 @@ fn blinded_path_with_custom_tlv() {
 	const CUSTOM_TLV_TYPE: u64 = 65537;
 	let mut route = get_route(&nodes[1], &route_params).unwrap();
 	let reserved_packet_bytes_without_custom_tlv: usize = onion_utils::build_onion_payloads(
-		&route.paths[0], amt_msat, &RecipientOnionFields::spontaneous_empty(),
-		nodes[0].best_block_info().1, &None
+		&route.paths[0], MIN_FINAL_VALUE_ESTIMATE_WITH_OVERPAY,
+		&RecipientOnionFields::spontaneous_empty(),
+		nodes[0].best_block_info().1 + DEFAULT_MAX_TOTAL_CLTV_EXPIRY_DELTA, &None
 	)
 		.unwrap()
 		.0
@@ -289,7 +295,9 @@ fn blinded_path_with_custom_tlv() {
 
 	// Confirm that we can't construct an onion packet given this too-large custom TLV.
 	let secp_ctx = Secp256k1::signing_only();
-	let err = onion_utils::create_payment_onion(&secp_ctx, &route.paths[0], &test_utils::privkey(42), amt_msat, &recipient_onion_too_large_custom_tlv, nodes[0].best_block_info().1, &payment_hash, &None, [0; 32]).unwrap_err();
+	route.paths[0].hops[0].fee_msat = MIN_FINAL_VALUE_ESTIMATE_WITH_OVERPAY;
+	route.paths[0].hops[0].cltv_expiry_delta = DEFAULT_MAX_TOTAL_CLTV_EXPIRY_DELTA;
+	let err = onion_utils::create_payment_onion(&secp_ctx, &route.paths[0], &test_utils::privkey(42), MIN_FINAL_VALUE_ESTIMATE_WITH_OVERPAY, &recipient_onion_too_large_custom_tlv, nodes[0].best_block_info().1 + DEFAULT_MAX_TOTAL_CLTV_EXPIRY_DELTA, &payment_hash, &None, [0; 32]).unwrap_err();
 	match err {
 		APIError::InvalidRoute { err } => {
 			assert_eq!(err, "Route size too large considering onion data");