From e224591f430c032d9d31dfdc4c285ef4991f1317 Mon Sep 17 00:00:00 2001 From: Adam Szkoda Date: Mon, 29 Jun 2020 09:32:24 +0200 Subject: [PATCH] Enable logging in tests --- Cargo.lock | 1 + beacon_node/beacon_chain/Cargo.toml | 1 + beacon_node/beacon_chain/tests/store_tests.rs | 12 ++++++++++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3ea81ef7767..8e48c786c60 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -325,6 +325,7 @@ dependencies = [ "serde_json", "serde_yaml", "slog", + "slog-term", "sloggers", "slot_clock", "smallvec 1.4.0", diff --git a/beacon_node/beacon_chain/Cargo.toml b/beacon_node/beacon_chain/Cargo.toml index 2109f882ba3..cd826826edf 100644 --- a/beacon_node/beacon_chain/Cargo.toml +++ b/beacon_node/beacon_chain/Cargo.toml @@ -25,6 +25,7 @@ serde_derive = "1.0.110" serde_yaml = "0.8.11" serde_json = "1.0.52" slog = { version = "2.5.2", features = ["max_level_trace"] } +slog-term = "2.6.0" sloggers = "1.0.0" slot_clock = { path = "../../common/slot_clock" } eth2_hashing = "0.1.0" diff --git a/beacon_node/beacon_chain/tests/store_tests.rs b/beacon_node/beacon_chain/tests/store_tests.rs index c5207b3216c..6ab2908bcec 100644 --- a/beacon_node/beacon_chain/tests/store_tests.rs +++ b/beacon_node/beacon_chain/tests/store_tests.rs @@ -3,6 +3,11 @@ #[macro_use] extern crate lazy_static; +#[macro_use] +extern crate slog; +extern crate slog_term; + +use crate::slog::Drain; use beacon_chain::attestation_verification::Error as AttnError; use beacon_chain::test_utils::{ AttestationStrategy, BeaconChainHarness, BlockStrategy, DiskHarnessType, @@ -10,7 +15,6 @@ use beacon_chain::test_utils::{ use beacon_chain::BeaconSnapshot; use beacon_chain::StateSkipConfig; use rand::Rng; -use sloggers::{null::NullLoggerBuilder, Build}; use std::collections::HashMap; use std::collections::HashSet; use std::sync::Arc; @@ -40,7 +44,11 @@ fn get_store(db_path: &TempDir) -> Arc, LevelDB>> { let hot_path = db_path.path().join("hot_db"); let cold_path = db_path.path().join("cold_db"); let config = StoreConfig::default(); - let log = NullLoggerBuilder.build().expect("logger should build"); + + let decorator = slog_term::PlainDecorator::new(slog_term::TestStdoutWriter); + let drain = slog_term::FullFormat::new(decorator).build(); + let log = slog::Logger::root(std::sync::Mutex::new(drain).fuse(), o!()); + Arc::new( HotColdDB::open(&hot_path, &cold_path, config, spec, log) .expect("disk store should initialize"),