handle unknown lora region in config service gateway api

helium · Apr 6, 2023 · 501b237 · 501b237
1 parent d2532d0
commit 501b237
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 61 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/iot_config/src/gateway_service.rs b/iot_config/src/gateway_service.rs
@@ -9,7 +9,7 @@ use helium_proto::{
         GatewayLocationReqV1, GatewayLocationResV1, GatewayRegionParamsReqV1,
         GatewayRegionParamsResV1,
     },
-    Message,
+    Message, Region,
 };
 use hextree::Cell;
 use node_follower::{
@@ -84,7 +84,9 @@ impl iot_config::Gateway for GatewayService {
         let pubkey: &PublicKeyBinary = &pubkey.into();
         tracing::debug!(pubkey = pubkey.to_string(), "fetching region params");
 
-        let default_region = request.region();
+        let default_region = Region::from_i32(request.region).ok_or(Status::invalid_argument(
+            format!("invalid lora region {}", request.region),
+        ))?;
 
         let (region, gain) = match self
             .follower_service

diff --git a/iot_config/src/region_map.rs b/iot_config/src/region_map.rs
@@ -110,6 +110,14 @@ pub async fn build_params_map(
         let params = BlockchainRegionParamsV1::decode(region_row.params.as_slice())?;
         params_map.insert(region, params);
     }
+
+    // insert the Unknown region with Empty params
+    params_map.insert(
+        Region::Unknown,
+        BlockchainRegionParamsV1 {
+            region_params: vec![],
+        },
+    );
     Ok(params_map)
 }