Wire SignerRecorder dependency

Author: jpraynaud

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

@@ -11,6 +11,8 @@ use mithril_common::sqlite::{
 use mithril_common::StdError;
 use tokio::sync::Mutex;
 
+use crate::signer_registerer::SignerRecorder;
+
 /// Signer record is the representation of a stored signer.
 #[derive(Debug, PartialEq, Clone)]
 pub struct SignerRecord {
@@ -218,20 +220,6 @@ impl<'conn> Provider<'conn> for UpdateSignerRecordProvider<'conn> {
     }
 }
 
-/// Signer recorder trait
-#[async_trait]
-pub trait SignerRecorder {
-    /// Record signer_id
-    async fn record_signer_id(&self, signer_id: String) -> Result<(), StdError>;
-
-    /// Record pool ticker by id
-    async fn record_signer_pool_ticker(
-        &self,
-        signer_id: String,
-        pool_ticker: Option<String>,
-    ) -> Result<(), StdError>;
-}
-
 /// Service to deal with signer (read & write).
 pub struct SignerStore {
     connection: Arc<Mutex<Connection>>,

mithril-aggregator/src/dependency.rs

@@ -15,10 +15,10 @@ use std::{collections::HashMap, sync::Arc};
 use tokio::sync::{Mutex, RwLock};
 
 use crate::{
-    configuration::*, database::provider::StakePoolStore, CertificatePendingStore,
-    CertificateStore, ProtocolParametersStore, ProtocolParametersStorer, SignerRegisterer,
-    SignerRegistrationRoundOpener, SingleSignatureStore, Snapshotter, VerificationKeyStore,
-    VerificationKeyStorer,
+    configuration::*, database::provider::StakePoolStore, 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};
@@ -108,6 +108,9 @@ pub struct DependencyManager {
 
     /// Stake Distribution Service
     pub stake_distribution_service: Arc<dyn StakeDistributionService>,
+
+    /// Signer Recorder
+    pub signer_recorder: Arc<dyn SignerRecorder>,
 }
 
 #[doc(hidden)]

mithril-aggregator/src/dependency_injection/builder.rs

@@ -38,10 +38,11 @@ use crate::{
     configuration::{ExecutionEnvironment, LIST_SNAPSHOTS_MAX_ITEMS},
     database::provider::{
         CertificateStoreAdapter, EpochSettingStore, SignedEntityStoreAdapter,
-        SignerRegistrationStoreAdapter, StakePoolStore,
+        SignerRegistrationStoreAdapter, SignerStore, StakePoolStore,
     },
     event_store::{EventMessage, EventStore, TransmitterService},
     http_server::routes::router,
+    signer_registerer::SignerRecorder,
     stake_distribution_service::{MithrilStakeDistributionService, StakeDistributionService},
     ticker_service::{MithrilTickerService, TickerService},
     tools::{GcpFileUploader, GenesisToolsDependency},
@@ -152,6 +153,9 @@ pub struct DependenciesBuilder {
 
     /// Ticker Service (TODO: remove BeaconProvider)
     pub ticker_service: Option<Arc<dyn TickerService>>,
+
+    /// Signer Recorder
+    pub signer_recorder: Option<Arc<dyn SignerRecorder>>,
 }
 
 impl DependenciesBuilder {
@@ -188,6 +192,7 @@ impl DependenciesBuilder {
             api_version_provider: None,
             stake_distribution_service: None,
             ticker_service: None,
+            signer_recorder: None,
         }
     }
 
@@ -763,6 +768,7 @@ impl DependenciesBuilder {
         let registerer = MithrilSignerRegisterer::new(
             self.get_chain_observer().await?,
             self.get_verification_key_store().await?,
+            self.get_signer_recorder().await?,
         );
 
         Ok(Arc::new(registerer))
@@ -946,6 +952,21 @@ impl DependenciesBuilder {
         Ok(self.stake_distribution_service.as_ref().cloned().unwrap())
     }
 
+    async fn build_signer_recorder(&mut self) -> Result<Arc<dyn SignerRecorder>> {
+        let signer_recorder = Arc::new(SignerStore::new(self.get_sqlite_connection().await?));
+
+        Ok(signer_recorder)
+    }
+
+    /// [SignerRecorder]
+    pub async fn get_signer_recorder(&mut self) -> Result<Arc<dyn SignerRecorder>> {
+        if self.signer_recorder.is_none() {
+            self.signer_recorder = Some(self.build_signer_recorder().await?);
+        }
+
+        Ok(self.signer_recorder.as_ref().cloned().unwrap())
+    }
+
     /// Return an unconfigured [DependencyManager]
     pub async fn build_dependency_container(&mut self) -> Result<DependencyManager> {
         let dependency_manager = DependencyManager {
@@ -974,6 +995,7 @@ impl DependenciesBuilder {
             event_transmitter: self.get_event_transmitter().await?,
             api_version_provider: self.get_api_version_provider().await?,
             stake_distribution_service: self.get_stake_distribution_service().await?,
+            signer_recorder: self.get_signer_recorder().await?,
         };
 
         Ok(dependency_manager)

mithril-aggregator/src/runtime/runner.rs

@@ -859,6 +859,7 @@ pub mod tests {
         let signer_registration_round_opener = Arc::new(MithrilSignerRegisterer::new(
             deps.chain_observer.clone(),
             deps.verification_key_store.clone(),
+            deps.signer_recorder.clone(),
         ));
         deps.signer_registration_round_opener = signer_registration_round_opener.clone();
         let stake_store = deps.stake_store.clone();
@@ -897,6 +898,7 @@ pub mod tests {
         let signer_registration_round_opener = Arc::new(MithrilSignerRegisterer::new(
             deps.chain_observer.clone(),
             deps.verification_key_store.clone(),
+            deps.signer_recorder.clone(),
         ));
         deps.signer_registration_round_opener = signer_registration_round_opener.clone();
         let deps = Arc::new(deps);