Move apispec & fake data to test_utils module

Alenar · Alenar · commit 4c82709380ad · 2022-12-22T15:42:53.000+01:00
diff --git a/mithril-aggregator/src/dependency.rs b/mithril-aggregator/src/dependency.rs
@@ -255,13 +255,13 @@ pub mod tests {
         MithrilSignerRegisterer, MultiSignerImpl, ProtocolParametersStore, SingleSignatureStore,
         SnapshotStoreType, SnapshotUploaderType, VerificationKeyStore,
     };
-    use mithril_common::certificate_chain::MithrilCertificateVerifier;
-    use mithril_common::crypto_helper::{key_encode_hex, ProtocolGenesisSigner};
-    use mithril_common::digesters::{DumbImmutableDigester, DumbImmutableFileObserver};
     use mithril_common::{
+        certificate_chain::MithrilCertificateVerifier,
         chain_observer::FakeObserver,
-        fake_data,
+        crypto_helper::{key_encode_hex, ProtocolGenesisSigner},
+        digesters::{DumbImmutableDigester, DumbImmutableFileObserver},
         store::{adapter::MemoryAdapter, StakeStore},
+        test_utils::fake_data,
         BeaconProviderImpl, CardanoNetwork,
     };
     use std::{path::PathBuf, sync::Arc};
diff --git a/mithril-aggregator/src/http_server/routes/certificate_routes.rs b/mithril-aggregator/src/http_server/routes/certificate_routes.rs
@@ -82,9 +82,9 @@ mod tests {
     const API_SPEC_FILE: &str = "../openapi.yaml";
 
     use crate::http_server::SERVER_BASE_PATH;
-    use mithril_common::apispec::APISpec;
     use mithril_common::store::adapter::FailStoreAdapter;
-    use mithril_common::{entities, fake_data};
+    use mithril_common::test_utils::apispec::APISpec;
+    use mithril_common::{entities, test_utils::fake_data};
     use serde_json::Value::Null;
     use warp::http::Method;
     use warp::test::request;
diff --git a/mithril-aggregator/src/http_server/routes/epoch_routes.rs b/mithril-aggregator/src/http_server/routes/epoch_routes.rs
@@ -84,7 +84,7 @@ mod tests {
     const API_SPEC_FILE: &str = "../openapi.yaml";
 
     use crate::http_server::SERVER_BASE_PATH;
-    use mithril_common::apispec::APISpec;
+    use mithril_common::test_utils::apispec::APISpec;
     use serde_json::Value::Null;
     use warp::http::Method;
     use warp::test::request;
diff --git a/mithril-aggregator/src/http_server/routes/signatures_routes.rs b/mithril-aggregator/src/http_server/routes/signatures_routes.rs
@@ -56,8 +56,8 @@ mod tests {
     const API_SPEC_FILE: &str = "../openapi.yaml";
 
     use crate::http_server::SERVER_BASE_PATH;
-    use mithril_common::apispec::APISpec;
-    use mithril_common::fake_data;
+    use mithril_common::test_utils::apispec::APISpec;
+    use mithril_common::test_utils::fake_data;
     use tokio::sync::RwLock;
     use warp::http::Method;
     use warp::test::request;
diff --git a/mithril-aggregator/src/http_server/routes/signer_routes.rs b/mithril-aggregator/src/http_server/routes/signer_routes.rs
@@ -67,9 +67,9 @@ mod handlers {
 mod tests {
     const API_SPEC_FILE: &str = "../openapi.yaml";
 
-    use mithril_common::apispec::APISpec;
     use mithril_common::crypto_helper::ProtocolRegistrationError;
-    use mithril_common::fake_data;
+    use mithril_common::test_utils::apispec::APISpec;
+    use mithril_common::test_utils::fake_data;
     use warp::http::Method;
     use warp::test::request;
 
diff --git a/mithril-aggregator/src/http_server/routes/snapshot_routes.rs b/mithril-aggregator/src/http_server/routes/snapshot_routes.rs
@@ -169,8 +169,8 @@ mod tests {
     const API_SPEC_FILE: &str = "../openapi.yaml";
 
     use crate::http_server::SERVER_BASE_PATH;
-    use mithril_common::apispec::APISpec;
-    use mithril_common::fake_data;
+    use mithril_common::test_utils::apispec::APISpec;
+    use mithril_common::test_utils::fake_data;
     use serde_json::Value::Null;
 
     use crate::initialize_dependencies;
diff --git a/mithril-aggregator/src/multi_signer.rs b/mithril-aggregator/src/multi_signer.rs
@@ -727,9 +727,8 @@ mod tests {
     };
     use mithril_common::{
         crypto_helper::tests_setup::*,
-        fake_data,
         store::{adapter::MemoryAdapter, StakeStore},
-        test_utils::MithrilFixtureBuilder,
+        test_utils::{fake_data, MithrilFixtureBuilder},
     };
     use std::{collections::HashMap, sync::Arc};
 
diff --git a/mithril-aggregator/src/runtime/runner.rs b/mithril-aggregator/src/runtime/runner.rs
@@ -622,7 +622,9 @@ pub mod tests {
         Beacon, CertificatePending, Epoch, HexEncodedKey, ProtocolMessage, StakeDistribution,
     };
     use mithril_common::test_utils::MithrilFixtureBuilder;
-    use mithril_common::{entities::ProtocolMessagePartKey, fake_data, store::StakeStorer};
+    use mithril_common::{
+        entities::ProtocolMessagePartKey, store::StakeStorer, test_utils::fake_data,
+    };
     use mithril_common::{BeaconProviderImpl, CardanoNetwork};
     use std::collections::HashMap;
     use std::path::Path;
diff --git a/mithril-aggregator/src/runtime/state_machine.rs b/mithril-aggregator/src/runtime/state_machine.rs
@@ -322,7 +322,7 @@ mod tests {
 
     use super::super::runner::MockAggregatorRunner;
     use super::*;
-    use mithril_common::fake_data;
+    use mithril_common::test_utils::fake_data;
     use mockall::predicate;
 
     async fn init_runtime(
diff --git a/mithril-aggregator/src/runtime/working_certificate.rs b/mithril-aggregator/src/runtime/working_certificate.rs
@@ -52,7 +52,7 @@ impl WorkingCertificate {
 
     #[cfg(test)]
     pub fn fake() -> Self {
-        use mithril_common::fake_data;
+        use mithril_common::test_utils::fake_data;
 
         Self {
             beacon: fake_data::beacon(),
diff --git a/mithril-aggregator/src/snapshot_stores/local_snapshot_store.rs b/mithril-aggregator/src/snapshot_stores/local_snapshot_store.rs
@@ -76,8 +76,8 @@ mod tests {
     use crate::SnapshotStore;
 
     use mithril_common::entities::Snapshot;
-    use mithril_common::fake_data;
     use mithril_common::store::adapter::DumbStoreAdapter;
+    use mithril_common::test_utils::fake_data;
 
     #[tokio::test]
     async fn can_list_added_snapshot() {
diff --git a/mithril-aggregator/src/snapshot_stores/remote_snapshot_store.rs b/mithril-aggregator/src/snapshot_stores/remote_snapshot_store.rs
@@ -86,7 +86,7 @@ impl SnapshotStore for RemoteSnapshotStore {
 mod tests {
     use super::*;
     use httpmock::prelude::*;
-    use mithril_common::fake_data;
+    use mithril_common::test_utils::fake_data;
     use serde_json::json;
 
     use crate::tools::MockRemoteFileUploader;
diff --git a/mithril-aggregator/src/store/certificate_store.rs b/mithril-aggregator/src/store/certificate_store.rs
@@ -82,8 +82,8 @@ impl CertificateRetriever for CertificateStore {
 mod test {
     use super::*;
 
-    use mithril_common::fake_data::{self};
     use mithril_common::store::adapter::MemoryAdapter;
+    use mithril_common::test_utils::fake_data::{self};
 
     async fn get_certificate_store(size: u64) -> CertificateStore {
         let mut beacon = Beacon::new("devnet".to_string(), 1, 1);
diff --git a/mithril-aggregator/src/store/pending_certificate_store.rs b/mithril-aggregator/src/store/pending_certificate_store.rs
@@ -57,8 +57,8 @@ mod test {
     use super::*;
 
     use mithril_common::entities::Beacon;
-    use mithril_common::fake_data;
     use mithril_common::store::adapter::DumbStoreAdapter;
+    use mithril_common::test_utils::fake_data;
 
     async fn get_certificate_pending_store(is_populated: bool) -> CertificatePendingStore {
         let mut adapter: DumbStoreAdapter<String, CertificatePending> = DumbStoreAdapter::new();
diff --git a/mithril-aggregator/src/store/protocol_parameters_store.rs b/mithril-aggregator/src/store/protocol_parameters_store.rs
@@ -86,7 +86,7 @@ impl ProtocolParametersStorer for ProtocolParametersStore {
 mod tests {
     use super::*;
 
-    use mithril_common::{fake_data, store::adapter::MemoryAdapter};
+    use mithril_common::{store::adapter::MemoryAdapter, test_utils::fake_data};
 
     fn setup_protocol_parameters(nb_epoch: u64) -> Vec<(Epoch, ProtocolParameters)> {
         let mut values: Vec<(Epoch, ProtocolParameters)> = Vec::new();
diff --git a/mithril-aggregator/src/tools/genesis.rs b/mithril-aggregator/src/tools/genesis.rs
@@ -160,9 +160,8 @@ mod tests {
     use mithril_common::{
         certificate_chain::MithrilCertificateVerifier,
         crypto_helper::{ProtocolClerk, ProtocolGenesisSigner},
-        fake_data,
         store::adapter::MemoryAdapter,
-        test_utils::MithrilFixtureBuilder,
+        test_utils::{fake_data, MithrilFixtureBuilder},
     };
 
     use super::*;
diff --git a/mithril-client/src/aggregator.rs b/mithril-client/src/aggregator.rs
@@ -324,7 +324,7 @@ mod tests {
     use httpmock::prelude::*;
     use serde_json::json;
 
-    use mithril_common::fake_data;
+    use mithril_common::test_utils::fake_data;
 
     fn setup_test() -> (MockServer, Config) {
         let server = MockServer::start();
diff --git a/mithril-client/src/runtime.rs b/mithril-client/src/runtime.rs
@@ -194,7 +194,7 @@ mod tests {
     };
     use mithril_common::digesters::{ImmutableDigester, ImmutableDigesterError};
     use mithril_common::entities::{Beacon, Certificate, ProtocolParameters};
-    use mithril_common::fake_data;
+    use mithril_common::test_utils::fake_data;
 
     mock! {
         pub DigesterImpl { }
diff --git a/mithril-common/src/chain_observer/fake_observer.rs b/mithril-common/src/chain_observer/fake_observer.rs
@@ -3,7 +3,7 @@ use tokio::sync::RwLock;
 
 use crate::chain_observer::interface::*;
 use crate::crypto_helper::{KESPeriod, OpCert};
-use crate::{entities::*, fake_data};
+use crate::{entities::*, test_utils::fake_data};
 
 /// A Fake [ChainObserver] for testing purpose using fixed data.
 pub struct FakeObserver {
@@ -89,7 +89,7 @@ impl ChainObserver for FakeObserver {
 
 #[cfg(test)]
 mod tests {
-    use crate::fake_data;
+    use crate::test_utils::fake_data;
 
     use super::*;
 
diff --git a/mithril-common/src/crypto_helper/tests_setup.rs b/mithril-common/src/crypto_helper/tests_setup.rs
@@ -3,8 +3,7 @@ use super::{genesis::*, key_encode_hex, types::*, OpCert, SerDeShelleyFileFormat
 use crate::{
     certificate_chain::CertificateGenesisProducer,
     entities::{Certificate, Epoch, ProtocolMessage, ProtocolMessagePartKey, SignerWithStake},
-    fake_data,
-    test_utils::{MithrilFixtureBuilder, SignerFixture},
+    test_utils::{fake_data, MithrilFixtureBuilder, SignerFixture},
 };
 
 use rand_chacha::ChaCha20Rng;
diff --git a/mithril-common/src/entities/certificate_pending.rs b/mithril-common/src/entities/certificate_pending.rs
@@ -48,7 +48,7 @@ impl CertificatePending {
 
 #[cfg(test)]
 mod tests {
-    use crate::fake_data;
+    use crate::test_utils::fake_data;
 
     #[test]
     fn certificate_pending_get_signers() {
diff --git a/mithril-common/src/lib.rs b/mithril-common/src/lib.rs
@@ -10,17 +10,13 @@
 //! - A [certificate chain] used to validate the Certificate Chain created by an aggregator
 //! - The [entities] used by, and exchanged between, the aggregator, signers and client.
 
-#[cfg(any(test, feature = "test_only"))]
-pub mod apispec;
 mod beacon_provider;
 pub mod certificate_chain;
 pub mod chain_observer;
 pub mod crypto_helper;
 pub mod database;
 pub mod digesters;
 pub mod entities;
-#[cfg(any(test, feature = "test_only"))]
-pub mod fake_data;
 pub mod sqlite;
 pub mod store;
 pub mod test_utils;
diff --git a/mithril-common/src/test_utils/apispec.rs b/mithril-common/src/test_utils/apispec.rs
@@ -147,7 +147,7 @@ mod tests {
 
     use super::*;
     use crate::entities;
-    use crate::fake_data;
+    use crate::test_utils::fake_data;
 
     const API_SPEC_FILE: &str = "../openapi.yaml";
 
diff --git a/mithril-common/src/test_utils/fake_data.rs b/mithril-common/src/test_utils/fake_data.rs
diff --git a/mithril-common/src/test_utils/fixture_builder.rs b/mithril-common/src/test_utils/fixture_builder.rs
@@ -8,8 +8,7 @@ use crate::{
         ProtocolStakeDistribution, SerDeShelleyFileFormat,
     },
     entities::{PartyId, ProtocolParameters, StakeDistribution},
-    fake_data,
-    test_utils::mithril_fixture::MithrilFixture,
+    test_utils::{fake_data, mithril_fixture::MithrilFixture},
 };
 
 /// A builder of mithril types.
diff --git a/mithril-common/src/test_utils/mod.rs b/mithril-common/src/test_utils/mod.rs
@@ -1,4 +1,8 @@
 #[cfg(any(test, feature = "test_only"))]
+pub mod apispec;
+#[cfg(any(test, feature = "test_only"))]
+pub mod fake_data;
+#[cfg(any(test, feature = "test_only"))]
 mod fixture_builder;
 mod mithril_fixture;
 
diff --git a/mithril-signer/src/certificate_handler.rs b/mithril-signer/src/certificate_handler.rs
@@ -227,7 +227,7 @@ impl CertificateHandler for CertificateHandlerHTTPClient {
 #[cfg(test)]
 pub(crate) mod dumb {
     use super::*;
-    use mithril_common::fake_data;
+    use mithril_common::test_utils::fake_data;
     use tokio::sync::RwLock;
 
     /// This certificate handler is intended to be used by test services.
@@ -328,7 +328,7 @@ mod tests {
     use serde_json::json;
     use std::path::{Path, PathBuf};
 
-    use mithril_common::fake_data;
+    use mithril_common::test_utils::fake_data;
 
     use crate::configuration::Config;
 
diff --git a/mithril-signer/src/protocol_initializer_store.rs b/mithril-signer/src/protocol_initializer_store.rs
@@ -105,7 +105,7 @@ mod tests {
 
     use super::*;
 
-    use mithril_common::{fake_data, store::adapter::MemoryAdapter};
+    use mithril_common::{store::adapter::MemoryAdapter, test_utils::fake_data};
 
     use rand_chacha::ChaCha20Rng;
     use rand_core::SeedableRng;
diff --git a/mithril-signer/src/runtime/runner.rs b/mithril-signer/src/runtime/runner.rs
@@ -441,12 +441,11 @@ mod tests {
         crypto_helper::ProtocolInitializer,
         digesters::{DumbImmutableDigester, DumbImmutableFileObserver},
         entities::{Epoch, StakeDistribution},
-        fake_data,
         store::{
             adapter::{DumbStoreAdapter, MemoryAdapter},
             StakeStore, StakeStorer,
         },
-        test_utils::MithrilFixtureBuilder,
+        test_utils::{fake_data, MithrilFixtureBuilder},
         BeaconProvider, BeaconProviderError, BeaconProviderImpl, CardanoNetwork,
     };
     use mockall::mock;
diff --git a/mithril-signer/src/runtime/state_machine.rs b/mithril-signer/src/runtime/state_machine.rs
@@ -267,7 +267,7 @@ impl StateMachine {
 #[cfg(test)]
 mod tests {
     use mithril_common::entities::Epoch;
-    use mithril_common::{entities::ProtocolMessage, fake_data};
+    use mithril_common::{entities::ProtocolMessage, test_utils::fake_data};
 
     use super::*;
     use crate::runtime::runner::MockSignerRunner;
diff --git a/mithril-signer/tests/test_extensions/certificate_handler.rs b/mithril-signer/tests/test_extensions/certificate_handler.rs
@@ -112,7 +112,7 @@ impl CertificateHandler for FakeAggregator {
 #[cfg(test)]
 mod tests {
     use mithril_common::{
-        chain_observer::FakeObserver, digesters::DumbImmutableFileObserver, fake_data,
+        chain_observer::FakeObserver, digesters::DumbImmutableFileObserver, test_utils::fake_data,
         CardanoNetwork,
     };
 
