From 4755d4b236d0d53940743327a83b0eaf99f1428e Mon Sep 17 00:00:00 2001 From: Wink Saville Date: Tue, 14 Sep 2021 06:48:26 +0000 Subject: [PATCH] Update sloggers to v2.0.2 (#2588) fixes #2584 --- Cargo.lock | 37 +++++++---------------------- beacon_node/beacon_chain/Cargo.toml | 2 +- beacon_node/client/Cargo.toml | 2 +- beacon_node/eth1/Cargo.toml | 2 +- beacon_node/network/Cargo.toml | 2 +- beacon_node/store/Cargo.toml | 2 +- boot_node/Cargo.toml | 2 +- lighthouse/Cargo.toml | 2 +- lighthouse/environment/Cargo.toml | 2 +- slasher/Cargo.toml | 2 +- 10 files changed, 18 insertions(+), 37 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0e8f5969735..ff7de252707 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -484,7 +484,7 @@ dependencies = [ "serde_yaml", "slasher", "slog", - "sloggers 1.0.1", + "sloggers", "slot_clock", "smallvec", "state_processing", @@ -673,7 +673,7 @@ dependencies = [ "slog-scope", "slog-stdlog", "slog-term", - "sloggers 1.0.1", + "sloggers", "tokio", "types", ] @@ -916,7 +916,7 @@ dependencies = [ "slasher_service", "slog", "slog-async", - "sloggers 1.0.1", + "sloggers", "slot_clock", "store", "task_executor", @@ -1631,7 +1631,7 @@ dependencies = [ "slog-async", "slog-json", "slog-term", - "sloggers 1.0.1", + "sloggers", "task_executor", "tokio", "types", @@ -1670,7 +1670,7 @@ dependencies = [ "serde", "serde_json", "slog", - "sloggers 1.0.1", + "sloggers", "state_processing", "task_executor", "tokio", @@ -3711,7 +3711,7 @@ dependencies = [ "slog", "slog-async", "slog-term", - "sloggers 1.0.1", + "sloggers", "target_check", "task_executor", "tempfile", @@ -4153,7 +4153,7 @@ dependencies = [ "slog", "slog-async", "slog-term", - "sloggers 1.0.1", + "sloggers", "slot_clock", "smallvec", "state_processing", @@ -5694,7 +5694,7 @@ dependencies = [ "serde", "serde_derive", "slog", - "sloggers 2.0.2", + "sloggers", "tempfile", "tree_hash 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "tree_hash_derive 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5814,25 +5814,6 @@ dependencies = [ "thread_local", ] -[[package]] -name = "sloggers" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f01d37507aa6f37490cfa08d71e2639b16906e84c285ae4b9f7ec7ca35756d69" -dependencies = [ - "chrono", - "libflate", - "regex", - "serde", - "slog", - "slog-async", - "slog-kvfilter", - "slog-scope", - "slog-stdlog", - "slog-term", - "trackable", -] - [[package]] name = "sloggers" version = "2.0.2" @@ -6083,7 +6064,7 @@ dependencies = [ "serde", "serde_derive", "slog", - "sloggers 1.0.1", + "sloggers", "state_processing", "tempfile", "tree_hash 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/beacon_node/beacon_chain/Cargo.toml b/beacon_node/beacon_chain/Cargo.toml index 6de43f88c6e..6e9761dc216 100644 --- a/beacon_node/beacon_chain/Cargo.toml +++ b/beacon_node/beacon_chain/Cargo.toml @@ -31,7 +31,7 @@ serde_derive = "1.0.116" serde_yaml = "0.8.13" serde_json = "1.0.58" slog = { version = "2.5.2", features = ["max_level_trace"] } -sloggers = "1.0.1" +sloggers = "2.0.2" slot_clock = { path = "../../common/slot_clock" } eth2_hashing = "0.2.0" eth2_ssz = "0.3.0" diff --git a/beacon_node/client/Cargo.toml b/beacon_node/client/Cargo.toml index 25d51e89e5b..16328cf88ea 100644 --- a/beacon_node/client/Cargo.toml +++ b/beacon_node/client/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Sigma Prime "] edition = "2018" [dev-dependencies] -sloggers = "1.0.1" +sloggers = "2.0.2" toml = "0.5.6" [dependencies] diff --git a/beacon_node/eth1/Cargo.toml b/beacon_node/eth1/Cargo.toml index ba05d11182c..d0f11e22725 100644 --- a/beacon_node/eth1/Cargo.toml +++ b/beacon_node/eth1/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" eth1_test_rig = { path = "../../testing/eth1_test_rig" } toml = "0.5.6" web3 = { version = "0.17.0", default-features = false, features = ["http-tls", "signing", "ws-tls-tokio"] } -sloggers = "1.0.1" +sloggers = "2.0.2" environment = { path = "../../lighthouse/environment" } [dependencies] diff --git a/beacon_node/network/Cargo.toml b/beacon_node/network/Cargo.toml index 6d97040bd13..902cdcd7745 100644 --- a/beacon_node/network/Cargo.toml +++ b/beacon_node/network/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Sigma Prime "] edition = "2018" [dev-dependencies] -sloggers = "1.0.1" +sloggers = "2.0.2" genesis = { path = "../genesis" } lazy_static = "1.4.0" matches = "0.1.8" diff --git a/beacon_node/store/Cargo.toml b/beacon_node/store/Cargo.toml index b906909a057..c7a45885988 100644 --- a/beacon_node/store/Cargo.toml +++ b/beacon_node/store/Cargo.toml @@ -24,5 +24,5 @@ serde_derive = "1.0.116" lazy_static = "1.4.0" lighthouse_metrics = { path = "../../common/lighthouse_metrics" } lru = "0.6.0" -sloggers = "1.0.1" +sloggers = "2.0.2" directory = { path = "../../common/directory" } diff --git a/boot_node/Cargo.toml b/boot_node/Cargo.toml index e0d4fa66fa7..7e23a4f4d14 100644 --- a/boot_node/Cargo.toml +++ b/boot_node/Cargo.toml @@ -12,7 +12,7 @@ types = { path = "../consensus/types" } eth2_network_config = { path = "../common/eth2_network_config" } eth2_ssz = "0.3.0" slog = "2.5.2" -sloggers = "1.0.1" +sloggers = "2.0.2" tokio = "1.10.0" log = "0.4.11" slog-term = "2.6.0" diff --git a/lighthouse/Cargo.toml b/lighthouse/Cargo.toml index c393c2b4696..4ceb1b6e963 100644 --- a/lighthouse/Cargo.toml +++ b/lighthouse/Cargo.toml @@ -21,7 +21,7 @@ spec-minimal = [] beacon_node = { "path" = "../beacon_node" } tokio = "1.10.0" slog = { version = "2.5.2", features = ["max_level_trace"] } -sloggers = "1.0.1" +sloggers = "2.0.2" types = { "path" = "../consensus/types" } bls = { path = "../crypto/bls" } eth2_hashing = "0.2.0" diff --git a/lighthouse/environment/Cargo.toml b/lighthouse/environment/Cargo.toml index 93f9511cfdb..52e68f8a64c 100644 --- a/lighthouse/environment/Cargo.toml +++ b/lighthouse/environment/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] tokio = { version = "1.10.0", features = ["macros", "rt", "rt-multi-thread", "signal" ] } slog = { version = "2.5.2", features = ["max_level_trace"] } -sloggers = "1.0.1" +sloggers = "2.0.2" types = { path = "../../consensus/types" } eth2_config = { path = "../../common/eth2_config" } task_executor = { path = "../../common/task_executor" } diff --git a/slasher/Cargo.toml b/slasher/Cargo.toml index ebb858a17c7..1b08a2f2acc 100644 --- a/slasher/Cargo.toml +++ b/slasher/Cargo.toml @@ -21,7 +21,7 @@ safe_arith = { path = "../consensus/safe_arith" } serde = "1.0" serde_derive = "1.0" slog = "2.5.2" -sloggers = "*" +sloggers = "2.0.2" tree_hash = "0.3.0" tree_hash_derive = "0.3.1" types = { path = "../consensus/types" }