Merge pull request #2269 from input-output-hk/sfa/2253/remove_mithril_common_circular_dependencies

Remove mithril common circular dependencies and `random` feature

Author: sfauvel

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-aggregator"
-version = "0.6.25"
+version = "0.6.26"
 description = "A Mithril Aggregator server"
 authors = { workspace = true }
 edition = { workspace = true }

mithril-aggregator/Cargo.toml

@@ -3,8 +3,7 @@ use serde::{Deserialize, Serialize};
 
 use mithril_common::crypto_helper::ProtocolParameters;
 use mithril_common::entities::{
-    BlockNumber, CardanoDatabaseSnapshot, Epoch, SignedEntity, SignedEntityType, Snapshot,
-    StakeDistribution,
+    BlockNumber, CardanoDatabaseSnapshot, Epoch, SignedEntityType, Snapshot, StakeDistribution,
 };
 #[cfg(test)]
 use mithril_common::entities::{CardanoStakeDistribution, MithrilStakeDistribution};
@@ -15,7 +14,7 @@ use mithril_common::messages::{
     MithrilStakeDistributionListItemMessage, MithrilStakeDistributionMessage,
     SignerWithStakeMessagePart, SnapshotListItemMessage, SnapshotMessage,
 };
-use mithril_common::signable_builder::Artifact;
+use mithril_common::signable_builder::{Artifact, SignedEntity};
 use mithril_common::StdError;
 use mithril_persistence::database::Hydrator;
 use mithril_persistence::sqlite::{HydrationError, Projection, SqLiteEntity};

mithril-aggregator/src/database/record/signed_entity.rs

@@ -165,7 +165,8 @@ impl SignedEntityStorer for SignedEntityStore {
 #[cfg(test)]
 mod tests {
     use mithril_common::{
-        entities::{Epoch, MithrilStakeDistribution, SignedEntity, Snapshot},
+        entities::{Epoch, MithrilStakeDistribution, Snapshot},
+        signable_builder::SignedEntity,
         test_utils::fake_data,
     };
 

mithril-aggregator/src/database/repository/signed_entity_store.rs

@@ -7,8 +7,8 @@ pub mod snapshot;
 #[cfg(test)]
 pub mod test_utils {
     use chrono::{DateTime, Utc};
-    use mithril_common::entities::{SignedEntity, SignedEntityType};
-    use mithril_common::signable_builder::Artifact;
+    use mithril_common::entities::SignedEntityType;
+    use mithril_common::signable_builder::{Artifact, SignedEntity};
 
     pub fn create_signed_entity<T>(
         signed_entity_type: SignedEntityType,

mithril-aggregator/src/http_server/routes/artifact_routes/mod.rs

@@ -48,9 +48,8 @@ fn proof_cardano_transaction(
 
 mod handlers {
     use mithril_common::{
-        entities::{CardanoTransactionsSnapshot, SignedEntity},
-        messages::CardanoTransactionsProofsMessage,
-        StdResult,
+        entities::CardanoTransactionsSnapshot, messages::CardanoTransactionsProofsMessage,
+        signable_builder::SignedEntity, StdResult,
     };
     use slog::{debug, warn, Logger};
     use std::{convert::Infallible, sync::Arc};
@@ -148,9 +147,8 @@ mod tests {
     };
 
     use mithril_common::{
-        entities::{
-            BlockNumber, CardanoTransactionsSetProof, CardanoTransactionsSnapshot, SignedEntity,
-        },
+        entities::{BlockNumber, CardanoTransactionsSetProof, CardanoTransactionsSnapshot},
+        signable_builder::SignedEntity,
         test_utils::{apispec::APISpec, assert_equivalent, fake_data},
     };
 

mithril-aggregator/src/http_server/routes/proof_routes.rs

@@ -1,8 +1,7 @@
-use mithril_common::entities::{CardanoTransactionsSnapshot, SignedEntity};
-use mithril_common::messages::CardanoTransactionsSetProofMessagePart;
 use mithril_common::{
-    entities::{CardanoTransactionsSetProof, TransactionHash},
-    messages::CardanoTransactionsProofsMessage,
+    entities::{CardanoTransactionsSetProof, CardanoTransactionsSnapshot, TransactionHash},
+    messages::{CardanoTransactionsProofsMessage, CardanoTransactionsSetProofMessagePart},
+    signable_builder::SignedEntity,
     StdResult,
 };
 

mithril-aggregator/src/message_adapters/to_cardano_transactions_proof_message.rs

@@ -12,11 +12,11 @@ use tokio::task::JoinHandle;
 use mithril_common::{
     entities::{
         BlockNumber, CardanoDatabaseSnapshot, CardanoDbBeacon, CardanoStakeDistribution,
-        CardanoTransactionsSnapshot, Certificate, Epoch, MithrilStakeDistribution, SignedEntity,
+        CardanoTransactionsSnapshot, Certificate, Epoch, MithrilStakeDistribution,
         SignedEntityType, SignedEntityTypeDiscriminants, Snapshot,
     },
     logging::LoggerExtensions,
-    signable_builder::Artifact,
+    signable_builder::{Artifact, SignedEntity},
     signed_entity_type_lock::SignedEntityTypeLock,
     StdResult,
 };

mithril-aggregator/src/services/signed_entity.rs

@@ -4,9 +4,12 @@ use mithril_aggregator::{
     entities::OpenMessage,
     services::{CertifierService, SignedEntityService},
 };
-use mithril_common::entities::{CardanoTransactionsSnapshot, Certificate, SignedEntity};
 use mithril_common::{
-    entities::{Epoch, SignedEntityType, SignedEntityTypeDiscriminants, TimePoint},
+    entities::{
+        CardanoTransactionsSnapshot, Certificate, Epoch, SignedEntityType,
+        SignedEntityTypeDiscriminants, TimePoint,
+    },
+    signable_builder::SignedEntity,
     StdResult, TickerService,
 };
 use std::sync::Arc;

mithril-aggregator/tests/test_extensions/aggregator_observer.rs

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-client"
-version = "0.10.9"
+version = "0.10.10"
 description = "Mithril client library"
 authors = { workspace = true }
 edition = { workspace = true }
@@ -69,7 +69,6 @@ reqwest = { version = "0.12.12", default-features = false, features = [
 httpmock = "0.7.0"
 indicatif = { version = "0.17.9", features = ["tokio"] }
 mithril-common = { path = "../mithril-common", version = "=0.4", default-features = false, features = [
-    "random",
     "test_tools",
 ] }
 mockall = "0.13.1"