Merge contracts and common crates (#105)

Merge contracts and common crates to simplify directory structure. This also helps deal with a circular dependency that arose in finishing #18
eclipse-ibeji · Jan 9, 2024 · 6f4547b · 6f4547b
1 parent 8844d4b
commit 6f4547b
Show file tree

Hide file tree

Showing 56 changed files with 64 additions and 116 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,7 +9,6 @@ members = [
   "build_common",
   "cloud_adapters/in_memory_mock_cloud_adapter",
   "common",
-  "contracts",
   "digital_twin_adapters/in_memory_mock_digital_twin_adapter",
   "digital_twin_adapters/mock_digital_twin_adapter",
   "freyja",

diff --git a/cloud_adapters/in_memory_mock_cloud_adapter/Cargo.toml b/cloud_adapters/in_memory_mock_cloud_adapter/Cargo.toml
@@ -10,7 +10,7 @@ license = "MIT"
 
 [dependencies]
 async-trait = { workspace = true }
-freyja-contracts = { workspace = true }
+freyja-common = { workspace = true }
 log = { workspace = true }
 serde_json = { workspace = true }
 tokio = { workspace = true }

diff --git a/cloud_adapters/in_memory_mock_cloud_adapter/src/in_memory_mock_cloud_adapter.rs b/cloud_adapters/in_memory_mock_cloud_adapter/src/in_memory_mock_cloud_adapter.rs
@@ -5,7 +5,7 @@
 use async_trait::async_trait;
 use log::{debug, info};
 
-use freyja_contracts::cloud_adapter::{
+use freyja_common::cloud_adapter::{
     CloudAdapter, CloudAdapterError, CloudMessageRequest, CloudMessageResponse,
 };
 

diff --git a/common/Cargo.toml b/common/Cargo.toml
@@ -9,11 +9,14 @@ edition = "2021"
 license = "MIT"
 
 [dependencies]
+async-trait = { workspace = true }
 config = { workspace = true }
-freyja-contracts = { workspace = true }
+crossbeam = { workspace = true }
 home = { workspace = true }
 log = { workspace = true }
 proc-macros = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
+strum = { workspace = true }
+strum_macros = { workspace = true }
 tokio = { workspace = true }
diff --git a/contracts/src/cloud_adapter.rs → common/src/cloud_adapter.rs b/contracts/src/cloud_adapter.rs → common/src/cloud_adapter.rs
diff --git a/contracts/src/conversion.rs → common/src/conversion.rs b/contracts/src/conversion.rs → common/src/conversion.rs
@@ -34,7 +34,7 @@ impl Conversion {
     ///
     /// # Example
     /// ```rust
-    /// use freyja_contracts::conversion::Conversion;
+    /// use freyja_common::conversion::Conversion;
     /// let c2f = Conversion::c_to_f();
     /// assert!(42.0 == c2f.inverse().apply(c2f.apply(42.0)));
     /// ```
@@ -56,7 +56,7 @@ impl Conversion {
     ///
     /// # Example
     /// ```rust
-    /// use freyja_contracts::conversion::Conversion;
+    /// use freyja_common::conversion::Conversion;
     /// let c2f = Conversion::c_to_f();
     /// assert!(32.0 == c2f.apply(0.0));
     /// assert!(212.0 == c2f.apply(100.0));

diff --git a/contracts/src/digital_twin_adapter.rs → common/src/digital_twin_adapter.rs b/contracts/src/digital_twin_adapter.rs → common/src/digital_twin_adapter.rs
diff --git a/contracts/src/digital_twin_map_entry.rs → common/src/digital_twin_map_entry.rs b/contracts/src/digital_twin_map_entry.rs → common/src/digital_twin_map_entry.rs
diff --git a/contracts/src/entity.rs → common/src/entity.rs b/contracts/src/entity.rs → common/src/entity.rs
diff --git a/common/src/lib.rs b/common/src/lib.rs
@@ -2,10 +2,19 @@
 // Licensed under the MIT license.
 // SPDX-License-Identifier: MIT
 
+pub mod cloud_adapter;
 pub mod cmd_utils;
 pub mod config_utils;
+pub mod conversion;
+pub mod digital_twin_adapter;
+pub mod digital_twin_map_entry;
+pub mod entity;
+pub mod mapping_client;
 pub mod message_utils;
+pub mod provider_proxy;
+pub mod provider_proxy_selector;
 pub mod retry_utils;
+pub mod signal;
 pub mod signal_store;
 
 /// Expands to `env!("OUT_DIR")`.

diff --git a/contracts/src/mapping_client.rs → common/src/mapping_client.rs b/contracts/src/mapping_client.rs → common/src/mapping_client.rs
diff --git a/contracts/src/provider_proxy.rs → common/src/provider_proxy.rs b/contracts/src/provider_proxy.rs → common/src/provider_proxy.rs
diff --git a/contracts/src/provider_proxy_selector.rs → common/src/provider_proxy_selector.rs b/contracts/src/provider_proxy_selector.rs → common/src/provider_proxy_selector.rs
diff --git a/contracts/src/signal.rs → common/src/signal.rs b/contracts/src/signal.rs → common/src/signal.rs
diff --git a/common/src/signal_store.rs b/common/src/signal_store.rs
@@ -4,7 +4,7 @@
 
 use std::{collections::HashMap, sync::RwLock};
 
-use freyja_contracts::signal::{Emission, Signal, SignalPatch};
+use crate::signal::{Emission, Signal, SignalPatch};
 
 /// Stores signals and allows access in a thread-safe manner with support for multiple concurrent readers.
 /// Suitable for use as `Arc<SignalStore>`.
@@ -214,7 +214,7 @@ mod signal_store_tests {
 
     use std::collections::HashSet;
 
-    use freyja_contracts::{
+    use crate::{
         conversion::Conversion,
         entity::{Entity, EntityEndpoint},
         signal::{Emission, EmissionPolicy, Target},

diff --git a/contracts/Cargo.toml b/contracts/Cargo.toml
diff --git a/contracts/src/lib.rs b/contracts/src/lib.rs
diff --git a/digital_twin_adapters/in_memory_mock_digital_twin_adapter/Cargo.toml b/digital_twin_adapters/in_memory_mock_digital_twin_adapter/Cargo.toml
@@ -12,7 +12,6 @@ license = "MIT"
 async-trait = { workspace = true }
 freyja-build-common = { workspace = true }
 freyja-common = { workspace = true }
-freyja-contracts = { workspace = true }
 serde = { workspace = true }
 tokio = { workspace = true }
 

diff --git a/digital_twin_adapters/in_memory_mock_digital_twin_adapter/src/config.rs b/digital_twin_adapters/in_memory_mock_digital_twin_adapter/src/config.rs
@@ -4,7 +4,7 @@
 
 use serde::{Deserialize, Serialize};
 
-use freyja_contracts::entity::Entity;
+use freyja_common::entity::Entity;
 
 /// The in-memory mock digital twin's config
 #[derive(Clone, Debug, Serialize, Deserialize)]

diff --git a/...n_adapters/in_memory_mock_digital_twin_adapter/src/in_memory_mock_digital_twin_adapter.rs b/...n_adapters/in_memory_mock_digital_twin_adapter/src/in_memory_mock_digital_twin_adapter.rs
@@ -6,11 +6,11 @@ use async_trait::async_trait;
 
 use crate::config::Config;
 use freyja_build_common::config_file_stem;
-use freyja_common::{config_utils, out_dir};
-use freyja_contracts::digital_twin_adapter::{
+use freyja_common::digital_twin_adapter::{
     DigitalTwinAdapter, DigitalTwinAdapterError, DigitalTwinAdapterErrorKind, FindByIdRequest,
     FindByIdResponse,
 };
+use freyja_common::{config_utils, out_dir};
 
 /// In-memory mock that mocks finding endpoint info about entities
 /// through find by id
@@ -68,7 +68,7 @@ mod in_memory_mock_digital_twin_adapter_tests {
     use super::*;
 
     use crate::config::EntityConfig;
-    use freyja_contracts::entity::{Entity, EntityEndpoint};
+    use freyja_common::entity::{Entity, EntityEndpoint};
 
     const OPERATION: &str = "Subscribe";
 

diff --git a/digital_twin_adapters/mock_digital_twin_adapter/Cargo.toml b/digital_twin_adapters/mock_digital_twin_adapter/Cargo.toml
@@ -12,7 +12,6 @@ license = "MIT"
 async-trait = { workspace = true }
 freyja-build-common = { workspace = true }
 freyja-common = { workspace = true }
-freyja-contracts = { workspace = true }
 mock-digital-twin = { workspace = true }
 reqwest = { workspace = true }
 serde = { workspace = true }

diff --git a/digital_twin_adapters/mock_digital_twin_adapter/src/mock_digital_twin_adapter.rs b/digital_twin_adapters/mock_digital_twin_adapter/src/mock_digital_twin_adapter.rs
@@ -7,10 +7,10 @@ use reqwest::Client;
 
 use crate::config::Config;
 use freyja_build_common::config_file_stem;
-use freyja_common::{config_utils, out_dir};
-use freyja_contracts::digital_twin_adapter::{
+use freyja_common::digital_twin_adapter::{
     DigitalTwinAdapter, DigitalTwinAdapterError, FindByIdRequest, FindByIdResponse,
 };
+use freyja_common::{config_utils, out_dir};
 use mock_digital_twin::ENTITY_QUERY_PATH;
 
 /// Mocks a Digital Twin Adapter that calls the mocks/mock_digital_twin

diff --git a/freyja/Cargo.toml b/freyja/Cargo.toml
@@ -11,7 +11,6 @@ license = "MIT"
 [dependencies]
 crossbeam = { workspace = true }
 env_logger = { workspace = true }
-freyja-contracts = { workspace = true }
 freyja-common = { workspace = true }
 log = { workspace = true }
 proc-macros = { workspace = true }

diff --git a/freyja/src/cartographer.rs b/freyja/src/cartographer.rs
@@ -9,7 +9,7 @@ use tokio::sync::Mutex;
 use log::{debug, info, warn};
 
 use freyja_common::signal_store::SignalStore;
-use freyja_contracts::{
+use freyja_common::{
     conversion::Conversion,
     digital_twin_adapter::{
         DigitalTwinAdapter, DigitalTwinAdapterError, DigitalTwinAdapterErrorKind, FindByIdRequest,
@@ -231,7 +231,7 @@ mod cartographer_tests {
     use async_trait::async_trait;
     use mockall::{predicate::eq, *};
 
-    use freyja_contracts::{
+    use freyja_common::{
         digital_twin_adapter::{DigitalTwinAdapterError, FindByIdResponse},
         digital_twin_map_entry::DigitalTwinMapEntry,
         entity::{Entity, EntityEndpoint},

diff --git a/freyja/src/emitter.rs b/freyja/src/emitter.rs
@@ -10,7 +10,7 @@ use time::OffsetDateTime;
 use tokio::{sync::Mutex, time::sleep};
 
 use freyja_common::signal_store::SignalStore;
-use freyja_contracts::{
+use freyja_common::{
     cloud_adapter::{CloudAdapter, CloudMessageRequest, CloudMessageResponse},
     provider_proxy::SignalValue,
     provider_proxy_selector::ProviderProxySelector,
@@ -227,7 +227,7 @@ mod emitter_tests {
 
     use async_trait::async_trait;
 
-    use freyja_contracts::{
+    use freyja_common::{
         cloud_adapter::{CloudAdapterError, CloudAdapterErrorKind},
         entity::Entity,
         provider_proxy::ProviderProxyFactory,

diff --git a/freyja/src/lib.rs b/freyja/src/lib.rs
@@ -18,14 +18,14 @@ use tokio::sync::Mutex;
 use cartographer::Cartographer;
 use emitter::Emitter;
 use freyja_common::{
-    cmd_utils::{get_log_level, parse_args},
-    signal_store::SignalStore,
-};
-use freyja_contracts::{
     cloud_adapter::CloudAdapter, digital_twin_adapter::DigitalTwinAdapter,
     mapping_client::MappingClient, provider_proxy::SignalValue,
     provider_proxy_selector::ProviderProxySelector,
 };
+use freyja_common::{
+    cmd_utils::{get_log_level, parse_args},
+    signal_store::SignalStore,
+};
 use provider_proxy_selector::provider_proxy_selector_impl::ProviderProxySelectorImpl;
 
 use grpc_provider_proxy_v1::grpc_provider_proxy_factory::GRPCProviderProxyFactory;