Skip to content

Commit d957161

Browse files
dappliondapplion
authored
Drop null_logger (#6013)
* Drop null_logger
1 parent 6faa9c6 commit d957161

File tree

23 files changed

+51
-60
lines changed

23 files changed

+51
-60
lines changed

Diff for: ‎Cargo.lock

+5-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎beacon_node/beacon_chain/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ test_backfill = []
1515

1616
[dev-dependencies]
1717
maplit = { workspace = true }
18-
environment = { workspace = true }
1918
serde_json = { workspace = true }
2019

2120
[dependencies]

Diff for: ‎beacon_node/beacon_chain/src/eth1_chain.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,6 @@ fn is_candidate_block(block: &Eth1Block, period_start: u64, spec: &ChainSpec) ->
685685
#[cfg(test)]
686686
mod test {
687687
use super::*;
688-
use environment::null_logger;
689688
use types::{DepositData, MinimalEthSpec, Signature};
690689

691690
type E = MinimalEthSpec;
@@ -743,14 +742,15 @@ mod test {
743742
mod eth1_chain_json_backend {
744743
use super::*;
745744
use eth1::DepositLog;
745+
use logging::test_logger;
746746
use types::{test_utils::generate_deterministic_keypair, MainnetEthSpec};
747747

748748
fn get_eth1_chain() -> Eth1Chain<CachingEth1Backend<E>, E> {
749749
let eth1_config = Eth1Config {
750750
..Eth1Config::default()
751751
};
752752

753-
let log = null_logger().unwrap();
753+
let log = test_logger();
754754
Eth1Chain::new(
755755
CachingEth1Backend::new(eth1_config, log, MainnetEthSpec::default_spec()).unwrap(),
756756
)

Diff for: ‎beacon_node/beacon_chain/src/shuffling_cache.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ impl BlockShufflingIds {
294294
#[cfg(not(debug_assertions))]
295295
#[cfg(test)]
296296
mod test {
297-
use task_executor::test_utils::null_logger;
297+
use task_executor::test_utils::test_logger;
298298
use types::*;
299299

300300
use crate::test_utils::EphemeralHarnessType;
@@ -315,7 +315,7 @@ mod test {
315315
previous: Some(shuffling_id(current_epoch - 1)),
316316
block_root: Hash256::from_low_u64_le(0),
317317
};
318-
let logger = null_logger().unwrap();
318+
let logger = test_logger();
319319
ShufflingCache::new(TEST_CACHE_SIZE, head_shuffling_ids, logger)
320320
}
321321

Diff for: ‎beacon_node/eth1/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ ethereum_ssz_derive = { workspace = true }
2121
tree_hash = { workspace = true }
2222
parking_lot = { workspace = true }
2323
slog = { workspace = true }
24+
logging = { workspace = true }
2425
superstruct = { workspace = true }
2526
tokio = { workspace = true }
2627
state_processing = { workspace = true }

Diff for: ‎beacon_node/eth1/tests/test.rs

+10-16
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,21 @@ use eth1::{Config, Eth1Endpoint, Service};
44
use eth1::{DepositCache, DEFAULT_CHAIN_ID};
55
use eth1_test_rig::{AnvilEth1Instance, Http, Middleware, Provider};
66
use execution_layer::http::{deposit_methods::*, HttpJsonRpc, Log};
7+
use logging::test_logger;
78
use merkle_proof::verify_merkle_proof;
89
use sensitive_url::SensitiveUrl;
9-
use slog::Logger;
10-
use sloggers::{null::NullLoggerBuilder, Build};
1110
use std::ops::Range;
1211
use std::time::Duration;
1312
use tree_hash::TreeHash;
1413
use types::{DepositData, EthSpec, Hash256, Keypair, MainnetEthSpec, MinimalEthSpec, Signature};
1514

1615
const DEPOSIT_CONTRACT_TREE_DEPTH: usize = 32;
1716

18-
pub fn null_logger() -> Logger {
19-
let log_builder = NullLoggerBuilder;
20-
log_builder.build().expect("should build logger")
21-
}
22-
2317
pub fn new_env() -> Environment<MinimalEthSpec> {
2418
EnvironmentBuilder::minimal()
2519
.multi_threaded_tokio_runtime()
2620
.expect("should start tokio runtime")
27-
.null_logger()
21+
.test_logger()
2822
.expect("should start null logger")
2923
.build()
3024
.expect("should build env")
@@ -103,7 +97,7 @@ mod eth1_cache {
10397
#[tokio::test]
10498
async fn simple_scenario() {
10599
async {
106-
let log = null_logger();
100+
let log = test_logger();
107101

108102
for follow_distance in 0..3 {
109103
let eth1 = new_anvil_instance()
@@ -185,7 +179,7 @@ mod eth1_cache {
185179
#[tokio::test]
186180
async fn big_skip() {
187181
async {
188-
let log = null_logger();
182+
let log = test_logger();
189183

190184
let eth1 = new_anvil_instance()
191185
.await
@@ -240,7 +234,7 @@ mod eth1_cache {
240234
#[tokio::test]
241235
async fn pruning() {
242236
async {
243-
let log = null_logger();
237+
let log = test_logger();
244238

245239
let eth1 = new_anvil_instance()
246240
.await
@@ -292,7 +286,7 @@ mod eth1_cache {
292286
#[tokio::test]
293287
async fn double_update() {
294288
async {
295-
let log = null_logger();
289+
let log = test_logger();
296290

297291
let n = 16;
298292

@@ -345,7 +339,7 @@ mod deposit_tree {
345339
#[tokio::test]
346340
async fn updating() {
347341
async {
348-
let log = null_logger();
342+
let log = test_logger();
349343

350344
let n = 4;
351345

@@ -426,7 +420,7 @@ mod deposit_tree {
426420
#[tokio::test]
427421
async fn double_update() {
428422
async {
429-
let log = null_logger();
423+
let log = test_logger();
430424

431425
let n = 8;
432426

@@ -688,7 +682,7 @@ mod fast {
688682
#[tokio::test]
689683
async fn deposit_cache_query() {
690684
async {
691-
let log = null_logger();
685+
let log = test_logger();
692686

693687
let eth1 = new_anvil_instance()
694688
.await
@@ -771,7 +765,7 @@ mod persist {
771765
#[tokio::test]
772766
async fn test_persist_caches() {
773767
async {
774-
let log = null_logger();
768+
let log = test_logger();
775769

776770
let eth1 = new_anvil_instance()
777771
.await

Diff for: ‎beacon_node/execution_layer/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ alloy-primitives = { workspace = true }
1010
types = { workspace = true }
1111
tokio = { workspace = true }
1212
slog = { workspace = true }
13+
logging = { workspace = true }
1314
sensitive_url = { workspace = true }
1415
reqwest = { workspace = true }
1516
ethereum_serde_utils = { workspace = true }
1617
serde_json = { workspace = true }
1718
serde = { workspace = true }
1819
warp = { workspace = true }
1920
jsonwebtoken = "8"
20-
environment = { workspace = true }
2121
bytes = { workspace = true }
2222
task_executor = { workspace = true }
2323
hex = { workspace = true }

Diff for: ‎beacon_node/execution_layer/src/test_utils/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ use crate::engine_api::{
66
};
77
use crate::json_structures::JsonClientVersionV1;
88
use bytes::Bytes;
9-
use environment::null_logger;
109
use execution_block_generator::PoWBlock;
1110
use handle_rpc::handle_rpc;
1211
use kzg::Kzg;
12+
use logging::test_logger;
1313
use parking_lot::{Mutex, RwLock, RwLockWriteGuard};
1414
use serde::{Deserialize, Serialize};
1515
use serde_json::json;
@@ -149,7 +149,7 @@ impl<E: EthSpec> MockServer<E> {
149149
let ctx: Arc<Context<E>> = Arc::new(Context {
150150
config: server_config,
151151
jwt_key,
152-
log: null_logger().unwrap(),
152+
log: test_logger(),
153153
last_echo_request: last_echo_request.clone(),
154154
execution_block_generator: RwLock::new(execution_block_generator),
155155
previous_request: <_>::default(),

Diff for: ‎beacon_node/genesis/tests/tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pub fn new_env() -> Environment<MinimalEthSpec> {
1212
EnvironmentBuilder::minimal()
1313
.multi_threaded_tokio_runtime()
1414
.expect("should start tokio runtime")
15-
.null_logger()
15+
.test_logger()
1616
.expect("should start null logger")
1717
.build()
1818
.expect("should build env")

Diff for: ‎beacon_node/http_api/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ bytes = { workspace = true }
4444
beacon_processor = { workspace = true }
4545

4646
[dev-dependencies]
47-
environment = { workspace = true }
4847
serde_json = { workspace = true }
4948
proto_array = { workspace = true }
5049
genesis = { workspace = true }
50+
logging = { workspace = true }
5151

5252
[[test]]
5353
name = "bn_http_api_tests"

Diff for: ‎beacon_node/http_api/tests/tests.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ use beacon_chain::{
33
test_utils::{AttestationStrategy, BeaconChainHarness, BlockStrategy, EphemeralHarnessType},
44
BeaconChain, ChainConfig, StateSkipConfig, WhenSlotSkipped,
55
};
6-
use environment::null_logger;
76
use eth2::{
87
mixin::{RequestAccept, ResponseForkName, ResponseOptional},
98
reqwest::RequestBuilder,
@@ -24,6 +23,7 @@ use http_api::{
2423
BlockId, StateId,
2524
};
2625
use lighthouse_network::{types::SyncState, Enr, EnrExt, PeerId};
26+
use logging::test_logger;
2727
use network::NetworkReceivers;
2828
use proto_array::ExecutionStatus;
2929
use sensitive_url::SensitiveUrl;
@@ -251,7 +251,7 @@ impl ApiTester {
251251
"precondition: justification"
252252
);
253253

254-
let log = null_logger().unwrap();
254+
let log = test_logger();
255255

256256
let ApiServer {
257257
ctx,
@@ -349,7 +349,7 @@ impl ApiTester {
349349

350350
let chain = harness.chain.clone();
351351

352-
let log = null_logger().unwrap();
352+
let log = test_logger();
353353

354354
let ApiServer {
355355
ctx,

Diff for: ‎beacon_node/http_metrics/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ malloc_utils = { workspace = true }
2222
[dev-dependencies]
2323
tokio = { workspace = true }
2424
reqwest = { workspace = true }
25-
environment = { workspace = true }
2625
types = { workspace = true }
26+
logging = { workspace = true }

Diff for: ‎beacon_node/http_metrics/tests/tests.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use beacon_chain::test_utils::EphemeralHarnessType;
2-
use environment::null_logger;
32
use http_metrics::Config;
3+
use logging::test_logger;
44
use reqwest::header::HeaderValue;
55
use reqwest::StatusCode;
66
use std::net::{IpAddr, Ipv4Addr};
@@ -13,7 +13,7 @@ type Context = http_metrics::Context<EphemeralHarnessType<MainnetEthSpec>>;
1313
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
1414
async fn returns_200_ok() {
1515
async {
16-
let log = null_logger().unwrap();
16+
let log = test_logger();
1717

1818
let context = Arc::new(Context {
1919
config: Config {

Diff for: ‎beacon_node/tests/test.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ fn build_node<E: EthSpec>(env: &mut Environment<E>) -> LocalBeaconNode<E> {
2525
#[test]
2626
fn http_server_genesis_state() {
2727
let mut env = env_builder()
28-
.null_logger()
28+
.test_logger()
2929
//.async_logger("debug", None)
3030
.expect("should build env logger")
3131
.multi_threaded_tokio_runtime()

Diff for: ‎common/logging/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -289,10 +289,10 @@ pub fn test_logger() -> Logger {
289289
sloggers::terminal::TerminalLoggerBuilder::new()
290290
.level(sloggers::types::Severity::Debug)
291291
.build()
292-
.expect("Should build test_logger")
292+
.expect("Should build TerminalLoggerBuilder")
293293
} else {
294294
sloggers::null::NullLoggerBuilder
295295
.build()
296-
.expect("Should build null_logger")
296+
.expect("Should build NullLoggerBuilder")
297297
}
298298
}

Diff for: ‎common/task_executor/src/test_utils.rs

+1-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
use crate::TaskExecutor;
2-
use logging::test_logger;
2+
pub use logging::test_logger;
33
use slog::Logger;
4-
use sloggers::{null::NullLoggerBuilder, Build};
54
use std::sync::Arc;
65
use tokio::runtime;
76

@@ -67,10 +66,3 @@ impl TestRuntime {
6766
self.task_executor.log = log;
6867
}
6968
}
70-
71-
pub fn null_logger() -> Result<Logger, String> {
72-
let log_builder = NullLoggerBuilder;
73-
log_builder
74-
.build()
75-
.map_err(|e| format!("Failed to start null logger: {:?}", e))
76-
}

Diff for: ‎lcli/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ jemalloc = ["malloc_utils/jemalloc"]
1414
bls = { workspace = true }
1515
clap = { workspace = true }
1616
log = { workspace = true }
17+
sloggers = { workspace = true }
1718
serde = { workspace = true }
1819
serde_yaml = { workspace = true }
1920
serde_json = { workspace = true }

0 commit comments

Comments
 (0)