Create hex_assignments crate

Cargo.toml

@@ -23,6 +23,7 @@ members = [
   "reward_scheduler",
   "solana",
   "task_manager",
+  "hex_assignments"
 ]
 resolver = "2"
 

hex_assignments/Cargo.toml

@@ -0,0 +1,18 @@
+[package]
+name = "hex-assignments"
+version = "0.1.0"
+description = "Hex Assignments"
+edition.workspace = true
+authors.workspace = true
+license.workspace = true
+
+[dependencies]
+anyhow = { workspace = true }
+hextree = { workspace = true }
+sqlx = {version = "*", features = ["runtime-tokio-rustls"]}
+rust_decimal = { workspace = true}
+rust_decimal_macros = { workspace = true}
+helium-proto = {workspace = true}
+async-trait = { workspace = true }
+chrono = { workspace = true }
+derive_builder = { workspace = true }

mobile_verifier/src/boosting_oracles/assignment.rs → hex_assignments/src/assignment.rs

@@ -149,14 +149,3 @@ impl HexAssignmentsBuilder {
         })
     }
 }
-
-#[cfg(test)]
-impl HexAssignments {
-    pub fn test_best() -> Self {
-        Self {
-            footfall: Assignment::A,
-            urbanized: Assignment::A,
-            landtype: Assignment::A,
-        }
-    }
-}

mobile_verifier/src/boosting_oracles/footfall.rs → hex_assignments/src/footfall.rs

@@ -1,53 +1,25 @@
-use std::path::Path;
-
 use chrono::{DateTime, Utc};
 use hextree::disktree::DiskTreeMap;
 
-use super::{Assignment, DataSet, DataSetType, HexAssignment};
+use super::{Assignment, HexAssignment};
 
 pub struct Footfall {
-    footfall: Option<DiskTreeMap>,
-    timestamp: Option<DateTime<Utc>>,
+    pub footfall: Option<DiskTreeMap>,
+    pub timestamp: Option<DateTime<Utc>>,
 }
 
 impl Footfall {
-    pub fn new() -> Self {
+    pub fn new(footfall: Option<DiskTreeMap>) -> Self {
         Self {
-            footfall: None,
-            timestamp: None,
-        }
-    }
-
-    pub fn new_mock(footfall: DiskTreeMap) -> Self {
-        Self {
-            footfall: Some(footfall),
+            footfall,
             timestamp: None,
         }
     }
 }
 
 impl Default for Footfall {
     fn default() -> Self {
-        Self::new()
-    }
-}
-
-#[async_trait::async_trait]
-impl DataSet for Footfall {
-    const TYPE: DataSetType = DataSetType::Footfall;
-
-    fn timestamp(&self) -> Option<DateTime<Utc>> {
-        self.timestamp
-    }
-
-    fn update(&mut self, path: &Path, time_to_use: DateTime<Utc>) -> anyhow::Result<()> {
-        self.footfall = Some(DiskTreeMap::open(path)?);
-        self.timestamp = Some(time_to_use);
-        Ok(())
-    }
-
-    fn is_ready(&self) -> bool {
-        self.footfall.is_some()
+        Self::new(None)
     }
 }
 

mobile_verifier/src/boosting_oracles/landtype.rs → hex_assignments/src/landtype.rs

@@ -1,53 +1,25 @@
-use std::path::Path;
-
 use chrono::{DateTime, Utc};
 use hextree::disktree::DiskTreeMap;
 
-use super::{Assignment, DataSet, DataSetType, HexAssignment};
+use super::{Assignment, HexAssignment};
 
 pub struct Landtype {
-    landtype: Option<DiskTreeMap>,
-    timestamp: Option<DateTime<Utc>>,
+    pub landtype: Option<DiskTreeMap>,
+    pub timestamp: Option<DateTime<Utc>>,
 }
 
 impl Landtype {
-    pub fn new() -> Self {
+    pub fn new(landtype: Option<DiskTreeMap>) -> Self {
         Self {
-            landtype: None,
-            timestamp: None,
-        }
-    }
-
-    pub fn new_mock(landtype: DiskTreeMap) -> Self {
-        Self {
-            landtype: Some(landtype),
+            landtype,
             timestamp: None,
         }
     }
 }
 
 impl Default for Landtype {
     fn default() -> Self {
-        Self::new()
-    }
-}
-
-#[async_trait::async_trait]
-impl DataSet for Landtype {
-    const TYPE: DataSetType = DataSetType::Landtype;
-
-    fn timestamp(&self) -> Option<DateTime<Utc>> {
-        self.timestamp
-    }
-
-    fn update(&mut self, path: &Path, time_to_use: DateTime<Utc>) -> anyhow::Result<()> {
-        self.landtype = Some(DiskTreeMap::open(path)?);
-        self.timestamp = Some(time_to_use);
-        Ok(())
-    }
-
-    fn is_ready(&self) -> bool {
-        self.landtype.is_some()
+        Self::new(None)
     }
 }