f next

Author: TheBlueMatt

fuzz/src/router.rs

@@ -229,7 +229,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 								is_usable: true, is_public: true,
 								balance_msat: 0,
 								outbound_capacity_msat: capacity * 1000,
-								outbound_htlc_limit_msat: capacity * 1000
+								next_outbound_htlc_limit_msat: capacity * 1000
 							});
 						}
 						Some(&first_hops_vec[..])

lightning/src/ln/channelmanager.rs

@@ -1005,7 +1005,7 @@ pub struct ChannelDetails {
 	/// to use a limit as close as possible to the HTLC limit we can currently send.
 	///
 	/// See also [`ChannelDetails::balance_msat`] and [`ChannelDetails::outbound_capacity_msat`].
-	pub outbound_htlc_limit_msat: u64,
+	pub next_outbound_htlc_limit_msat: u64,
 	/// The available inbound capacity for the remote peer to send HTLCs to us. This does not
 	/// include any pending HTLCs which are not yet fully resolved (and, thus, whose balance is not
 	/// available for inclusion in new inbound HTLCs).
@@ -1666,7 +1666,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 			let channel_state = self.channel_state.lock().unwrap();
 			res.reserve(channel_state.by_id.len());
 			for (channel_id, channel) in channel_state.by_id.iter().filter(f) {
-				let (inbound_capacity_msat, outbound_capacity_msat, outbound_htlc_limit_msat) =
+				let (inbound_capacity_msat, outbound_capacity_msat, next_outbound_htlc_limit_msat) =
 					channel.get_inbound_outbound_available_balance_msat();
 				let balance_msat = channel.get_balance_msat();
 				let (to_remote_reserve_satoshis, to_self_reserve_satoshis) =
@@ -1690,7 +1690,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 					balance_msat,
 					inbound_capacity_msat,
 					outbound_capacity_msat,
-					outbound_htlc_limit_msat,
+					next_outbound_htlc_limit_msat,
 					user_channel_id: channel.get_user_id(),
 					confirmations_required: channel.minimum_depth(),
 					force_close_spend_delay: channel.get_counterparty_selected_contest_delay(),
@@ -5922,7 +5922,7 @@ impl_writeable_tlv_based!(ChannelDetails, {
 	(18, outbound_capacity_msat, required),
 	// Note that by the time we get past the required read above, outbound_capacity_msat will be
 	// filled in, so we can safely unwrap it here.
-	(19, outbound_htlc_limit_msat, (default_value, outbound_capacity_msat.0.unwrap())),
+	(19, next_outbound_htlc_limit_msat, (default_value, outbound_capacity_msat.0.unwrap())),
 	(20, inbound_capacity_msat, required),
 	(22, confirmations_required, option),
 	(24, force_close_spend_delay, option),

lightning/src/routing/router.rs

@@ -412,7 +412,7 @@ impl<'a> CandidateRouteHop<'a> {
 	fn effective_capacity(&self) -> EffectiveCapacity {
 		match self {
 			CandidateRouteHop::FirstHop { details } => EffectiveCapacity::ExactLiquidity {
-				liquidity_msat: details.outbound_htlc_limit_msat,
+				liquidity_msat: details.next_outbound_htlc_limit_msat,
 			},
 			CandidateRouteHop::PublicHop { info, .. } => info.effective_capacity(),
 			CandidateRouteHop::PrivateHop { .. } => EffectiveCapacity::Infinite,
@@ -1744,7 +1744,7 @@ mod tests {
 			user_channel_id: 0,
 			balance_msat: 0,
 			outbound_capacity_msat,
-			outbound_htlc_limit_msat: outbound_capacity_msat,
+			next_outbound_htlc_limit_msat: outbound_capacity_msat,
 			inbound_capacity_msat: 42,
 			unspendable_punishment_reserve: None,
 			confirmations_required: None,
@@ -5468,7 +5468,7 @@ mod benches {
 			user_channel_id: 0,
 			balance_msat: 10_000_000,
 			outbound_capacity_msat: 10_000_000,
-			outbound_htlc_limit_msat: 10_000_000,
+			next_outbound_htlc_limit_msat: 10_000_000,
 			inbound_capacity_msat: 0,
 			unspendable_punishment_reserve: None,
 			confirmations_required: None,