Skip to content

Commit 319d921

Browse files
committed
refactor: remove slog_scope dependency from mithril-common
As it was only used in tests for easy loger creation and we have since added tooling to create test loggers that don't use `slog_scope`.
1 parent 64daa84 commit 319d921

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

Cargo.lock

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mithril-common/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ pallas-crypto = "0.30.1"
8484
rand_core = { version = "0.6.4", features = ["getrandom"] }
8585
reqwest = { version = "0.12.7", features = ["json"] }
8686
slog-async = "2.8.0"
87-
slog-scope = "4.4.0"
8887
slog-term = "2.9.1"
8988
tokio = { version = "1.40.0", features = ["macros", "rt-multi-thread", "time"] }
9089

mithril-common/src/certificate_chain/certificate_verifier.rs

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -302,14 +302,13 @@ impl CertificateVerifier for MithrilCertificateVerifier {
302302
mod tests {
303303
use async_trait::async_trait;
304304
use mockall::mock;
305-
use slog_scope;
306305

307306
use super::CertificateRetriever;
308307
use super::*;
309308

310309
use crate::certificate_chain::CertificateRetrieverError;
311310
use crate::crypto_helper::{tests_setup::*, ProtocolClerk};
312-
use crate::test_utils::MithrilFixtureBuilder;
311+
use crate::test_utils::{MithrilFixtureBuilder, TestLogger};
313312

314313
mock! {
315314
pub CertificateRetrieverImpl { }
@@ -348,7 +347,7 @@ mod tests {
348347
.into();
349348

350349
let verifier = MithrilCertificateVerifier::new(
351-
slog_scope::logger(),
350+
TestLogger::stdout(),
352351
Arc::new(MockCertificateRetrieverImpl::new()),
353352
);
354353
let message_tampered = message_hash[1..].to_vec();
@@ -387,7 +386,7 @@ mod tests {
387386
.returning(move |_| Ok(fake_certificate2.clone()))
388387
.times(1);
389388
let verifier = MithrilCertificateVerifier::new(
390-
slog_scope::logger(),
389+
TestLogger::stdout(),
391390
Arc::new(mock_certificate_retriever),
392391
);
393392
let verify = verifier
@@ -410,7 +409,7 @@ mod tests {
410409
.returning(move |_| Ok(fake_certificate2.clone()))
411410
.times(1);
412411
let verifier = MithrilCertificateVerifier::new(
413-
slog_scope::logger(),
412+
TestLogger::stdout(),
414413
Arc::new(mock_certificate_retriever),
415414
);
416415
let verify = verifier
@@ -435,7 +434,7 @@ mod tests {
435434
.returning(move |_| Ok(fake_certificate2.clone()))
436435
.times(1);
437436
let verifier = MithrilCertificateVerifier::new(
438-
slog_scope::logger(),
437+
TestLogger::stdout(),
439438
Arc::new(mock_certificate_retriever),
440439
);
441440
let error = verifier
@@ -478,7 +477,7 @@ mod tests {
478477
.returning(move |_| Ok(fake_certificate2.clone()))
479478
.times(1);
480479
let verifier = MithrilCertificateVerifier::new(
481-
slog_scope::logger(),
480+
TestLogger::stdout(),
482481
Arc::new(mock_certificate_retriever),
483482
);
484483
let error = verifier
@@ -505,7 +504,7 @@ mod tests {
505504
fake_certificate1.hash = "another-hash".to_string();
506505
let mock_certificate_retriever = MockCertificateRetrieverImpl::new();
507506
let verifier = MithrilCertificateVerifier::new(
508-
slog_scope::logger(),
507+
TestLogger::stdout(),
509508
Arc::new(mock_certificate_retriever),
510509
);
511510
let error = verifier
@@ -537,7 +536,7 @@ mod tests {
537536
.times(1);
538537
}
539538
let verifier = MithrilCertificateVerifier::new(
540-
slog_scope::logger(),
539+
TestLogger::stdout(),
541540
Arc::new(mock_certificate_retriever),
542541
);
543542
let verify = verifier
@@ -570,7 +569,7 @@ mod tests {
570569
.times(1);
571570
}
572571
let verifier = MithrilCertificateVerifier::new(
573-
slog_scope::logger(),
572+
TestLogger::stdout(),
574573
Arc::new(mock_certificate_retriever),
575574
);
576575
let error = verifier

0 commit comments

Comments
 (0)