Split SignableBuilderService in signer and aggregator

Author: jpraynaud

mithril-aggregator/src/dependency.rs

@@ -6,7 +6,6 @@ use mithril_common::{
     digesters::{ImmutableDigester, ImmutableFileObserver},
     entities::{Certificate, Epoch, ProtocolParameters, SignerWithStake, StakeDistribution},
     era::{EraChecker, EraReader},
-    signable_builder::SignableBuilderService,
     store::StakeStorer,
     BeaconProvider,
 };
@@ -17,10 +16,10 @@ use tokio::sync::{Mutex, RwLock};
 
 use crate::{
     artifact_builder::ArtifactBuilderService, configuration::*, database::provider::StakePoolStore,
-    signer_registerer::SignerRecorder, CertificatePendingStore, CertificateStore,
-    ProtocolParametersStore, ProtocolParametersStorer, SignerRegisterer,
-    SignerRegistrationRoundOpener, SingleSignatureStore, Snapshotter, VerificationKeyStore,
-    VerificationKeyStorer,
+    signable_builder::SignableBuilderService, signer_registerer::SignerRecorder,
+    CertificatePendingStore, CertificateStore, ProtocolParametersStore, ProtocolParametersStorer,
+    SignerRegisterer, SignerRegistrationRoundOpener, SingleSignatureStore, Snapshotter,
+    VerificationKeyStore, VerificationKeyStorer,
 };
 use crate::{event_store::EventMessage, snapshot_stores::SnapshotStore};
 use crate::{event_store::TransmitterService, multi_signer::MultiSigner};

mithril-aggregator/src/dependency_injection/builder.rs

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

mithril-aggregator/src/lib.rs

@@ -23,6 +23,7 @@ mod http_server;
 mod message_adapters;
 mod multi_signer;
 mod runtime;
+mod signable_builder;
 mod signer_registerer;
 mod snapshot_stores;
 mod snapshot_uploaders;

mithril-aggregator/src/signable_builder/mod.rs

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

mithril-aggregator/src/signable_builder/signable_builder_service.rs

@@ -0,0 +1,44 @@
+use std::sync::Arc;
+
+use mithril_common::{
+    entities::SignedEntityType,
+    signable_builder::{DummyBeacon, DummySignableBuilder, Signable, SignableBuilder},
+    StdResult,
+};
+
+/// SignableBuilder Service
+// TODO: temporary implementation
+pub struct SignableBuilderService {
+    dummy_signable_builder: DummySignableBuilder,
+}
+
+impl SignableBuilderService {
+    /// SignableBuilderService factory
+    pub fn new(dummy_signable_builder: DummySignableBuilder) -> Self {
+        Self {
+            dummy_signable_builder,
+        }
+    }
+}
+
+impl SignableBuilderService {
+    #[allow(dead_code)]
+    async fn compute_signable(
+        &self,
+        signed_entity_type: SignedEntityType,
+    ) -> StdResult<Arc<dyn Signable>> {
+        let signable: Arc<dyn Signable> = match signed_entity_type {
+            SignedEntityType::MithrilStakeDistribution(e) => Arc::new(
+                self.dummy_signable_builder
+                    .compute_signable(DummyBeacon { epoch: e })
+                    .await?,
+            ),
+            _ => todo!(),
+        };
+
+        Ok(signable)
+    }
+}
+
+#[cfg(test)]
+mod tests {}

mithril-common/src/entities/epoch.rs

@@ -5,6 +5,8 @@ use std::{
 };
 use thiserror::Error;
 
+use crate::signable_builder::Beacon as SignableBeacon;
+
 /// Epoch represents a Cardano epoch
 #[derive(
     Debug, Copy, Clone, Default, PartialEq, Serialize, Deserialize, Hash, Eq, PartialOrd, Ord,
@@ -141,6 +143,8 @@ impl Display for Epoch {
     }
 }
 
+impl SignableBeacon for Epoch {}
+
 /// EpochError is an error triggerred by an [Epoch]
 #[derive(Error, Debug)]
 pub enum EpochError {

mithril-common/src/entities/protocol_message.rs

@@ -2,6 +2,8 @@ use serde::{Deserialize, Serialize};
 use sha2::{Digest, Sha256};
 use std::{collections::BTreeMap, fmt::Display};
 
+use crate::{signable_builder::Signable, StdResult};
+
 /// The key of a ProtocolMessage
 #[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
 pub enum ProtocolMessagePartKey {
@@ -73,6 +75,12 @@ impl ProtocolMessage {
     }
 }
 
+impl Signable for ProtocolMessage {
+    fn compute_protocol_message(&self) -> StdResult<ProtocolMessage> {
+        Ok(self.clone())
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;

mithril-common/src/signable_builder/mod.rs

@@ -2,8 +2,6 @@
 
 mod dummy_signable;
 mod interface;
-mod signable_builder_service;
 
 pub use dummy_signable::*;
 pub use interface::*;
-pub use signable_builder_service::*;

mithril-common/src/signable_builder/signable_builder_service.rs

@@ -11,6 +11,7 @@ mod configuration;
 mod message_adapters;
 mod protocol_initializer_store;
 mod runtime;
+mod signable_builder;
 mod single_signer;
 
 #[cfg(test)]
@@ -22,4 +23,5 @@ pub use message_adapters::{
 };
 pub use protocol_initializer_store::{ProtocolInitializerStore, ProtocolInitializerStorer};
 pub use runtime::*;
+pub use signable_builder::SignableBuilderService;
 pub use single_signer::*;