Cartographer + Emitter Reimplementation

.accepted_words.txt

@@ -98,6 +98,7 @@ MappingClient
 MappingClientImpl
 md
 microsoft
+min
 MockDigitalTwin
 MockMappingService
 MQTTProviderProxyImpl

Cargo.toml

@@ -11,8 +11,10 @@ members = [
   "cloud_connectors/azure/mqtt_connector",
   "cloud_connectors/azure/proto-build",
   "common",
+  "contracts",
   "digital_twin_adapters/ibeji_adapter",
   "digital_twin_adapters/in_memory_mock_digital_twin_adapter",
+  "digital_twin_adapters/mock_digital_twin_adapter",
   "freyja",
   "mapping_clients/in_memory_mock_mapping_client",
   "mapping_clients/mock_mapping_service_client",
@@ -48,6 +50,7 @@ env_logger = "0.10.0"
 futures = "0.3.28"
 httptest = "0.15.4"
 log = "^0.4"
+mockall = "0.11.4"
 paho-mqtt = "0.12"
 proc-macro2 = "1.0.52"
 prost = "0.11.9"

cloud_adapters/azure_cloud_connector_adapter/src/azure_cloud_connector_adapter.rs

@@ -80,7 +80,7 @@ impl AzureCloudConnectorAdapter {
 #[async_trait]
 impl CloudAdapter for AzureCloudConnectorAdapter {
     /// Creates a new instance of a CloudAdapter with default settings
-    fn create_new() -> Result<Box<dyn CloudAdapter + Send + Sync>, CloudAdapterError> {
+    fn create_new() -> Result<Self, CloudAdapterError> {
         let cloud_connector_client = futures::executor::block_on(async {
             let config_file = fs::read_to_string(Path::new(env!("OUT_DIR")).join(CONFIG_FILE))
                 .map_err(CloudAdapterError::io)?;
@@ -100,9 +100,9 @@ impl CloudAdapter for AzureCloudConnectorAdapter {
             .map_err(CloudAdapterError::communication)
         })?;
 
-        Ok(Box::new(Self {
+        Ok(Self {
             cloud_connector_client,
-        }))
+        })
     }
 
     /// Sends the signal to the cloud

cloud_adapters/in_memory_mock_cloud_adapter/Cargo.toml

@@ -13,6 +13,6 @@ async-trait = { workspace = true }
 freyja-contracts = { workspace = true }
 log = { workspace = true }
 serde = { workspace = true }
-serde_json = { workspace = true}
-tokio = { workspace = true}
+serde_json = { workspace = true }
+tokio = { workspace = true }
 time = { workspace = true }

cloud_adapters/in_memory_mock_cloud_adapter/src/in_memory_mock_cloud_adapter.rs

@@ -47,9 +47,8 @@ impl InMemoryMockCloudAdapter {
 #[async_trait]
 impl CloudAdapter for InMemoryMockCloudAdapter {
     /// Creates a new instance of a CloudAdapter with default settings
-    fn create_new() -> Result<Box<dyn CloudAdapter + Send + Sync>, CloudAdapterError> {
+    fn create_new() -> Result<Self, CloudAdapterError> {
         Self::from_config_file(Path::new(env!("OUT_DIR")).join(CONFIG_FILE))
-            .map(|r| Box::new(r) as _)
     }
 
     /// Sends the signal to the cloud

common/Cargo.toml

@@ -9,5 +9,6 @@ edition = "2021"
 license = "MIT"
 
 [dependencies]
+freyja-contracts = { workspace = true }
 log = { workspace = true }
 tokio = { workspace = true }

common/src/lib.rs

@@ -2,4 +2,5 @@
 // Licensed under the MIT license.
 // SPDX-License-Identifier: MIT
 
+pub mod signal_store;
 pub mod utils;