From b44a03f4951ac488360c5825f2a3e3e8945934d5 Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Thu, 13 Jun 2024 12:35:45 -0700 Subject: [PATCH 1/2] Include coverage-map and coverage-point-calculator in CI --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index f7bab3b85..a36f0af8b 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -136,7 +136,7 @@ jobs: strategy: fail-fast: false matrix: - package: [file-store,ingest,mobile-packet-verifier,reward-scheduler,task-manager] + package: [coverage-map,coverage-point-calculator,file-store,ingest,mobile-packet-verifier,reward-scheduler,task-manager] concurrency: group: ${{ github.workflow }}-${{ github.ref }}-tests-${{ matrix.package }} cancel-in-progress: true From 0c799ce9270605404a2a7132dbe93d87f4955151 Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Thu, 13 Jun 2024 12:37:18 -0700 Subject: [PATCH 2/2] Speedtests effect reward_shares Speedtests are not part of "coverage", so the field `total_coverage_points` was renamed, and coverage points was repurposed to mean coverage related points, not backhaul related points. --- coverage_point_calculator/src/lib.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/coverage_point_calculator/src/lib.rs b/coverage_point_calculator/src/lib.rs index 90b986aec..dcd87b05d 100644 --- a/coverage_point_calculator/src/lib.rs +++ b/coverage_point_calculator/src/lib.rs @@ -392,7 +392,7 @@ mod tests { } #[test] - fn speedtests_effect_coverage_points() { + fn speedtests_effect_reward_shares() { let calculate_indoor_cbrs = |speedtests: Vec| { CoveragePoints::new( RadioType::IndoorCbrs, @@ -419,7 +419,7 @@ mod tests { let indoor_cbrs = calculate_indoor_cbrs(speedtest_maximum()); assert_eq!( base_coverage_points * SpeedtestTier::Good.multiplier(), - indoor_cbrs.total_coverage_points + indoor_cbrs.reward_shares ); let indoor_cbrs = calculate_indoor_cbrs(vec![ @@ -428,7 +428,7 @@ mod tests { ]); assert_eq!( base_coverage_points * SpeedtestTier::Acceptable.multiplier(), - indoor_cbrs.total_coverage_points + indoor_cbrs.reward_shares ); let indoor_cbrs = calculate_indoor_cbrs(vec![ @@ -437,7 +437,7 @@ mod tests { ]); assert_eq!( base_coverage_points * SpeedtestTier::Degraded.multiplier(), - indoor_cbrs.total_coverage_points + indoor_cbrs.reward_shares ); let indoor_cbrs = calculate_indoor_cbrs(vec![ @@ -446,7 +446,7 @@ mod tests { ]); assert_eq!( base_coverage_points * SpeedtestTier::Poor.multiplier(), - indoor_cbrs.total_coverage_points + indoor_cbrs.reward_shares ); let indoor_cbrs = calculate_indoor_cbrs(vec![ @@ -455,7 +455,7 @@ mod tests { ]); assert_eq!( base_coverage_points * SpeedtestTier::Fail.multiplier(), - indoor_cbrs.total_coverage_points + indoor_cbrs.reward_shares ); }