diff --git a/Cargo.lock b/Cargo.lock index aa424ab7f..9ae7ae053 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1617,7 +1617,7 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "beacon" version = "0.1.0" -source = "git+https://github.com/helium/proto?branch=bbalser/radio-reward-v2#6f67db8dbea9613dc9819ffc50387390d82195ba" +source = "git+https://github.com/helium/proto?branch=bbalser/radio-reward-v2#728635eb6826f7947449007603b882aa0b64f372" dependencies = [ "base64 0.21.7", "byteorder", @@ -1627,7 +1627,7 @@ dependencies = [ "rand_chacha 0.3.0", "rust_decimal", "serde", - "sha2 0.9.9", + "sha2 0.10.8", "thiserror", ] @@ -3801,7 +3801,7 @@ dependencies = [ [[package]] name = "helium-proto" version = "0.1.0" -source = "git+https://github.com/helium/proto?branch=bbalser/radio-reward-v2#6f67db8dbea9613dc9819ffc50387390d82195ba" +source = "git+https://github.com/helium/proto?branch=bbalser/radio-reward-v2#728635eb6826f7947449007603b882aa0b64f372" dependencies = [ "bytes", "prost", diff --git a/coverage_point_calculator/src/lib.rs b/coverage_point_calculator/src/lib.rs index 5e84ca707..8e891d737 100644 --- a/coverage_point_calculator/src/lib.rs +++ b/coverage_point_calculator/src/lib.rs @@ -244,13 +244,9 @@ impl BoostedHexStatus { ) -> Self { match service_provider_boosted_reward_eligibility { // hip-125: if radio has been banned by service provider, no boosting - SPBoostedRewardEligibility::ServiceProviderBanned => { - Self::ServiceProviderBanned - } + SPBoostedRewardEligibility::ServiceProviderBanned => Self::ServiceProviderBanned, // hip-84: if radio has not met minimum data and subscriber thresholds, no boosting - SPBoostedRewardEligibility::RadioThresholdNotMet => { - Self::RadioThresholdNotMet - } + SPBoostedRewardEligibility::RadioThresholdNotMet => Self::RadioThresholdNotMet, SPBoostedRewardEligibility::Eligible => { // hip-93: if radio is wifi & location_trust score multiplier < 0.75, no boosting if radio_type.is_wifi() && location_trust_multiplier < MIN_WIFI_TRUST_MULTIPLIER { @@ -414,8 +410,7 @@ mod tests { // Radio not meeting the threshold is not eligible for boosted hexes. // Boost from hex is not applied, radio receives base points. - let unverified_wifi = - calculate_wifi(SPBoostedRewardEligibility::RadioThresholdNotMet); + let unverified_wifi = calculate_wifi(SPBoostedRewardEligibility::RadioThresholdNotMet); assert_eq!(base_points, unverified_wifi.coverage_points_v1()); } diff --git a/mobile_verifier/src/reward_shares/radio_reward_v2.rs b/mobile_verifier/src/reward_shares/radio_reward_v2.rs index 40b536c28..f22a7ec6f 100644 --- a/mobile_verifier/src/reward_shares/radio_reward_v2.rs +++ b/mobile_verifier/src/reward_shares/radio_reward_v2.rs @@ -58,6 +58,9 @@ impl RadioRewardV2Ext for coverage_point_calculator::CoveragePoints { coverage_point_calculator::BoostedHexStatus::ServiceProviderBanned => { BoostedHexStatus::ServiceProviderBan } + coverage_point_calculator::BoostedHexStatus::AverageAssertedDistanceOverLimit(_) => { + BoostedHexStatus::AverageAssertedDistanceOverLimit + } } }