Merge pull request #2650 from input-output-hk/djo/2580/refactor-common-test-utils

refactor: common test utils

Author: Alenar

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-cardano-node-chain"
-version = "0.1.5"
+version = "0.1.6"
 authors.workspace = true
 documentation.workspace = true
 edition.workspace = true

internal/cardano-node/mithril-cardano-node-chain/Cargo.toml

@@ -529,7 +529,7 @@ mod tests {
     use tokio::net::UnixListener;
 
     use mithril_common::crypto_helper::ColdKeyGenerator;
-    use mithril_common::test_utils::TempDir;
+    use mithril_common::test::TempDir;
 
     use super::*;
 

internal/cardano-node/mithril-cardano-node-chain/src/chain_observer/pallas_observer.rs

@@ -160,7 +160,7 @@ mod tests {
     use std::fs;
     use tokio::net::UnixListener;
 
-    use mithril_common::{current_function, entities::BlockNumber, test_utils::TempDir};
+    use mithril_common::{current_function, entities::BlockNumber, test::TempDir};
 
     use crate::test::TestLogger;
 

internal/cardano-node/mithril-cardano-node-chain/src/chain_reader/pallas_chain_reader.rs

@@ -212,7 +212,7 @@ impl ChainObserver for FakeChainObserver {
 
 #[cfg(test)]
 mod tests {
-    use mithril_common::test_utils::{double::Dummy, fake_data};
+    use mithril_common::test::double::{Dummy, fake_data};
 
     use super::*;
 

internal/cardano-node/mithril-cardano-node-chain/src/test/double/chain_observer.rs

@@ -9,21 +9,4 @@ pub mod double;
 pub(crate) mod test_cli_runner;
 
 #[cfg(test)]
-pub(crate) struct TestLogger;
-
-#[cfg(test)]
-impl TestLogger {
-    fn from_writer<W: std::io::Write + Send + 'static>(writer: W) -> slog::Logger {
-        use slog::Drain;
-        use std::sync::Arc;
-
-        let decorator = slog_term::PlainDecorator::new(writer);
-        let drain = slog_term::CompactFormat::new(decorator).build().fuse();
-        let drain = slog_async::Async::new(drain).build().fuse();
-        slog::Logger::root(Arc::new(drain), slog::o!())
-    }
-
-    pub(crate) fn stdout() -> slog::Logger {
-        Self::from_writer(slog_term::TestStdoutWriter)
-    }
-}
+mithril_common::define_test_logger!();

internal/cardano-node/mithril-cardano-node-chain/src/test/mod.rs

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-cardano-node-internal-database"
-version = "0.1.2"
+version = "0.1.3"
 description = "Mechanisms that allow Mithril nodes to read the files of a Cardano node internal database and compute digests from them"
 authors.workspace = true
 documentation.workspace = true

internal/cardano-node/mithril-cardano-node-internal-database/Cargo.toml

@@ -109,7 +109,7 @@ impl ImmutableFileDigestCacheProvider for JsonImmutableFileDigestCacheProvider {
 mod tests {
     use std::{collections::BTreeMap, path::PathBuf};
 
-    use mithril_common::test_utils::TempDir;
+    use mithril_common::test::TempDir;
 
     use crate::digesters::cache::{
         ImmutableFileDigestCacheProvider, JsonImmutableFileDigestCacheProvider,

internal/cardano-node/mithril-cardano-node-internal-database/src/digesters/cache/json_provider.rs

@@ -86,7 +86,7 @@ impl<'a> JsonImmutableFileDigestCacheProviderBuilder<'a> {
 mod tests {
     use std::path::PathBuf;
 
-    use mithril_common::test_utils::TempDir;
+    use mithril_common::test::TempDir;
 
     use crate::digesters::cache::JsonImmutableFileDigestCacheProviderBuilder;
 

internal/cardano-node/mithril-cardano-node-internal-database/src/digesters/cache/json_provider_builder.rs

@@ -201,7 +201,7 @@ mod tests {
     use std::io::prelude::*;
 
     use mithril_common::temp_dir_create;
-    use mithril_common::test_utils::TempDir;
+    use mithril_common::test::TempDir;
 
     use super::*;