Move Mithril Stake Distribution signable builder to common

Author: jpraynaud

mithril-aggregator/src/dependency_injection/builder.rs

@@ -16,7 +16,9 @@ use mithril_common::{
         adapters::{EraReaderAdapterBuilder, EraReaderDummyAdapter},
         EraChecker, EraMarker, EraReader, EraReaderAdapter, SupportedEra,
     },
-    signable_builder::CardanoImmutableFilesFullSignableBuilder,
+    signable_builder::{
+        CardanoImmutableFilesFullSignableBuilder, MithrilStakeDistributionSignableBuilder,
+    },
     store::adapter::{MemoryAdapter, SQLiteAdapter, StoreAdapter},
     BeaconProvider, BeaconProviderImpl,
 };
@@ -46,7 +48,7 @@ use crate::{
     },
     event_store::{EventMessage, EventStore, TransmitterService},
     http_server::routes::router,
-    signable_builder::{MithrilStakeDistributionSignableBuilder, SignableBuilderService},
+    signable_builder::SignableBuilderService,
     signer_registerer::SignerRecorder,
     stake_distribution_service::{MithrilStakeDistributionService, StakeDistributionService},
     ticker_service::{MithrilTickerService, TickerService},

mithril-aggregator/src/lib.rs

@@ -39,9 +39,7 @@ pub use crate::configuration::{
     Configuration, DefaultConfiguration, ExecutionEnvironment, SnapshotUploaderType,
 };
 pub use crate::multi_signer::{MultiSigner, MultiSignerImpl, ProtocolError};
-pub use crate::signable_builder::{
-    MithrilStakeDistributionSignableBuilder, SignableBuilderService,
-};
+pub use crate::signable_builder::SignableBuilderService;
 pub use crate::snapshot_stores::{LocalSnapshotStore, SnapshotStore};
 pub use command_args::MainOpts;
 pub use dependency::DependencyManager;

mithril-aggregator/src/signable_builder/mod.rs

@@ -1,7 +1,5 @@
 //! The module used for building signables
 
-mod mithril_stake_distribution;
 mod signable_builder_service;
 
-pub use mithril_stake_distribution::*;
 pub use signable_builder_service::*;

mithril-aggregator/src/signable_builder/signable_builder_service.rs

@@ -2,12 +2,13 @@ use std::sync::Arc;
 
 use mithril_common::{
     entities::SignedEntityType,
-    signable_builder::{CardanoImmutableFilesFullSignableBuilder, Signable, SignableBuilder},
+    signable_builder::{
+        CardanoImmutableFilesFullSignableBuilder, MithrilStakeDistributionSignableBuilder,
+        Signable, SignableBuilder,
+    },
     StdResult,
 };
 
-use super::MithrilStakeDistributionSignableBuilder;
-
 /// SignableBuilder Service
 pub struct SignableBuilderService {
     mithril_stake_distribution_builder: MithrilStakeDistributionSignableBuilder,

mithril-aggregator/src/signable_builder/mithril_stake_distribution.rs renamed to mithril-common/src/signable_builder/mithril_stake_distribution.rs

@@ -1,6 +1,6 @@
 use async_trait::async_trait;
 
-use mithril_common::{
+use crate::{
     entities::{Epoch, ProtocolMessage},
     signable_builder::SignableBuilder,
     StdResult,

mithril-common/src/signable_builder/mod.rs

@@ -3,7 +3,9 @@
 mod cardano_immutable_full_signable_builder;
 mod dummy_signable;
 mod interface;
+mod mithril_stake_distribution;
 
 pub use cardano_immutable_full_signable_builder::*;
 pub use dummy_signable::*;
 pub use interface::*;
+pub use mithril_stake_distribution::*;