update proto branch and use new types

helium · Sep 30, 2024 · 3f24307 · 3f24307
1 parent 6a53755
commit 3f24307
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 23 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/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/do-device-type", features = [
   "services",
 ] }
-beacon = { git = "https://github.com/helium/proto", branch = "master" }
+beacon = { git = "https://github.com/helium/proto", branch = "mj/do-device-type" }
 solana-client = "1.18"
 solana-sdk = "1.18"
 solana-program = "1.18"

diff --git a/mobile_verifier/src/heartbeats/mod.rs b/mobile_verifier/src/heartbeats/mod.rs
@@ -494,7 +494,7 @@ impl ValidatedHeartbeat {
                 dec!(0),
                 None,
                 Some(coverage_object.meta),
-                proto::HeartbeatValidity::DataOnly,
+                proto::HeartbeatValidity::InvalidDeviceType,
             )),
             GatewayResolution::GatewayNotFound => Ok(Self::new(
                 heartbeat,

diff --git a/mobile_verifier/src/speedtests.rs b/mobile_verifier/src/speedtests.rs
@@ -184,7 +184,9 @@ where
             .resolve_gateway_info(&pubkey)
             .await?
         {
-            Some(gw_info) if gw_info.is_data_only() => Ok(SpeedtestResult::SpeedtestDataOnly),
+            Some(gw_info) if gw_info.is_data_only() => {
+                Ok(SpeedtestResult::SpeedtestInvalidDeviceType)
+            }
             Some(_) => Ok(SpeedtestResult::SpeedtestValid),
             None => Ok(SpeedtestResult::SpeedtestGatewayNotFound),
         }