rename to signed entity service

Author: ghubertpalo

mithril-aggregator/src/artifact_builder/mod.rs

@@ -1,11 +1,8 @@
 //! The module used for building artifact
-
-mod artifact_builder_service;
 mod cardano_immutable_files_full;
 mod interface;
 mod mithril_stake_distribution;
 
-pub use artifact_builder_service::*;
 pub use cardano_immutable_files_full::*;
 pub use interface::*;
 pub use mithril_stake_distribution::*;

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

@@ -7,7 +7,6 @@ use async_trait::async_trait;
 
 use mithril_common::{
     entities::{SignedEntity, SignedEntityType, SignedEntityTypeDiscriminants, Snapshot},
-    signable_builder::Artifact,
     sqlite::{
         EntityCursor, HydrationError, Projection, Provider, SourceAlias, SqLiteEntity,
         WhereCondition,
@@ -63,7 +62,7 @@ impl From<SignedEntityRecord> for Snapshot {
 
 impl<T> TryFrom<SignedEntityRecord> for SignedEntity<T>
 where
-    T: Serialize + Deserialize,
+    for<'a> T: Serialize + Deserialize<'a>,
 {
     type Error = serde_json::error::Error;
 

mithril-aggregator/src/dependency.rs

@@ -17,8 +17,8 @@ use std::{collections::HashMap, sync::Arc};
 use tokio::sync::{Mutex, RwLock};
 
 use crate::event_store::EventMessage;
+use crate::signed_entity_service::SignedEntityService;
 use crate::{
-    artifact_builder::SignedEntityService,
     certifier_service::CertifierService,
     configuration::*,
     database::provider::{SignedEntityStorer, StakePoolStore},

mithril-aggregator/src/dependency_injection/builder.rs

@@ -37,8 +37,7 @@ use warp::Filter;
 
 use crate::{
     artifact_builder::{
-        CardanoImmutableFilesFullArtifactBuilder, MithrilSignedEntityService,
-        MithrilStakeDistributionArtifactBuilder, SignedEntityService,
+        CardanoImmutableFilesFullArtifactBuilder, MithrilStakeDistributionArtifactBuilder,
     },
     certifier_service::{CertifierService, MithrilCertifierService},
     configuration::ExecutionEnvironment,
@@ -49,6 +48,7 @@ use crate::{
     },
     event_store::{EventMessage, EventStore, TransmitterService},
     http_server::routes::router,
+    signed_entity_service::{MithrilSignedEntityService, SignedEntityService},
     signer_registerer::SignerRecorder,
     stake_distribution_service::{MithrilStakeDistributionService, StakeDistributionService},
     ticker_service::{MithrilTickerService, TickerService},
@@ -894,13 +894,13 @@ impl DependenciesBuilder {
         let cardano_immutable_files_full_artifact_builder = Arc::new(
             CardanoImmutableFilesFullArtifactBuilder::new(snapshotter, snapshot_uploader),
         );
-        let artifact_builder_service = Arc::new(MithrilSignedEntityService::new(
+        let signed_entity_service = Arc::new(MithrilSignedEntityService::new(
             signed_entity_storer,
             mithril_stake_distribution_artifact_builder,
             cardano_immutable_files_full_artifact_builder,
         ));
 
-        Ok(artifact_builder_service)
+        Ok(signed_entity_service)
     }
 
     /// [ArtifactBuilderService] service

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

@@ -36,7 +36,7 @@ pub mod handlers {
     use crate::message_adapters::{
         ToMithrilStakeDistributionListMessageAdapter, ToMithrilStakeDistributionMessageAdapter,
     };
-    use crate::SignedEntityService;
+    use crate::signed_entity_service::SignedEntityService;
     use mithril_common::messages::MessageAdapter;
     use slog_scope::{debug, warn};
     use std::convert::Infallible;
@@ -96,6 +96,7 @@ pub mod handlers {
 #[cfg(test)]
 pub mod tests {
     use crate::http_server::SERVER_BASE_PATH;
+    use mithril_common::entities::SignedEntityType;
     use mithril_common::sqlite::HydrationError;
     use mithril_common::test_utils::apispec::APISpec;
     use mithril_common::test_utils::fake_data;

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

@@ -93,7 +93,7 @@ mod handlers {
     use crate::http_server::SERVER_BASE_PATH;
     use crate::message_adapters::ToSnapshotListMessageAdapter;
     use crate::message_adapters::ToSnapshotMessageAdapter;
-    use crate::{Configuration, SignedEntityService};
+    use crate::{signed_entity_service::SignedEntityService, Configuration};
     use mithril_common::messages::MessageAdapter;
     use slog_scope::{debug, warn};
     use std::convert::Infallible;

mithril-aggregator/src/lib.rs

@@ -24,6 +24,7 @@ mod http_server;
 mod message_adapters;
 mod multi_signer;
 mod runtime;
+pub mod signed_entity_service;
 mod signer_registerer;
 mod snapshot_uploaders;
 mod snapshotter;
@@ -32,7 +33,7 @@ mod store;
 pub mod ticker_service;
 mod tools;
 
-pub use crate::artifact_builder::{ArtifactBuilder, SignedEntityService};
+pub use crate::artifact_builder::ArtifactBuilder;
 pub use crate::configuration::{
     Configuration, DefaultConfiguration, ExecutionEnvironment, SnapshotUploaderType,
 };

mithril-aggregator/src/artifact_builder/artifact_builder_service.rs renamed to mithril-aggregator/src/signed_entity_service.rs

@@ -6,8 +6,6 @@ use crate::{
     signable_builder::Artifact,
 };
 
-use super::SignedEntityTypeDiscriminants;
-
 /// Mithril Stake Distribution
 #[derive(Debug, PartialEq, Serialize, Deserialize, Clone)]
 pub struct MithrilStakeDistribution {
@@ -59,11 +57,4 @@ impl Artifact for MithrilStakeDistribution {
     fn get_id(&self) -> String {
         self.hash.clone()
     }
-
-    fn get_entity_type_id() -> SignedEntityTypeDiscriminants
-    where
-        Self: Sized,
-    {
-        SignedEntityTypeDiscriminants::MithrilStakeDistribution
-    }
 }

mithril-common/src/entities/mithril_stake_distribution.rs

@@ -1,8 +1,6 @@
 use crate::{entities::Beacon, signable_builder::Artifact};
 use serde::{Deserialize, Serialize};
 
-use super::SignedEntityTypeDiscriminants;
-
 /// Snapshot represents a snapshot file and its metadata
 #[derive(Clone, Debug, PartialEq, Eq, Default, Serialize, Deserialize)]
 pub struct Snapshot {
@@ -51,11 +49,4 @@ impl Artifact for Snapshot {
     fn get_id(&self) -> String {
         self.digest.clone()
     }
-
-    fn get_entity_type_id() -> SignedEntityTypeDiscriminants
-    where
-        Self: Sized,
-    {
-        SignedEntityTypeDiscriminants::CardanoImmutableFilesFull
-    }
 }