f spell out htlc_maximum_msat

Author: valentinewallace

lightning/src/routing/router.rs

@@ -968,8 +968,8 @@ fn max_htlc_from_capacity(capacity: EffectiveCapacity, max_channel_saturation_po
 		EffectiveCapacity::Unknown => EffectiveCapacity::Unknown.as_msat(),
 		EffectiveCapacity::AdvertisedMaxHTLC { amount_msat } =>
 			amount_msat.checked_shr(saturation_shift).unwrap_or(0),
-		// Treat max_htlc from a route hint as an exact liquidity amount rather than right shifting,
-		// since the invoice is expected to have been generated from up-to-date capacity information.
+		// Treat htlc_maximum_msat from a route hint as an exact liquidity amount, since the invoice is
+		// expected to have been generated from up-to-date capacity information.
 		EffectiveCapacity::HintMaxHTLC { amount_msat } => amount_msat,
 		EffectiveCapacity::Total { capacity_msat, htlc_maximum_msat } =>
 			cmp::min(capacity_msat.checked_shr(saturation_shift).unwrap_or(0), htlc_maximum_msat),
@@ -5916,8 +5916,8 @@ mod tests {
 
 	#[test]
 	fn abide_by_route_hint_max_htlc() {
-		// Check that we abide by any max_htlc provided in the route hints of the payment params in
-		// the final route.
+		// Check that we abide by any htlc_maximum_msat provided in the route hints of the payment
+		// params in the final route.
 		let (secp_ctx, network_graph, _, _, logger) = build_graph();
 		let netgraph = network_graph.read_only();
 		let (_, our_id, _, nodes) = get_nodes(&secp_ctx);
@@ -5944,15 +5944,15 @@ mod tests {
 			.with_bolt11_features(channelmanager::provided_invoice_features(&config)).unwrap();
 
 		// Make sure we'll error if our route hints don't have enough liquidity according to their
-		// max_htlc.
+		// htlc_maximum_msat.
 		if let Err(LightningError{err, action: ErrorAction::IgnoreError}) = get_route(&our_id,
 			&payment_params, &netgraph, None, max_htlc_msat + 1, Arc::clone(&logger), &scorer, &(),
 			&random_seed_bytes)
 		{
 			assert_eq!(err, "Failed to find a sufficient route to the given destination");
 		} else { panic!(); }
 
-		// Make sure we'll split an MPP payment across route hints if their max_htlcs warrant it.
+		// Make sure we'll split an MPP payment across route hints if their htlc_maximum_msat warrants.
 		let mut route_hint_2 = route_hint_1.clone();
 		route_hint_2.0[0].short_channel_id = 43;
 		let payment_params = PaymentParameters::from_node_id(dest_node_id, 42)