Modeled coverage phase 3

helium · Aug 28, 2023 · a1accb9 · a1accb9
1 parent 1cfff2a
commit a1accb9
Show file tree

Hide file tree

Showing 5 changed files with 1,532 additions and 120 deletions.
diff --git a/mobile_verifier/src/cli/reward_from_db.rs b/mobile_verifier/src/cli/reward_from_db.rs
@@ -1,6 +1,6 @@
 use crate::{
     heartbeats::HeartbeatReward,
-    reward_shares::{get_scheduled_tokens_for_poc_and_dc, PocShares},
+    reward_shares::{get_scheduled_tokens_for_poc_and_dc, CoveragePoints},
     speedtests::{Average, SpeedtestAverages},
     Settings,
 };
@@ -37,7 +37,8 @@ impl Cmd {
 
         let heartbeats = HeartbeatReward::validated(&pool, &epoch);
         let speedtests = SpeedtestAverages::validated(&pool, epoch.end).await?;
-        let reward_shares = PocShares::aggregate(heartbeats, speedtests.clone()).await?;
+        let reward_shares =
+            CoveragePoints::aggregate_points(&pool, heartbeats, speedtests.clone(), end).await?;
 
         let mut total_rewards = 0_u64;
         let mut owner_rewards = HashMap::<_, u64>::new();

diff --git a/mobile_verifier/src/heartbeats.rs b/mobile_verifier/src/heartbeats.rs
@@ -15,6 +15,7 @@ use futures::{
     stream::{Stream, StreamExt, TryStreamExt},
     TryFutureExt,
 };
+use h3o::LatLng;
 use helium_crypto::PublicKeyBinary;
 use helium_proto::services::poc_mobile as proto;
 use mobile_config::GatewayClient;
@@ -346,9 +347,9 @@ impl Heartbeat {
 async fn validate_heartbeat(
     heartbeat: &CellHeartbeatIngestReport,
     gateway_client: &impl HasOwner,
-    _coverage_cache: &CoveredHexCache,
+    coverage_cache: &CoveredHexCache,
     epoch: &Range<DateTime<Utc>>,
-    _max_distance: f64,
+    max_distance: f64,
 ) -> anyhow::Result<(Option<CellType>, proto::HeartbeatValidity)> {
     let cell_type = match CellType::from_cbsd_id(&heartbeat.report.cbsd_id) {
         Some(ty) => Some(ty),
@@ -367,7 +368,6 @@ async fn validate_heartbeat(
         return Ok((cell_type, proto::HeartbeatValidity::GatewayOwnerNotFound));
     }
 
-    /*
     let Some(coverage_object) = heartbeat.report.coverage_object() else {
         return Ok((cell_type, proto::HeartbeatValidity::BadCoverageObject));
     };
@@ -387,7 +387,6 @@ async fn validate_heartbeat(
     if coverage.max_distance_km(latlng) > max_distance {
         return Ok((cell_type, proto::HeartbeatValidity::TooFarFromCoverage));
     }
-     */
 
     Ok((cell_type, proto::HeartbeatValidity::Valid))
 }