f rename field to be more succinct

Author: TheBlueMatt

lightning/src/routing/scoring.rs

@@ -673,7 +673,7 @@ struct ChannelLiquidity<T: Time> {
 struct DirectedChannelLiquidity<L: Deref<Target = u64>, BRT: Deref<Target = HistoricalBucketRangeTracker>, T: Time, U: Deref<Target = T>> {
 	min_liquidity_offset_msat: L,
 	max_liquidity_offset_msat: L,
-	liquidity_offset_history: HistoricalMinMaxBuckets<BRT>,
+	liquidity_history: HistoricalMinMaxBuckets<BRT>,
 	inflight_htlc_msat: u64,
 	capacity_msat: u64,
 	last_updated: U,
@@ -714,7 +714,7 @@ impl<G: Deref<Target = NetworkGraph<L>>, L: Deref, T: Time> ProbabilisticScorerU
 						let amt = directed_info.effective_capacity().as_msat();
 						let dir_liq = liq.as_directed(source, target, 0, amt, self.decay_params);
 
-						let (min_buckets, max_buckets, _) = dir_liq.liquidity_offset_history
+						let (min_buckets, max_buckets, _) = dir_liq.liquidity_history
 							.get_decayed_buckets(now, *dir_liq.last_updated,
 								self.decay_params.historical_no_updates_half_life);
 
@@ -793,7 +793,7 @@ impl<G: Deref<Target = NetworkGraph<L>>, L: Deref, T: Time> ProbabilisticScorerU
 					let amt = directed_info.effective_capacity().as_msat();
 					let dir_liq = liq.as_directed(source, target, 0, amt, self.decay_params);
 
-					let (min_buckets, mut max_buckets, _) = dir_liq.liquidity_offset_history
+					let (min_buckets, mut max_buckets, _) = dir_liq.liquidity_history
 						.get_decayed_buckets(dir_liq.now, *dir_liq.last_updated,
 							self.decay_params.historical_no_updates_half_life);
 					// Note that the liquidity buckets are an offset from the edge, so we inverse
@@ -824,7 +824,7 @@ impl<G: Deref<Target = NetworkGraph<L>>, L: Deref, T: Time> ProbabilisticScorerU
 					let capacity_msat = directed_info.effective_capacity().as_msat();
 					let dir_liq = liq.as_directed(source, target, 0, capacity_msat, self.decay_params);
 
-					return dir_liq.liquidity_offset_history.calculate_success_probability_times_billion(
+					return dir_liq.liquidity_history.calculate_success_probability_times_billion(
 						dir_liq.now, *dir_liq.last_updated,
 						self.decay_params.historical_no_updates_half_life, amount_msat, capacity_msat
 					).map(|p| p as f64 / (1024 * 1024 * 1024) as f64);
@@ -864,7 +864,7 @@ impl<T: Time> ChannelLiquidity<T> {
 		DirectedChannelLiquidity {
 			min_liquidity_offset_msat,
 			max_liquidity_offset_msat,
-			liquidity_offset_history: HistoricalMinMaxBuckets {
+			liquidity_history: HistoricalMinMaxBuckets {
 				min_liquidity_offset_history,
 				max_liquidity_offset_history,
 			},
@@ -893,7 +893,7 @@ impl<T: Time> ChannelLiquidity<T> {
 		DirectedChannelLiquidity {
 			min_liquidity_offset_msat,
 			max_liquidity_offset_msat,
-			liquidity_offset_history: HistoricalMinMaxBuckets {
+			liquidity_history: HistoricalMinMaxBuckets {
 				min_liquidity_offset_history,
 				max_liquidity_offset_history,
 			},
@@ -965,7 +965,7 @@ impl<L: Deref<Target = u64>, BRT: Deref<Target = HistoricalBucketRangeTracker>,
 
 		if score_params.historical_liquidity_penalty_multiplier_msat != 0 ||
 		   score_params.historical_liquidity_penalty_amount_multiplier_msat != 0 {
-			if let Some(cumulative_success_prob_times_billion) = self.liquidity_offset_history
+			if let Some(cumulative_success_prob_times_billion) = self.liquidity_history
 				.calculate_success_probability_times_billion(self.now, *self.last_updated,
 					self.decay_params.historical_no_updates_half_life, amount_msat, self.capacity_msat)
 			{
@@ -1075,15 +1075,15 @@ impl<L: DerefMut<Target = u64>, BRT: DerefMut<Target = HistoricalBucketRangeTrac
 		let half_lives = self.now.duration_since(*self.last_updated).as_secs()
 			.checked_div(self.decay_params.historical_no_updates_half_life.as_secs())
 			.map(|v| v.try_into().unwrap_or(u32::max_value())).unwrap_or(u32::max_value());
-		self.liquidity_offset_history.min_liquidity_offset_history.time_decay_data(half_lives);
-		self.liquidity_offset_history.max_liquidity_offset_history.time_decay_data(half_lives);
+		self.liquidity_history.min_liquidity_offset_history.time_decay_data(half_lives);
+		self.liquidity_history.max_liquidity_offset_history.time_decay_data(half_lives);
 
 		let min_liquidity_offset_msat = self.decayed_offset_msat(*self.min_liquidity_offset_msat);
-		self.liquidity_offset_history.min_liquidity_offset_history.track_datapoint(
+		self.liquidity_history.min_liquidity_offset_history.track_datapoint(
 			min_liquidity_offset_msat, self.capacity_msat
 		);
 		let max_liquidity_offset_msat = self.decayed_offset_msat(*self.max_liquidity_offset_msat);
-		self.liquidity_offset_history.max_liquidity_offset_history.track_datapoint(
+		self.liquidity_history.max_liquidity_offset_history.track_datapoint(
 			max_liquidity_offset_msat, self.capacity_msat
 		);
 	}