Mj/radio location forwarder update

Cargo.toml

@@ -70,10 +70,10 @@ helium-lib = { git = "https://github.com/helium/helium-wallet-rs.git", branch =
 hextree = { git = "https://github.com/jaykickliter/HexTree", branch = "main", features = [
   "disktree",
 ] }
-helium-proto = { git = "https://github.com/helium/proto", branch = "master", features = [
+helium-proto = { git = "https://github.com/helium/proto", branch = "mj/radio_location_esimates_with_hexes", features = [
   "services",
 ] }
-beacon = { git = "https://github.com/helium/proto", branch = "master" }
+beacon = { git = "https://github.com/helium/proto", branch = "mj/radio_location_esimates_with_hexes" }
 solana-client = "1.18"
 solana-sdk = "1.18"
 solana-program = "1.18"
@@ -132,4 +132,3 @@ sqlx = { git = "https://github.com/helium/sqlx.git", rev = "92a2268f02e0cac6fccb
 # 
 # [patch.'https://github.com/helium/proto']
 # helium-proto = { path = "../proto" }
-# beacon = { path = "../proto/beacon" }

file_store/src/error.rs

@@ -41,6 +41,8 @@ pub enum Error {
     //Not recommended for internal use!
     #[error("external error")]
     ExternalError(#[from] Box<dyn std::error::Error + Send + Sync>),
+    #[error("error parsing decimal")]
+    IntoDecimal(#[from] rust_decimal::Error),
 }
 
 #[derive(Error, Debug)]

file_store/src/file_info.rs

@@ -168,6 +168,9 @@ pub const VERIFIED_SUBSCRIBER_VERIFIED_MAPPING_INGEST_REPORT: &str =
 pub const PROMOTION_REWARD_INGEST_REPORT: &str = "promotion_reward_ingest_report";
 pub const VERIFIED_PROMOTION_REWARD: &str = "verified_promotion_reward";
 pub const SERVICE_PROVIDER_PROMOTION_FUND: &str = "service_provider_promotion_fund";
+pub const RADIO_LOCATION_ESTIMATES_INGEST_REPORT: &str = "radio_location_estimates_ingest_report";
+pub const VERIFIED_RADIO_LOCATION_ESTIMATES_REPORT: &str =
+    "verified_radio_location_estimates_report";
 
 #[derive(Debug, PartialEq, Eq, Clone, Serialize, Copy, strum::EnumCount)]
 #[serde(rename_all = "snake_case")]
@@ -228,6 +231,8 @@ pub enum FileType {
     PromotionRewardIngestReport,
     VerifiedPromotionReward,
     ServiceProviderPromotionFund,
+    RadioLocationEstimatesIngestReport,
+    VerifiedRadioLocationEstimatesReport,
 }
 
 impl fmt::Display for FileType {
@@ -303,6 +308,8 @@ impl fmt::Display for FileType {
             Self::PromotionRewardIngestReport => PROMOTION_REWARD_INGEST_REPORT,
             Self::VerifiedPromotionReward => VERIFIED_PROMOTION_REWARD,
             Self::ServiceProviderPromotionFund => SERVICE_PROVIDER_PROMOTION_FUND,
+            Self::RadioLocationEstimatesIngestReport => RADIO_LOCATION_ESTIMATES_INGEST_REPORT,
+            Self::VerifiedRadioLocationEstimatesReport => VERIFIED_RADIO_LOCATION_ESTIMATES_REPORT,
         };
         f.write_str(s)
     }
@@ -381,6 +388,8 @@ impl FileType {
             Self::PromotionRewardIngestReport => PROMOTION_REWARD_INGEST_REPORT,
             Self::VerifiedPromotionReward => VERIFIED_PROMOTION_REWARD,
             Self::ServiceProviderPromotionFund => SERVICE_PROVIDER_PROMOTION_FUND,
+            Self::RadioLocationEstimatesIngestReport => RADIO_LOCATION_ESTIMATES_INGEST_REPORT,
+            Self::VerifiedRadioLocationEstimatesReport => VERIFIED_RADIO_LOCATION_ESTIMATES_REPORT,
         }
     }
 }
@@ -458,6 +467,8 @@ impl FromStr for FileType {
             PROMOTION_REWARD_INGEST_REPORT => Self::PromotionRewardIngestReport,
             VERIFIED_PROMOTION_REWARD => Self::VerifiedPromotionReward,
             SERVICE_PROVIDER_PROMOTION_FUND => Self::ServiceProviderPromotionFund,
+            RADIO_LOCATION_ESTIMATES_INGEST_REPORT => Self::RadioLocationEstimatesIngestReport,
+            VERIFIED_RADIO_LOCATION_ESTIMATES_REPORT => Self::VerifiedRadioLocationEstimatesReport,
             _ => return Err(Error::from(io::Error::from(io::ErrorKind::InvalidInput))),
         };
         Ok(result)

file_store/src/lib.rs

@@ -20,12 +20,15 @@ pub mod mobile_radio_threshold;
 pub mod mobile_session;
 pub mod mobile_subscriber;
 pub mod mobile_transfer;
+pub mod radio_location_estimates;
+pub mod radio_location_estimates_ingest_report;
 pub mod reward_manifest;
 mod settings;
 pub mod speedtest;
 pub mod subscriber_verified_mapping_event;
 pub mod subscriber_verified_mapping_event_ingest_report;
 pub mod traits;
+pub mod verified_radio_location_estimates;
 pub mod verified_subscriber_verified_mapping_event_ingest_report;
 pub mod wifi_heartbeat;