add integration tests for reward entities, refactor to accomodate

helium · Jan 10, 2024 · cd4c646 · cd4c646
1 parent ca8715d
commit cd4c646
Show file tree

Hide file tree

Showing 15 changed files with 1,208 additions and 246 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/file_store/src/file_sink.rs b/file_store/src/file_sink.rs
@@ -165,8 +165,8 @@ impl FileSinkBuilder {
 
 #[derive(Debug, Clone)]
 pub struct FileSinkClient {
-    sender: MessageSender,
-    metric: &'static str,
+    pub sender: MessageSender,
+    pub metric: &'static str,
 }
 
 const OK_LABEL: Label = Label::from_static_parts("status", "ok");

diff --git a/mobile_config/src/client/carrier_service_client.rs b/mobile_config/src/client/carrier_service_client.rs
@@ -46,6 +46,9 @@ impl CarrierServiceVerifier for CarrierServiceClient {
                 response.verify(&self.config_pubkey)?;
                 response.entity_key
             }
+            Err(status) if status.code() == tonic::Code::NotFound => {
+                Err(ClientError::UnknownServiceProvider)?
+            }
             Err(status) => Err(status)?,
         };
         self.cache

diff --git a/mobile_config/src/client/mod.rs b/mobile_config/src/client/mod.rs
@@ -24,7 +24,7 @@ pub enum ClientError {
     VerificationError(#[from] file_store::Error),
     #[error("error parsing gateway location {0}")]
     LocationParseError(#[from] std::num::ParseIntError),
-    #[error("unknown service provider")]
+    #[error("unknown service provider name")]
     UnknownServiceProvider,
 }
 

diff --git a/mobile_verifier/Cargo.toml b/mobile_verifier/Cargo.toml
@@ -34,6 +34,7 @@ humantime = {workspace = true}
 rust_decimal = {workspace = true}
 rust_decimal_macros = {workspace = true}
 tonic = {workspace = true}
+tokio-stream = { workspace = true }
 metrics = {workspace = true}
 metrics-exporter-prometheus = {workspace = true}
 mobile-config = {path = "../mobile_config"}
@@ -46,3 +47,6 @@ rand = {workspace = true}
 async-trait = {workspace = true}
 retainer = {workspace = true}
 uuid = {workspace = true}
+
+[dev-dependencies]
+backon = "0"
diff --git a/mobile_verifier/src/data_session.rs b/mobile_verifier/src/data_session.rs
@@ -116,6 +116,7 @@ impl HotspotDataSession {
         .await?;
         Ok(())
     }
+
     fn from_valid_data_session(
         v: ValidDataTransferSession,
         received_timestamp: DateTime<Utc>,

diff --git a/mobile_verifier/src/lib.rs b/mobile_verifier/src/lib.rs
@@ -1,15 +1,15 @@
 pub mod cell_type;
 pub mod cli;
 pub mod coverage;
-mod data_session;
+pub mod data_session;
 pub mod heartbeats;
 pub mod reward_shares;
 pub mod rewarder;
 mod settings;
 pub mod speedtests;
 pub mod speedtests_average;
-mod subscriber_location;
-mod telemetry;
+pub mod subscriber_location;
+pub mod telemetry;
 
 pub use settings::Settings;
 

diff --git a/mobile_verifier/src/reward_shares.rs b/mobile_verifier/src/reward_shares.rs
@@ -10,11 +10,12 @@ use chrono::{DateTime, Duration, Utc};
 use file_store::traits::TimestampEncode;
 use futures::{Stream, StreamExt};
 use helium_crypto::PublicKeyBinary;
-use helium_proto::services::poc_mobile::{
-    ServiceProvider, UnallocatedReward, UnallocatedRewardType,
-};
 use helium_proto::services::{
-    poc_mobile as proto, poc_mobile::mobile_reward_share::Reward as ProtoReward,
+    poc_mobile as proto,
+    poc_mobile::{
+        mobile_reward_share::Reward as ProtoReward, ServiceProvider, UnallocatedReward,
+        UnallocatedRewardType,
+    },
 };
 use mobile_config::client::{carrier_service_client::CarrierServiceVerifier, ClientError};
 use rust_decimal::prelude::*;
@@ -47,6 +48,7 @@ const SERVICE_PROVIDER_PERCENT: Decimal = dec!(0.1);
 // Percent of total emissions allocated for oracles
 const ORACLES_PERCENT: Decimal = dec!(0.04);
 
+#[derive(Debug)]
 pub struct TransferRewards {
     reward_scale: Decimal,
     rewards: HashMap<PublicKeyBinary, Decimal>,
@@ -336,7 +338,7 @@ impl ServiceProviderShares {
     fn entity_key_to_service_provider(key: &str) -> anyhow::Result<ServiceProvider> {
         match key {
             "Helium Mobile" => Ok(ServiceProvider::HeliumMobile),
-            _ => bail!("invalid service provider name"),
+            _ => bail!("unknown service provider name"),
         }
     }
 }