Use the trait instead of the struct for vkey store dependency

Author: Alenar

mithril-aggregator/src/dependency.rs

@@ -25,8 +25,7 @@ use crate::{
     signer_registerer::SignerRecorder,
     ticker_service::TickerService,
     CertificatePendingStore, CertificateStore, ProtocolParametersStore, ProtocolParametersStorer,
-    SignerRegisterer, SignerRegistrationRoundOpener, Snapshotter, VerificationKeyStore,
-    VerificationKeyStorer,
+    SignerRegisterer, SignerRegistrationRoundOpener, Snapshotter, VerificationKeyStorer,
 };
 use crate::{event_store::TransmitterService, multi_signer::MultiSigner};
 use crate::{
@@ -63,7 +62,7 @@ pub struct DependencyManager {
     pub certificate_store: Arc<CertificateStore>,
 
     /// Verification key store.
-    pub verification_key_store: Arc<VerificationKeyStore>,
+    pub verification_key_store: Arc<dyn VerificationKeyStorer>,
 
     /// Protocol parameter store.
     pub protocol_parameters_store: Arc<ProtocolParametersStore>,
@@ -249,7 +248,7 @@ impl DependencyManager {
     /// Fill the stores of a [DependencyManager] in a way to simulate an aggregator genesis state.
     ///
     /// For the current and the next epoch:
-    /// * Fill the [VerificationKeyStore] with the given signers keys.
+    /// * Fill the [VerificationKeyStorer] with the given signers keys.
     /// * Fill the [StakeStore] with the given signers stakes.
     /// * Fill the [ProtocolParametersStore] with the given parameters.
     pub async fn prepare_for_genesis(

mithril-aggregator/src/dependency_injection/builder.rs

@@ -57,7 +57,7 @@ use crate::{
     CertificateStore, Configuration, DependencyManager, DumbSnapshotUploader, DumbSnapshotter,
     GzipSnapshotter, LocalSnapshotUploader, MithrilSignerRegisterer, MultiSigner, MultiSignerImpl,
     ProtocolParametersStore, ProtocolParametersStorer, RemoteSnapshotUploader, SnapshotUploader,
-    SnapshotUploaderType, Snapshotter, VerificationKeyStore,
+    SnapshotUploaderType, Snapshotter, VerificationKeyStore, VerificationKeyStorer,
 };
 
 use super::{DependenciesBuilderError, Result};
@@ -99,7 +99,7 @@ pub struct DependenciesBuilder {
     pub certificate_store: Option<Arc<CertificateStore>>,
 
     /// Verification key store.
-    pub verification_key_store: Option<Arc<VerificationKeyStore>>,
+    pub verification_key_store: Option<Arc<dyn VerificationKeyStorer>>,
 
     /// Protocol parameter store.
     pub protocol_parameters_store: Option<Arc<ProtocolParametersStore>>,
@@ -398,7 +398,7 @@ impl DependenciesBuilder {
         Ok(self.certificate_store.as_ref().cloned().unwrap())
     }
 
-    async fn build_verification_key_store(&mut self) -> Result<Arc<VerificationKeyStore>> {
+    async fn build_verification_key_store(&mut self) -> Result<Arc<dyn VerificationKeyStorer>> {
         Ok(Arc::new(VerificationKeyStore::new(
             Box::new(SignerRegistrationStoreAdapter::new(
                 self.get_sqlite_connection().await?,
@@ -407,8 +407,8 @@ impl DependenciesBuilder {
         )))
     }
 
-    /// Get a configured [VerificationKeyStore].
-    pub async fn get_verification_key_store(&mut self) -> Result<Arc<VerificationKeyStore>> {
+    /// Get a configured [VerificationKeyStorer].
+    pub async fn get_verification_key_store(&mut self) -> Result<Arc<dyn VerificationKeyStorer>> {
         if self.verification_key_store.is_none() {
             self.verification_key_store = Some(self.build_verification_key_store().await?);
         }

mithril-aggregator/src/multi_signer.rs

@@ -15,7 +15,7 @@ use mithril_common::{
 
 use crate::{
     entities::OpenMessage, store::VerificationKeyStorer, ProtocolParametersStore,
-    ProtocolParametersStorer, VerificationKeyStore,
+    ProtocolParametersStorer,
 };
 
 #[cfg(test)]
@@ -194,7 +194,7 @@ pub struct MultiSignerImpl {
     current_beacon: Option<entities::Beacon>,
 
     /// Verification key store
-    verification_key_store: Arc<VerificationKeyStore>,
+    verification_key_store: Arc<dyn VerificationKeyStorer>,
 
     /// Stake store
     stake_store: Arc<dyn StakeStorer>,
@@ -206,7 +206,7 @@ pub struct MultiSignerImpl {
 impl MultiSignerImpl {
     /// MultiSignerImpl factory
     pub fn new(
-        verification_key_store: Arc<VerificationKeyStore>,
+        verification_key_store: Arc<dyn VerificationKeyStorer>,
         stake_store: Arc<dyn StakeStorer>,
         protocol_parameters_store: Arc<ProtocolParametersStore>,
     ) -> Self {
@@ -587,7 +587,7 @@ mod tests {
     use crate::{store::VerificationKeyStore, ProtocolParametersStore};
     use mithril_common::{
         crypto_helper::tests_setup::*,
-        entities::SignedEntityType,
+        entities::{PartyId, SignedEntityType},
         store::{adapter::MemoryAdapter, StakeStore},
         test_utils::{fake_data, MithrilFixtureBuilder},
     };
@@ -596,12 +596,7 @@ mod tests {
     async fn setup_multi_signer() -> MultiSignerImpl {
         let beacon = fake_data::beacon();
         let verification_key_store = VerificationKeyStore::new(
-            Box::new(
-                MemoryAdapter::<Epoch, HashMap<entities::PartyId, entities::SignerWithStake>>::new(
-                    None,
-                )
-                .unwrap(),
-            ),
+            Box::new(MemoryAdapter::<Epoch, HashMap<PartyId, SignerWithStake>>::new(None).unwrap()),
             None,
         );
         let stake_store = StakeStore::new(

mithril-aggregator/src/signer_registerer.rs

@@ -3,7 +3,6 @@ use std::sync::Arc;
 use thiserror::Error;
 use tokio::sync::RwLock;
 
-use crate::{VerificationKeyStore, VerificationKeyStorer};
 use mithril_common::{
     chain_observer::ChainObserver,
     crypto_helper::{
@@ -14,6 +13,8 @@ use mithril_common::{
     StdError,
 };
 
+use crate::VerificationKeyStorer;
+
 #[cfg(test)]
 use mockall::automock;
 
@@ -131,7 +132,7 @@ pub struct MithrilSignerRegisterer {
     chain_observer: Arc<dyn ChainObserver>,
 
     /// Verification key store
-    verification_key_store: Arc<VerificationKeyStore>,
+    verification_key_store: Arc<dyn VerificationKeyStorer>,
 
     /// Signer recorder
     signer_recorder: Arc<dyn SignerRecorder>,
@@ -141,7 +142,7 @@ impl MithrilSignerRegisterer {
     /// MithrilSignerRegisterer factory
     pub fn new(
         chain_observer: Arc<dyn ChainObserver>,
-        verification_key_store: Arc<VerificationKeyStore>,
+        verification_key_store: Arc<dyn VerificationKeyStorer>,
         signer_recorder: Arc<dyn SignerRecorder>,
     ) -> Self {
         Self {

mithril-aggregator/src/store/verification_key_store.rs

@@ -10,7 +10,7 @@ type Adapter = Box<dyn StoreAdapter<Key = Epoch, Record = HashMap<PartyId, Signe
 
 /// Mocking trait for `VerificationKeyStore`.
 #[async_trait]
-pub trait VerificationKeyStorer {
+pub trait VerificationKeyStorer: Sync + Send {
     /// Save the verification key, for the given [Signer] for the given [Epoch].
     async fn save_verification_key(
         &self,
@@ -24,6 +24,7 @@ pub trait VerificationKeyStorer {
         epoch: Epoch,
     ) -> Result<Option<HashMap<PartyId, Signer>>, StoreError>;
 }
+
 /// Store for the `VerificationKey`.
 pub struct VerificationKeyStore {
     adapter: RwLock<Adapter>,