refactor(common): move FakeCertificaterRetriever to test::double

Author: Alenar

mithril-aggregator/src/services/certificate_chain_synchronizer/synchronizer_service.rs

@@ -224,12 +224,10 @@ mod tests {
     use anyhow::anyhow;
     use std::sync::RwLock;
 
-    use mithril_common::certificate_chain::{
-        FakeCertificaterRetriever, MithrilCertificateVerifier,
-    };
+    use mithril_common::certificate_chain::MithrilCertificateVerifier;
     use mithril_common::test::{
         builder::{CertificateChainBuilder, CertificateChainFixture},
-        double::{fake_data, fake_keys},
+        double::{FakeCertificaterRetriever, fake_data, fake_keys},
         mock_extensions::MockBuilder,
     };
 

mithril-common/src/certificate_chain/certificate_verifier.rs

@@ -421,18 +421,17 @@ mod tests {
     use std::collections::HashMap;
 
     use async_trait::async_trait;
-    use mockall::mock;
     use tokio::sync::Mutex;
 
-    use super::CertificateRetriever;
-    use super::*;
-
-    use crate::certificate_chain::{CertificateRetrieverError, FakeCertificaterRetriever};
+    use crate::certificate_chain::certificate_retriever::MockCertificateRetriever;
     use crate::crypto_helper::{ProtocolClerk, tests_setup::*};
     use crate::test::TestLogger;
     use crate::test::builder::{
         CertificateChainBuilder, CertificateChainBuilderContext, MithrilFixtureBuilder,
     };
+    use crate::test::double::FakeCertificaterRetriever;
+
+    use super::*;
 
     macro_rules! assert_error_matches {
         ( $expected_error:path, $error:expr ) => {{
@@ -448,27 +447,14 @@ mod tests {
         }};
     }
 
-    mock! {
-        pub CertificateRetrieverImpl { }
-
-        #[async_trait]
-        impl CertificateRetriever for CertificateRetrieverImpl {
-
-            async fn get_certificate_details(
-                &self,
-                certificate_hash: &str,
-            ) -> Result<Certificate, CertificateRetrieverError>;
-        }
-    }
-
     struct MockDependencyInjector {
-        mock_certificate_retriever: MockCertificateRetrieverImpl,
+        mock_certificate_retriever: MockCertificateRetriever,
     }
 
     impl MockDependencyInjector {
         fn new() -> MockDependencyInjector {
             MockDependencyInjector {
-                mock_certificate_retriever: MockCertificateRetrieverImpl::new(),
+                mock_certificate_retriever: MockCertificateRetriever::new(),
             }
         }
 
@@ -505,7 +491,7 @@ mod tests {
 
         let verifier = MithrilCertificateVerifier::new(
             TestLogger::stdout(),
-            Arc::new(MockCertificateRetrieverImpl::new()),
+            Arc::new(MockCertificateRetriever::new()),
         );
         let message_tampered = message_hash[1..].to_vec();
         assert!(

mithril-common/src/certificate_chain/mod.rs

@@ -3,16 +3,9 @@
 mod certificate_genesis;
 mod certificate_retriever;
 mod certificate_verifier;
-cfg_test_tools! {
-    mod fake_certificate_retriever;
-}
 
 pub use certificate_genesis::CertificateGenesisProducer;
 pub use certificate_retriever::{CertificateRetriever, CertificateRetrieverError};
 pub use certificate_verifier::{
     CertificateVerifier, CertificateVerifierError, MithrilCertificateVerifier,
 };
-
-cfg_test_tools! {
-    pub use fake_certificate_retriever::FakeCertificaterRetriever;
-}

mithril-common/src/certificate_chain/fake_certificate_retriever.rs renamed to mithril-common/src/test/double/certificate_retriever.rs

@@ -6,10 +6,9 @@ use async_trait::async_trait;
 use std::collections::HashMap;
 use tokio::sync::RwLock;
 
+use crate::certificate_chain::{CertificateRetriever, CertificateRetrieverError};
 use crate::entities::Certificate;
 
-use super::{CertificateRetriever, CertificateRetrieverError};
-
 /// A fake [CertificateRetriever] that returns a [Certificate] given its hash
 pub struct FakeCertificaterRetriever {
     certificates_map: RwLock<HashMap<String, Certificate>>,

mithril-common/src/test/double/mod.rs

@@ -2,11 +2,14 @@
 //!
 //! Enable unit testing with controlled inputs and predictable behavior.
 
+mod certificate_retriever;
 mod dummies;
 pub mod fake_data;
 pub mod fake_keys;
 pub(super) mod precomputed_kes_key;
 
+pub use certificate_retriever::FakeCertificaterRetriever;
+
 /// A trait for giving a type a dummy value.
 ///
 /// Sometimes in tests you need to provide a value for a type, but the actual value doesn't matter.