Skip to content

Commit 0ef8112

Browse files
committed
refactor(tests): use define_test_logger instead of manual creation
And move its definition to a `test` module instead of a `test_utils` to be in line with the latest naming scheme (only for crates that already have a `test` module).
1 parent 15f18a2 commit 0ef8112

File tree

47 files changed

+49
-252
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+49
-252
lines changed

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

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,4 @@ pub mod double;
88
#[cfg(test)]
99
pub(crate) mod test_cli_runner;
1010

11-
#[cfg(test)]
12-
pub(crate) struct TestLogger;
13-
14-
#[cfg(test)]
15-
impl TestLogger {
16-
fn from_writer<W: std::io::Write + Send + 'static>(writer: W) -> slog::Logger {
17-
use slog::Drain;
18-
use std::sync::Arc;
19-
20-
let decorator = slog_term::PlainDecorator::new(writer);
21-
let drain = slog_term::CompactFormat::new(decorator).build().fuse();
22-
let drain = slog_async::Async::new(drain).build().fuse();
23-
slog::Logger::root(Arc::new(drain), slog::o!())
24-
}
25-
26-
pub(crate) fn stdout() -> slog::Logger {
27-
Self::from_writer(slog_term::TestStdoutWriter)
28-
}
29-
}
11+
mithril_common::define_test_logger!();

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

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,4 @@ pub mod fake_data;
1010

1111
pub use dummy_cardano_db::{DummyCardanoDb, DummyCardanoDbBuilder};
1212

13-
#[cfg(test)]
14-
pub(crate) struct TestLogger;
15-
16-
#[cfg(test)]
17-
impl TestLogger {
18-
fn from_writer<W: std::io::Write + Send + 'static>(writer: W) -> slog::Logger {
19-
use slog::Drain;
20-
use std::sync::Arc;
21-
22-
let decorator = slog_term::PlainDecorator::new(writer);
23-
let drain = slog_term::CompactFormat::new(decorator).build().fuse();
24-
let drain = slog_async::Async::new(drain).build().fuse();
25-
slog::Logger::root(Arc::new(drain), slog::o!())
26-
}
27-
28-
pub(crate) fn stdout() -> slog::Logger {
29-
Self::from_writer(slog_term::TestStdoutWriter)
30-
}
31-
}
13+
mithril_common::define_test_logger!();

internal/mithril-dmq/src/consumer/pallas.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ mod tests {
151151
};
152152
use tokio::{net::UnixListener, task::JoinHandle, time::sleep};
153153

154-
use crate::{test::payload::DmqMessageTestPayload, test_tools::TestLogger};
154+
use crate::test::{TestLogger, payload::DmqMessageTestPayload};
155155

156156
use super::*;
157157

internal/mithril-dmq/src/lib.rs

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,3 @@ pub mod test;
99
pub use consumer::{DmqConsumer, DmqConsumerPallas};
1010
pub use message::DmqMessageBuilder;
1111
pub use publisher::{DmqPublisher, DmqPublisherPallas};
12-
13-
#[cfg(test)]
14-
pub(crate) mod test_tools {
15-
use std::io;
16-
use std::sync::Arc;
17-
18-
use slog::{Drain, Logger};
19-
use slog_async::Async;
20-
use slog_term::{CompactFormat, PlainDecorator};
21-
22-
pub struct TestLogger;
23-
24-
impl TestLogger {
25-
fn from_writer<W: io::Write + Send + 'static>(writer: W) -> Logger {
26-
let decorator = PlainDecorator::new(writer);
27-
let drain = CompactFormat::new(decorator).build().fuse();
28-
let drain = Async::new(drain).build().fuse();
29-
Logger::root(Arc::new(drain), slog::o!())
30-
}
31-
32-
pub fn stdout() -> Logger {
33-
Self::from_writer(slog_term::TestStdoutWriter)
34-
}
35-
}
36-
}

internal/mithril-dmq/src/publisher/pallas.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ mod tests {
9696
test::{TempDir, double::Dummy},
9797
};
9898

99-
use crate::{test::payload::DmqMessageTestPayload, test_tools::TestLogger};
99+
use crate::test::{TestLogger, payload::DmqMessageTestPayload};
100100

101101
use super::*;
102102

internal/mithril-dmq/src/test/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,5 @@ pub mod double;
88

99
#[cfg(test)]
1010
pub(crate) mod payload;
11+
12+
mithril_common::define_test_logger!();

internal/mithril-metric/src/helper.rs

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -106,26 +106,7 @@ macro_rules! build_metrics_service {
106106

107107
#[cfg(test)]
108108
pub(crate) mod test_tools {
109-
use std::{io, sync::Arc};
110-
111-
use slog::{Drain, Logger};
112-
use slog_async::Async;
113-
use slog_term::{CompactFormat, PlainDecorator};
114-
115-
pub struct TestLogger;
116-
117-
impl TestLogger {
118-
fn from_writer<W: io::Write + Send + 'static>(writer: W) -> Logger {
119-
let decorator = PlainDecorator::new(writer);
120-
let drain = CompactFormat::new(decorator).build().fuse();
121-
let drain = Async::new(drain).build().fuse();
122-
Logger::root(Arc::new(drain), slog::o!())
123-
}
124-
125-
pub fn stdout() -> Logger {
126-
Self::from_writer(slog_term::TestStdoutWriter)
127-
}
128-
}
109+
mithril_common::define_test_logger!();
129110
}
130111

131112
#[cfg(test)]

internal/signed-entity/mithril-signed-entity-preloader/src/lib.rs

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,5 @@ pub use cardano_transactions_preloader::*;
99

1010
#[cfg(test)]
1111
pub(crate) mod test_tools {
12-
use std::io;
13-
use std::sync::Arc;
14-
15-
use slog::{Drain, Logger};
16-
use slog_async::Async;
17-
use slog_term::{CompactFormat, PlainDecorator};
18-
19-
pub struct TestLogger;
20-
21-
impl TestLogger {
22-
fn from_writer<W: io::Write + Send + 'static>(writer: W) -> Logger {
23-
let decorator = PlainDecorator::new(writer);
24-
let drain = CompactFormat::new(decorator).build().fuse();
25-
let drain = Async::new(drain).build().fuse();
26-
Logger::root(Arc::new(drain), slog::o!())
27-
}
28-
29-
pub fn stdout() -> Logger {
30-
Self::from_writer(slog_term::TestStdoutWriter)
31-
}
32-
}
12+
mithril_common::define_test_logger!();
3313
}

mithril-aggregator/src/artifact_builder/cardano_database.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ mod tests {
125125
immutable_file_digest_mapper::MockImmutableFileDigestMapper,
126126
services::CompressedArchiveSnapshotter,
127127
services::ancillary_signer::MockAncillarySigner,
128-
test_tools::TestLogger,
128+
test::TestLogger,
129129
tools::{file_archiver::FileArchiver, url_sanitizer::SanitizedUrlWithTrailingSlash},
130130
};
131131

mithril-aggregator/src/artifact_builder/cardano_database_artifacts/ancillary.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ mod tests {
209209
use mithril_common::test::{TempDir, assert_equivalent, double::Dummy};
210210

211211
use crate::services::{DumbSnapshotter, MockSnapshotter};
212-
use crate::test_tools::TestLogger;
212+
use crate::test::TestLogger;
213213

214214
use super::*;
215215

0 commit comments

Comments
 (0)