f total hops not just intermediate

Author: valentinewallace

lightning/src/ln/max_payment_path_len_tests.rs

@@ -89,7 +89,7 @@ fn large_payment_metadata() {
 	// next-hop peer given the payment_metadata size.
 	let (mut route_0_2, payment_hash_2, payment_preimage_2, payment_secret_2) = get_route_and_payment_hash!(&nodes[0], &nodes[2], amt_msat);
 	let mut route_params_0_2 = route_0_2.route_params.clone().unwrap();
-	route_params_0_2.payment_params.max_intermediate_hops = 0;
+	route_params_0_2.payment_params.max_path_length = 1;
 	nodes[0].router.expect_find_route_query(route_params_0_2);
 	let err = nodes[0].node.send_payment(payment_hash_2, recipient_onion_max_md_size.clone(), PaymentId(payment_hash_2.0), route_0_2.route_params.clone().unwrap(), Retry::Attempts(0)).unwrap_err();
 	assert_eq!(err, RetryableSendFailure::RouteNotFound);
@@ -111,15 +111,15 @@ fn large_payment_metadata() {
 		_ => panic!(),
 	}
 
-	// If we remove enough payment_metadata bytes to allow for 1 intermediate hop, we're now able to
-	// send to nodes[2].
+	// 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 {
 		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_intermediate_hops = 1;
+	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();
 	check_added_monitors!(nodes[0], 1);
@@ -184,7 +184,7 @@ fn one_hop_blinded_path_with_custom_tlv() {
 		- PAYLOAD_HMAC_LEN
 		- final_payload_len_without_custom_tlv;
 
-	// Check that we can send the maximum custom TLV with 0 unblinded intermediate hops.
+	// Check that we can send the maximum custom TLV with 1 blinded hop.
 	let recipient_onion_max_custom_tlv_size = RecipientOnionFields::spontaneous_empty()
 		.with_custom_tlvs(vec![(CUSTOM_TLV_TYPE, vec![42; max_custom_tlv_len])])
 		.unwrap();
@@ -211,8 +211,8 @@ fn one_hop_blinded_path_with_custom_tlv() {
 	let err = nodes[0].node.send_payment(payment_hash, recipient_onion_max_custom_tlv_size.clone(), PaymentId(payment_hash.0), route_params.clone(), Retry::Attempts(0)).unwrap_err();
 	assert_eq!(err, RetryableSendFailure::RouteNotFound);
 
-	// If we remove enough custom TLV bytes to allow for 1 intermediate hop, we're now able to send
-	// nodes[0] -> nodes[2].
+	// If we remove enough custom TLV bytes to allow for 1 intermediate unblinded hop, we're now able
+	// to send nodes[0] -> nodes[2].
 	let mut recipient_onion_allows_2_hops = recipient_onion_max_custom_tlv_size.clone();
 	recipient_onion_allows_2_hops.custom_tlvs[0].1.resize(max_custom_tlv_len - INTERMED_PAYLOAD_LEN_ESTIMATE, 0);
 	nodes[0].node.send_payment(payment_hash, recipient_onion_allows_2_hops.clone(), PaymentId(payment_hash.0), route_params.clone(), Retry::Attempts(0)).unwrap();
@@ -302,8 +302,8 @@ fn blinded_path_with_custom_tlv() {
 	let err = nodes[0].node.send_payment(payment_hash, recipient_onion_max_custom_tlv_size.clone(), PaymentId(payment_hash.0), route_params.clone(), Retry::Attempts(0)).unwrap_err();
 	assert_eq!(err, RetryableSendFailure::RouteNotFound);
 
-	// If we remove enough custom TLV bytes to allow for 1 intermediate hop, we're now able to send
-	// nodes[0] -> nodes[3].
+	// If we remove enough custom TLV bytes to allow for 1 intermediate unblinded hop, we're now able
+	// to send nodes[0] -> nodes[3].
 	let mut recipient_onion_allows_2_hops = recipient_onion_max_custom_tlv_size.clone();
 	recipient_onion_allows_2_hops.custom_tlvs[0].1.resize(max_custom_tlv_len - INTERMED_PAYLOAD_LEN_ESTIMATE, 0);
 	nodes[0].node.send_payment(payment_hash, recipient_onion_allows_2_hops.clone(), PaymentId(payment_hash.0), route_params.clone(), Retry::Attempts(0)).unwrap();