Remove 'mithril_common' re export from 'store'

Author: jpraynaud

mithril-aggregator/src/dependency.rs

@@ -1,11 +1,13 @@
-use crate::beacon_store::BeaconStore;
-use crate::{CertificatePendingStore, CertificateStore, StakeStore, VerificationKeyStore};
 use std::sync::Arc;
 use tokio::sync::RwLock;
 
+use mithril_common::store::stake_store::StakeStore;
+
 use super::entities::*;
 use super::multi_signer::MultiSigner;
 use super::snapshot_stores::SnapshotStore;
+use crate::beacon_store::BeaconStore;
+use crate::{CertificatePendingStore, CertificateStore, VerificationKeyStore};
 
 /// BeaconStoreWrapper wraps a BeaconStore
 pub type BeaconStoreWrapper = Arc<RwLock<dyn BeaconStore>>;

mithril-aggregator/src/http_server.rs

@@ -520,6 +520,8 @@ mod tests {
 
     use mithril_common::apispec::APISpec;
     use mithril_common::fake_data;
+    use mithril_common::store::adapter::DumbStoreAdapter;
+    use mithril_common::store::adapter::FailStoreAdapter;
     use serde_json::Value::Null;
     use tokio::sync::RwLock;
     use warp::test::request;
@@ -529,8 +531,6 @@ mod tests {
     use super::super::multi_signer::MockMultiSigner;
     use super::super::multi_signer::ProtocolError;
     use super::super::snapshot_stores::MockSnapshotStore;
-    use super::super::store::adapter::DumbStoreAdapter;
-    use super::super::store::adapter::FailStoreAdapter;
     use super::super::store::CertificateStore;
     use super::*;
 

mithril-aggregator/src/lib.rs

@@ -20,7 +20,6 @@ pub use runtime::AggregatorRuntime;
 pub use snapshot_uploaders::{LocalSnapshotUploader, RemoteSnapshotUploader};
 pub use snapshotter::{SnapshotError, Snapshotter};
 pub use store::{
-    AdapterError, CertificatePendingStore, CertificateStore, JsonFileStoreAdapter, MemoryAdapter,
-    StakeStore, StakeStoreError, StakeStorer, StoreAdapter, VerificationKeyStore,
-    VerificationKeyStoreError, VerificationKeyStorer,
+    CertificatePendingStore, CertificateStore, VerificationKeyStore, VerificationKeyStoreError,
+    VerificationKeyStorer,
 };

mithril-aggregator/src/main.rs

@@ -5,11 +5,13 @@ use clap::Parser;
 use config::{Map, Source, Value, ValueKind};
 use mithril_aggregator::{
     AggregatorRuntime, BeaconStore, CertificatePendingStore, CertificateStore, Config,
-    DependencyManager, JsonFileStoreAdapter, MemoryBeaconStore, MultiSigner, MultiSignerImpl,
-    Server, StakeStore, VerificationKeyStore,
+    DependencyManager, MemoryBeaconStore, MultiSigner, MultiSignerImpl, Server,
+    VerificationKeyStore,
 };
 use mithril_common::crypto_helper::ProtocolStakeDistribution;
 use mithril_common::fake_data;
+use mithril_common::store::adapter::JsonFileStoreAdapter;
+use mithril_common::store::stake_store::StakeStore;
 use slog::{Drain, Level, Logger};
 use slog_scope::debug;
 use std::env;

mithril-aggregator/src/multi_signer.rs

@@ -12,12 +12,11 @@ use mithril_common::crypto_helper::{
     ProtocolStakeDistribution,
 };
 use mithril_common::entities;
+use mithril_common::store::stake_store::{StakeStoreError, StakeStorer};
 
 use super::beacon_store::BeaconStoreError;
 use super::dependency::{BeaconStoreWrapper, StakeStoreWrapper, VerificationKeyStoreWrapper};
-use super::store::{
-    StakeStoreError, StakeStorer, VerificationKeyStoreError, VerificationKeyStorer,
-};
+use super::store::{VerificationKeyStoreError, VerificationKeyStorer};
 
 #[cfg(test)]
 use mockall::automock;
@@ -554,12 +553,14 @@ impl MultiSigner for MultiSignerImpl {
 #[cfg(test)]
 mod tests {
     use super::super::beacon_store::{BeaconStore, MemoryBeaconStore};
-    use super::super::store::adapter::MemoryAdapter;
-    use super::super::store::{StakeStore, VerificationKeyStore};
+
+    use super::super::store::VerificationKeyStore;
     use super::*;
 
     use mithril_common::crypto_helper::tests_setup::*;
     use mithril_common::fake_data;
+    use mithril_common::store::adapter::MemoryAdapter;
+    use mithril_common::store::stake_store::StakeStore;
     use std::sync::Arc;
     use tokio::sync::RwLock;
 

mithril-aggregator/src/store/certificate_store.rs

@@ -1,8 +1,7 @@
-#![allow(dead_code)]
-/// ↑ only until we plug this into main code
-use mithril_common::entities::Certificate;
+use super::StoreError;
 
-use super::{StoreAdapter, StoreError};
+use mithril_common::entities::Certificate;
+use mithril_common::store::adapter::StoreAdapter;
 
 type Adapter = Box<dyn StoreAdapter<Key = String, Record = Certificate>>;
 
@@ -37,8 +36,9 @@ impl CertificateStore {
 #[cfg(test)]
 mod test {
     use super::*;
-    use crate::store::adapter::DumbStoreAdapter;
+
     use mithril_common::fake_data::{self};
+    use mithril_common::store::adapter::DumbStoreAdapter;
 
     async fn get_certificate_store(size: u64) -> CertificateStore {
         let mut adapter: DumbStoreAdapter<String, Certificate> = DumbStoreAdapter::new();

mithril-aggregator/src/store/error.rs

@@ -1,4 +1,4 @@
-use super::AdapterError;
+use mithril_common::store::adapter::AdapterError;
 use thiserror::Error;
 
 #[derive(Debug, Error)]

mithril-aggregator/src/store/mod.rs

@@ -5,12 +5,6 @@ mod verification_key_store;
 
 pub use certificate_store::CertificateStore;
 pub use error::StoreError;
-pub use mithril_common::store::adapter;
-pub use mithril_common::store::adapter::{
-    AdapterError, DumbStoreAdapter, FailStoreAdapter, JsonFileStoreAdapter, MemoryAdapter,
-    StoreAdapter,
-};
-pub use mithril_common::store::stake_store::{StakeStore, StakeStoreError, StakeStorer};
 pub use pending_certificate_store::CertificatePendingStore;
 pub use verification_key_store::{
     VerificationKeyStore, VerificationKeyStoreError, VerificationKeyStorer,

mithril-aggregator/src/store/pending_certificate_store.rs

@@ -1,8 +1,7 @@
-#![allow(dead_code)]
-/// ↑ only until we plug this into main code
-use mithril_common::entities::{Beacon, CertificatePending};
+use super::StoreError;
 
-use super::{StoreAdapter, StoreError};
+use mithril_common::entities::{Beacon, CertificatePending};
+use mithril_common::store::adapter::StoreAdapter;
 
 type Adapter = Box<dyn StoreAdapter<Key = Beacon, Record = CertificatePending>>;
 
@@ -50,8 +49,9 @@ impl CertificatePendingStore {
 #[cfg(test)]
 mod test {
     use super::*;
-    use crate::store::adapter::DumbStoreAdapter;
+
     use mithril_common::fake_data;
+    use mithril_common::store::adapter::DumbStoreAdapter;
 
     async fn get_certificate_pending_store(size: u64) -> CertificatePendingStore {
         let mut adapter: DumbStoreAdapter<Beacon, CertificatePending> = DumbStoreAdapter::new();

mithril-aggregator/src/store/verification_key_store.rs

@@ -2,8 +2,8 @@ use async_trait::async_trait;
 use std::collections::HashMap;
 use thiserror::Error;
 
-use super::adapter::{AdapterError, StoreAdapter};
 use mithril_common::entities::Signer;
+use mithril_common::store::adapter::{AdapterError, StoreAdapter};
 
 type Adapter = Box<dyn StoreAdapter<Key = u64, Record = HashMap<u64, Signer>>>;
 
@@ -63,9 +63,10 @@ impl VerificationKeyStorer for VerificationKeyStore {
 
 #[cfg(test)]
 mod tests {
-    use super::super::MemoryAdapter;
     use super::*;
 
+    use mithril_common::store::adapter::MemoryAdapter;
+
     fn init_store(nb_epoch: u64, signers_per_epoch: u64) -> VerificationKeyStore {
         let mut values: Vec<(u64, HashMap<u64, Signer>)> = Vec::new();