swap iot config integrated client for previous standalone impl

helium · Apr 5, 2023 · 472d8e2 · 472d8e2
1 parent 428764b
commit 472d8e2
Show file tree

Hide file tree

Showing 17 changed files with 139 additions and 462 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,7 +19,6 @@ members = [
     "iot_packet_verifier",
     "iot_config",
     "price",
-    "iot_config_client"
 ]
 
 [workspace.package]

diff --git a/iot_config_client/Cargo.toml b/iot_config_client/Cargo.toml
diff --git a/iot_config_client/src/gateway_resolver.rs b/iot_config_client/src/gateway_resolver.rs
diff --git a/iot_config_client/src/iot_config_client.rs b/iot_config_client/src/iot_config_client.rs
diff --git a/iot_config_client/src/lib.rs b/iot_config_client/src/lib.rs
diff --git a/iot_config_client/src/region_params_resolver.rs b/iot_config_client/src/region_params_resolver.rs
diff --git a/iot_config_client/src/settings.rs b/iot_config_client/src/settings.rs
diff --git a/iot_packet_verifier/src/verifier.rs b/iot_packet_verifier/src/verifier.rs
@@ -201,6 +201,7 @@ impl ConfigServer for CachedOrgClient {
             let mut req = OrgEnableReqV1 {
                 oui,
                 timestamp: Utc::now().timestamp_millis() as u64,
+                signer: self.keypair.public_key().into(),
                 signature: vec![],
             };
             let signature = self.keypair.sign(&req.encode_to_vec())?;
@@ -215,6 +216,7 @@ impl ConfigServer for CachedOrgClient {
             let mut req = OrgDisableReqV1 {
                 oui,
                 timestamp: Utc::now().timestamp_millis() as u64,
+                signer: self.keypair.public_key().into(),
                 signature: vec![],
             };
             let signature = self.keypair.sign(&req.encode_to_vec())?;

diff --git a/iot_verifier/Cargo.toml b/iot_verifier/Cargo.toml
@@ -42,7 +42,7 @@ file-store = { path = "../file_store" }
 metrics = {workspace = true}
 retainer = {workspace = true}
 blake3 = {workspace = true}
-iot-config-client = { path = "../iot_config_client" }
+iot-config = { path = "../iot_config" }
 poc-metrics = { path = "../metrics" }
 db-store = {path = "../db_store"}
 denylist = {path = "../denylist"}