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

Author: Alenar

mithril-aggregator/src/services/aggregator_client.rs

@@ -421,9 +421,8 @@ mod tests {
     use reqwest::IntoUrl;
     use serde_json::json;
 
-    use mithril_common::api_version::DummyApiVersionDiscriminantSource;
     use mithril_common::messages::CertificateListItemMessage;
-    use mithril_common::test::double::Dummy;
+    use mithril_common::test::double::{Dummy, DummyApiVersionDiscriminantSource};
 
     use crate::test::TestLogger;
 

mithril-common/src/api_version.rs

@@ -73,38 +73,10 @@ impl APIVersionProvider {
     }
 }
 
-cfg_test_tools! {
-    /// A dummy implementation of the `ApiVersionDiscriminantSource` trait for testing purposes.
-    pub struct DummyApiVersionDiscriminantSource {
-        discriminant: String,
-    }
-
-    impl DummyApiVersionDiscriminantSource {
-        /// Create a new instance of `DummyApiVersionDiscriminantSource` with the given discriminant.
-        pub fn new<T: Into<String>>(discrimant: T) -> Self {
-            Self {
-                discriminant: discrimant.into(),
-            }
-        }
-    }
-
-    impl Default for DummyApiVersionDiscriminantSource {
-        fn default() -> Self {
-            Self {
-                discriminant: "dummy".to_string(),
-            }
-        }
-    }
-
-    impl ApiVersionDiscriminantSource for DummyApiVersionDiscriminantSource {
-        fn get_discriminant(&self) -> String {
-            self.discriminant.clone()
-        }
-    }
-}
-
 #[cfg(test)]
 mod test {
+    use crate::test::double::DummyApiVersionDiscriminantSource;
+
     use super::*;
 
     #[test]

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

@@ -0,0 +1,29 @@
+use crate::api_version::ApiVersionDiscriminantSource;
+
+/// A dummy implementation of the `ApiVersionDiscriminantSource` trait for testing purposes.
+pub struct DummyApiVersionDiscriminantSource {
+    discriminant: String,
+}
+
+impl DummyApiVersionDiscriminantSource {
+    /// Create a new instance of `DummyApiVersionDiscriminantSource` with the given discriminant.
+    pub fn new<T: Into<String>>(discrimant: T) -> Self {
+        Self {
+            discriminant: discrimant.into(),
+        }
+    }
+}
+
+impl Default for DummyApiVersionDiscriminantSource {
+    fn default() -> Self {
+        Self {
+            discriminant: "dummy".to_string(),
+        }
+    }
+}
+
+impl ApiVersionDiscriminantSource for DummyApiVersionDiscriminantSource {
+    fn get_discriminant(&self) -> String {
+        self.discriminant.clone()
+    }
+}

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

@@ -2,12 +2,14 @@
 //!
 //! Enable unit testing with controlled inputs and predictable behavior.
 
+mod api_version;
 mod certificate_retriever;
 mod dummies;
 pub mod fake_data;
 pub mod fake_keys;
 pub(super) mod precomputed_kes_key;
 
+pub use api_version::DummyApiVersionDiscriminantSource;
 pub use certificate_retriever::FakeCertificaterRetriever;
 
 /// A trait for giving a type a dummy value.

mithril-signer/src/services/aggregator_client.rs

@@ -470,11 +470,10 @@ mod tests {
     use semver::Version;
     use serde_json::json;
 
-    use mithril_common::api_version::DummyApiVersionDiscriminantSource;
     use mithril_common::entities::Epoch;
     use mithril_common::messages::TryFromMessageAdapter;
     use mithril_common::test::{
-        double::{Dummy, fake_data},
+        double::{Dummy, DummyApiVersionDiscriminantSource, fake_data},
         logging::MemoryDrainForTestInspector,
     };