f change to using a wrapper struct

Author: TheBlueMatt

lightning/src/routing/scoring.rs

@@ -737,7 +737,7 @@ impl<L: Deref<Target = u64>, BRT: Deref<Target = HistoricalBucketRangeTracker>,
 			let negative_log10_times_2048 = NEGATIVE_LOG10_UPPER_BOUND * 2048;
 			Self::combined_penalty_msat(amount_msat, negative_log10_times_2048,
 					params.liquidity_penalty_multiplier_msat,
-					params.amount_penalty_multiplier_msat)
+					params.liquidity_penalty_amount_multiplier_msat)
 				.saturating_add(params.considered_impossible_penalty_msat)
 		} else {
 			let numerator = (max_liquidity_msat - amount_msat).saturating_add(1);
@@ -752,7 +752,7 @@ impl<L: Deref<Target = u64>, BRT: Deref<Target = HistoricalBucketRangeTracker>,
 					approx::negative_log10_times_2048(numerator, denominator);
 				Self::combined_penalty_msat(amount_msat, negative_log10_times_2048,
 					params.liquidity_penalty_multiplier_msat,
-					params.amount_penalty_multiplier_msat)
+					params.liquidity_penalty_amount_multiplier_msat)
 			}
 		};
 
@@ -776,8 +776,8 @@ impl<L: Deref<Target = u64>, BRT: Deref<Target = HistoricalBucketRangeTracker>,
 			// sending less than 1/16th of a channel's capacity, or 1/8th if we used the top of the
 			// bucket.
 			let mut total_valid_points_tracked = 0;
-			for (min_idx, min_bucket) in self.min_liquidity_offset_history.iter().enumerate() {
-				for max_bucket in self.max_liquidity_offset_history.iter().take(8 - min_idx) {
+			for (min_idx, min_bucket) in self.min_liquidity_offset_history.buckets.iter().enumerate() {
+				for max_bucket in self.max_liquidity_offset_history.buckets.iter().take(8 - min_idx) {
 					total_valid_points_tracked += (*min_bucket as u64) * (*max_bucket as u64);
 				}
 			}
@@ -791,8 +791,8 @@ impl<L: Deref<Target = u64>, BRT: Deref<Target = HistoricalBucketRangeTracker>,
 			if payment_amt_64th_bucket > 64 { return res; }
 
 			let mut cumulative_success_prob_billions = 0;
-			for (min_idx, min_bucket) in self.min_liquidity_offset_history.iter().enumerate() {
-				for (max_idx, max_bucket) in self.max_liquidity_offset_history.iter().enumerate().take(8 - min_idx) {
+			for (min_idx, min_bucket) in self.min_liquidity_offset_history.buckets.iter().enumerate() {
+				for (max_idx, max_bucket) in self.max_liquidity_offset_history.buckets.iter().enumerate().take(8 - min_idx) {
 					let bucket_prob_millions = (*min_bucket as u64) * (*max_bucket as u64)
 						* 1024 * 1024 / total_valid_points_tracked;
 					let min_64th_bucket = min_idx as u64 * 9;
@@ -2456,7 +2456,7 @@ mod tests {
 		// Even after we tell the scorer we definitely have enough available liquidity, it will
 		// still remember that there was some failure in the past, and assign a non-0 penalty.
 		scorer.payment_path_failed(&payment_path_for_amount(1000).iter().collect::<Vec<_>>(), 43);
-		assert_eq!(scorer.channel_penalty_msat(42, &source, &target, usage), 171);
+		assert_eq!(scorer.channel_penalty_msat(42, &source, &target, usage), 198);
 	}
 
 	#[test]