Modeled Coverage Phase 3

Cargo.toml

@@ -59,7 +59,6 @@ sqlx = {version = "0", features = [
   "macros",
   "runtime-tokio-rustls"
 ]}
-
 helium-crypto = {version = "0.8.1", features=["sqlx-postgres", "multisig"]}
 helium-proto = {git = "https://github.com/helium/proto", branch = "master", features = ["services"]}
 hextree = "*"

mobile_verifier/migrations/20_remove_null_coverage_objects.sql

@@ -0,0 +1,11 @@
+-- Remove NULL and invalid coverage objects from WiFi heartbeats:
+DELETE FROM wifi_heartbeats WHERE coverage_object IS NULL;
+DELETE FROM wifi_heartbeats WHERE coverage_object NOT IN (SELECT uuid FROM hex_coverage);
+
+-- Remove NULL and invalid coverage objects from CBRS heartbeats:
+DELETE FROM cbrs_heartbeats WHERE coverage_object IS NULL;
+DELETE FROM cbrs_heartbeats WHERE coverage_object NOT IN (SELECT uuid FROM hex_coverage);
+
+-- Add the NOT NULL constraint to coverage objects for wifi and cbrs heartbeats:
+ALTER TABLE wifi_heartbeats ALTER COLUMN coverage_object SET NOT NULL;
+ALTER TABLE cbrs_heartbeats ALTER COLUMN coverage_object SET NOT NULL;

mobile_verifier/src/cell_type.rs

@@ -54,18 +54,6 @@ impl CellType {
         }
     }
 
-    pub fn reward_weight(&self) -> Decimal {
-        match self {
-            Self::Nova436H => dec!(4.0),
-            Self::Nova430I => dec!(2.5),
-            Self::Neutrino430 => dec!(1.0),
-            Self::SercommIndoor => dec!(1.0),
-            Self::SercommOutdoor => dec!(2.5),
-            Self::CellTypeNone => dec!(0.0),
-            Self::NovaGenericWifiIndoor => dec!(0.4),
-        }
-    }
-
     pub fn location_weight(
         &self,
         location_validation_timestamp: Option<DateTime<Utc>>,

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,
 };
@@ -39,7 +39,8 @@ impl Cmd {
             HeartbeatReward::validated(&pool, &epoch, settings.max_asserted_distance_deviation);
         let speedtest_averages =
             SpeedtestAverages::aggregate_epoch_averages(epoch.end, &pool).await?;
-        let reward_shares = PocShares::aggregate(heartbeats, &speedtest_averages).await?;
+        let reward_shares =
+            CoveragePoints::aggregate_points(&pool, heartbeats, &speedtest_averages, end).await?;
 
         let mut total_rewards = 0_u64;
         let mut owner_rewards = HashMap::<_, u64>::new();