Merge pull request #386 from helium/andymck/sp-str-impls

Centralise str impl for service provider enum

build.rs

@@ -21,6 +21,7 @@ const SERVICES: &[&str] = &[
 const MESSAGES: &[&str] = &[
     "src/blockchain_txn.proto",
     "src/entropy.proto",
+    "src/service_provider.proto",
     "src/data_rate.proto",
     "src/region.proto",
     "src/mapper.proto",

src/lib.rs

@@ -10,7 +10,7 @@ pub use prost::{DecodeError, EncodeError, Message};
 pub mod services {
     use crate::{
         BlockchainRegionParamsV1, BlockchainTokenTypeV1, BlockchainTxn, DataRate, EntropyReportV1,
-        GatewayStakingMode, MapperAttach, Region, RoutingAddress,
+        GatewayStakingMode, MapperAttach, Region, RoutingAddress, ServiceProvider,
     };
 
     pub mod iot_config {
@@ -98,6 +98,27 @@ pub mod services {
     pub use tonic::transport::*;
 }
 
+impl std::str::FromStr for ServiceProvider {
+    type Err = prost::DecodeError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s {
+            "Helium Mobile" => Ok(ServiceProvider::HeliumMobile),
+            unknown => Err(prost::DecodeError::new(format!(
+                "unknown service provider: {unknown}"
+            ))),
+        }
+    }
+}
+
+impl std::fmt::Display for ServiceProvider {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        match self {
+            ServiceProvider::HeliumMobile => f.write_str("Helium Mobile"),
+        }
+    }
+}
+
 impl std::str::FromStr for DataRate {
     type Err = prost::DecodeError;
 

src/service/poc_mobile.proto

@@ -3,6 +3,7 @@ syntax = "proto3";
 package helium.poc_mobile;
 
 import "mapper.proto";
+import "service_provider.proto";
 
 message speedtest_req_v1 {
   bytes pub_key = 1;
@@ -337,10 +338,6 @@ message subscriber_reward {
   uint64 discovery_location_amount = 2;
 }
 
-enum service_provider {
-  helium_mobile = 0;
-}
-
 message service_provider_reward {
   // rewardable entity id of the service provider to which the reward will be
   // credited

src/service_provider.proto

@@ -0,0 +1,7 @@
+syntax = "proto3";
+
+package helium;
+
+enum service_provider {
+  helium_mobile = 0;
+}