Lift dependencies to the workspace (Part 1) (#2070)

Changes (partial https://github.com/paritytech/polkadot-sdk/issues/994): - Set log to `0.4.20` everywhere - Lift `log` to the workspace Starting with a simpler one after seeing https://github.com/paritytech/polkadot-sdk/pull/2065 from @jsdw. This sets the `default-features` to `false` in the root and then overwrites that in each create to its original value. This is necessary since otherwise the `default` features are additive and its impossible to disable them in the crate again once they are enabled in the workspace. I am using a tool to do this, so its mostly a test to see that it works as expected. --------- Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
2026-06-12 03:01:07 +00:00 · 2024-02-12 12:19:20 +01:00
parent 8362a6810d
commit e80c24733f
200 changed files with 200 additions and 199 deletions
@@ -17,7 +17,7 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]

 [dependencies]
-log = "0.4.17"
+log = { workspace = true, default-features = true }
 thiserror = "1.0.48"
 sp-core = { path = "../../primitives/core" }
 sp-wasm-interface = { path = "../../primitives/wasm-interface" }
@@ -22,7 +22,7 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 ] }
 fnv = "1.0.6"
 futures = "0.3.21"
-log = "0.4.17"
+log = { workspace = true, default-features = true }
 parking_lot = "0.12.1"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus" }
 sc-executor = { path = "../executor" }
@@ -29,7 +29,7 @@ multihash = { version = "0.18.1", default-features = false, features = [
 	"sha2",
 	"std",
 ] }
-log = "0.4.17"
+log = { workspace = true, default-features = true }
 prost = "0.12"
 rand = "0.8.5"
 thiserror = "1.0"
@@ -19,7 +19,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "3.6.1" }
 futures = "0.3.21"
 futures-timer = "3.0.1"
-log = "0.4.17"
+log = { workspace = true, default-features = true }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus" }
 sc-block-builder = { path = "../block-builder" }
 sc-proposer-metrics = { path = "../proposer-metrics" }
@@ -32,7 +32,7 @@ sp-crypto-hashing = { path = "../../primitives/crypto/hashing" }
 sp-genesis-builder = { path = "../../primitives/genesis-builder" }
 sp-runtime = { path = "../../primitives/runtime" }
 sp-state-machine = { path = "../../primitives/state-machine" }
-log = { version = "0.4.17", default-features = false }
+log = { workspace = true }
 array-bytes = { version = "6.1" }
 docify = "0.2.7"

@@ -23,7 +23,7 @@ fdlimit = "0.3.0"
 futures = "0.3.21"
 itertools = "0.10.3"
 libp2p-identity = { version = "0.1.3", features = ["ed25519", "peerid"] }
-log = "0.4.17"
+log = { workspace = true, default-features = true }
 names = { version = "0.14.0", default-features = false }
 parity-scale-codec = "3.6.1"
 rand = "0.8.5"
@@ -19,7 +19,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 async-trait = "0.1.74"
 codec = { package = "parity-scale-codec", version = "3.6.1" }
 futures = "0.3.21"
-log = "0.4.17"
+log = { workspace = true, default-features = true }
 thiserror = "1.0"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus" }
 sc-block-builder = { path = "../../block-builder" }
@@ -20,7 +20,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 async-trait = "0.1.74"
 codec = { package = "parity-scale-codec", version = "3.6.1", features = ["derive"] }
 futures = "0.3.21"
-log = "0.4.17"
+log = { workspace = true, default-features = true }
 num-bigint = "0.4.3"
 num-rational = "0.4.1"
 num-traits = "0.2.17"
@@ -18,7 +18,7 @@ async-trait = "0.1.74"
 codec = { package = "parity-scale-codec", version = "3.6.1", features = ["derive"] }
 fnv = "1.0.6"
 futures = "0.3"
-log = "0.4"
+log = { workspace = true, default-features = true }
 parking_lot = "0.12.1"
 thiserror = "1.0"
 wasm-timer = "0.2.5"
@@ -15,7 +15,7 @@ workspace = true
 codec = { package = "parity-scale-codec", version = "3.6.1", features = ["derive"] }
 futures = "0.3.21"
 jsonrpsee = { version = "0.20.3", features = ["client-core", "macros", "server"] }
-log = "0.4"
+log = { workspace = true, default-features = true }
 parking_lot = "0.12.1"
 serde = { version = "1.0.195", features = ["derive"] }
 thiserror = "1.0"
@@ -20,7 +20,7 @@ async-trait = "0.1.74"
 futures = { version = "0.3.21", features = ["thread-pool"] }
 futures-timer = "3.0.1"
 libp2p-identity = { version = "0.1.3", features = ["ed25519", "peerid"] }
-log = "0.4.17"
+log = { workspace = true, default-features = true }
 mockall = "0.11.3"
 parking_lot = "0.12.1"
 serde = { version = "1.0", features = ["derive"] }
@@ -24,7 +24,7 @@ dyn-clone = "1.0"
 finality-grandpa = { version = "0.16.2", features = ["derive-codec"] }
 futures = "0.3.21"
 futures-timer = "3.0.1"
-log = "0.4.17"
+log = { workspace = true, default-features = true }
 parity-scale-codec = { version = "3.6.1", features = ["derive"] }
 parking_lot = "0.12.1"
 rand = "0.8.5"
@@ -16,7 +16,7 @@ workspace = true
 finality-grandpa = { version = "0.16.2", features = ["derive-codec"] }
 futures = "0.3.16"
 jsonrpsee = { version = "0.20.3", features = ["client-core", "macros", "server"] }
-log = "0.4.8"
+log = { workspace = true, default-features = true }
 parity-scale-codec = { version = "3.6.1", features = ["derive"] }
 serde = { version = "1.0.195", features = ["derive"] }
 thiserror = "1.0"
@@ -22,7 +22,7 @@ async-trait = "0.1.74"
 codec = { package = "parity-scale-codec", version = "3.6.1" }
 futures = "0.3.21"
 futures-timer = "3.0.1"
-log = "0.4.17"
+log = { workspace = true, default-features = true }
 serde = { version = "1.0", features = ["derive"] }
 thiserror = "1.0"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus" }
@@ -20,7 +20,7 @@ async-trait = "0.1.74"
 codec = { package = "parity-scale-codec", version = "3.6.1", features = ["derive"] }
 futures = "0.3.21"
 futures-timer = "3.0.1"
-log = "0.4.17"
+log = { workspace = true, default-features = true }
 parking_lot = "0.12.1"
 thiserror = "1.0"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus" }
@@ -21,7 +21,7 @@ async-trait = "0.1.74"
 codec = { package = "parity-scale-codec", version = "3.6.1" }
 futures = "0.3.21"
 futures-timer = "3.0.1"
-log = "0.4.17"
+log = { workspace = true, default-features = true }
 sc-client-api = { path = "../../api" }
 sc-consensus = { path = "../common" }
 sc-telemetry = { path = "../../telemetry" }
@@ -24,7 +24,7 @@ kvdb = "0.13.0"
 kvdb-memorydb = "0.13.0"
 kvdb-rocksdb = { version = "0.19.0", optional = true }
 linked-hash-map = "0.5.4"
-log = "0.4.17"
+log = { workspace = true, default-features = true }
 parity-db = "0.4.12"
 parking_lot = "0.12.1"
 sc-client-api = { path = "../api" }
@@ -16,7 +16,7 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]

 [dependencies]
-log = "0.4.17"
+log = { workspace = true, default-features = true }
 cfg-if = "1.0"
 libc = "0.2.152"
 parking_lot = "0.12.1"
@@ -19,7 +19,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 ansi_term = "0.12.1"
 futures = "0.3.21"
 futures-timer = "3.0.1"
-log = "0.4.17"
+log = { workspace = true, default-features = true }
 sc-client-api = { path = "../api" }
 sc-network-common = { path = "../network/common" }
 sc-network-sync = { path = "../network/sync" }
@@ -16,7 +16,7 @@ workspace = true
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1" }
 futures = "0.3"
-log = "0.4"
+log = { workspace = true, default-features = true }
 sp-api = { path = "../../primitives/api" }
 sp-blockchain = { path = "../../primitives/blockchain" }
 sc-client-api = { path = "../api" }
@@ -24,7 +24,7 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 futures = "0.3.25"
 futures-timer = "3.0.2"
 libp2p-identity = { version = "0.1.3", features = ["peerid"] }
-log = "0.4.17"
+log = { workspace = true, default-features = true }
 mixnet = "0.7.0"
 multiaddr = "0.17.1"
 parking_lot = "0.12.1"
@@ -21,7 +21,7 @@ ahash = "0.8.2"
 futures = "0.3.21"
 futures-timer = "3.0.1"
 libp2p = "0.51.4"
-log = "0.4.17"
+log = { workspace = true, default-features = true }
 schnellru = "0.2.1"
 tracing = "0.1.29"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus" }
@@ -30,7 +30,7 @@ futures-timer = "3.0.2"
 ip_network = "0.4.1"
 libp2p = { version = "0.51.4", features = ["dns", "identify", "kad", "macros", "mdns", "noise", "ping", "request-response", "tcp", "tokio", "websocket", "yamux"] }
 linked_hash_set = "0.1.3"
-log = "0.4.17"
+log = { workspace = true, default-features = true }
 mockall = "0.11.3"
 parking_lot = "0.12.1"
 partial_sort = "0.2.0"
@@ -23,7 +23,7 @@ async-channel = "1.8.0"
 cid = "0.9.0"
 futures = "0.3.21"
 libp2p-identity = { version = "0.1.3", features = ["peerid"] }
-log = "0.4.17"
+log = { workspace = true, default-features = true }
 prost = "0.12"
 thiserror = "1.0"
 unsigned-varint = { version = "0.7.1", features = ["asynchronous_codec", "futures"] }
@@ -26,7 +26,7 @@ codec = { package = "parity-scale-codec", version = "3.6.1", features = [
 ] }
 futures = "0.3.21"
 libp2p-identity = { version = "0.1.3", features = ["peerid"] }
-log = "0.4.16"
+log = { workspace = true, default-features = true }
 prost = "0.12"
 sp-blockchain = { path = "../../../primitives/blockchain" }
 sc-client-api = { path = "../../api" }
@@ -21,7 +21,7 @@ async-channel = "1.8.0"
 codec = { package = "parity-scale-codec", version = "3.6.1", features = ["derive"] }
 futures = "0.3.21"
 libp2p = "0.51.4"
-log = "0.4.17"
+log = { workspace = true, default-features = true }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus" }
 sc-network-common = { path = "../common" }
 sc-network-sync = { path = "../sync" }
@@ -26,7 +26,7 @@ codec = { package = "parity-scale-codec", version = "3.6.1", features = ["derive
 futures = "0.3.21"
 futures-timer = "3.0.2"
 libp2p = "0.51.4"
-log = "0.4.17"
+log = { workspace = true, default-features = true }
 mockall = "0.11.3"
 prost = "0.12"
 schnellru = "0.2.1"
@@ -21,7 +21,7 @@ async-trait = "0.1.74"
 futures = "0.3.21"
 futures-timer = "3.0.1"
 libp2p = "0.51.4"
-log = "0.4.17"
+log = { workspace = true, default-features = true }
 parking_lot = "0.12.1"
 rand = "0.8.5"
 sc-block-builder = { path = "../../block-builder" }
@@ -20,7 +20,7 @@ array-bytes = "6.1"
 codec = { package = "parity-scale-codec", version = "3.6.1", features = ["derive"] }
 futures = "0.3.21"
 libp2p = "0.51.4"
-log = "0.4.17"
+log = { workspace = true, default-features = true }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus" }
 sc-network = { path = ".." }
 sc-network-common = { path = "../common" }
@@ -42,7 +42,7 @@ sp-offchain = { path = "../../primitives/offchain" }
 sp-runtime = { path = "../../primitives/runtime" }
 sp-keystore = { path = "../../primitives/keystore" }
 sp-externalities = { path = "../../primitives/externalities" }
-log = "0.4.17"
+log = { workspace = true, default-features = true }

 [dev-dependencies]
 lazy_static = "1.4.0"
@@ -16,5 +16,5 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]

 [dependencies]
-log = "0.4.17"
+log = { workspace = true, default-features = true }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus" }
@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]

 [dependencies]
 jsonrpsee = { version = "0.20.3", features = ["server"] }
-log = "0.4.17"
+log = { workspace = true, default-features = true }
 serde_json = "1.0.111"
 tokio = { version = "1.22.0", features = ["parking_lot"] }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus" }
@@ -39,7 +39,7 @@ parking_lot = "0.12.1"
 tokio-stream = { version = "0.1.14", features = ["sync"] }
 tokio = { version = "1.22.0", features = ["sync"] }
 array-bytes = "6.1"
-log = "0.4.17"
+log = { workspace = true, default-features = true }
 futures-util = { version = "0.3.30", default-features = false }

 [dev-dependencies]
@@ -19,7 +19,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "3.6.1" }
 futures = "0.3.21"
 jsonrpsee = { version = "0.20.3", features = ["server"] }
-log = "0.4.17"
+log = { workspace = true, default-features = true }
 parking_lot = "0.12.1"
 serde_json = "1.0.111"
 sc-block-builder = { path = "../block-builder" }
@@ -33,7 +33,7 @@ thiserror = "1.0.48"
 futures = "0.3.21"
 rand = "0.8.5"
 parking_lot = "0.12.1"
-log = "0.4.17"
+log = { workspace = true, default-features = true }
 futures-timer = "3.0.1"
 exit-future = "0.2.0"
 pin-project = "1.0.12"
@@ -19,7 +19,7 @@ async-channel = "1.8.0"
 array-bytes = "6.1"
 fdlimit = "0.3.0"
 futures = "0.3.21"
-log = "0.4.17"
+log = { workspace = true, default-features = true }
 parity-scale-codec = "3.6.1"
 parking_lot = "0.12.1"
 tempfile = "3.1.0"
@@ -17,6 +17,6 @@ targets = ["x86_64-unknown-linux-gnu"]

 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", features = ["derive"] }
-log = "0.4.17"
+log = { workspace = true, default-features = true }
 parking_lot = "0.12.1"
 sp-core = { path = "../../primitives/core" }
@@ -16,7 +16,7 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]

 [dependencies]
-log = "0.4.17"
+log = { workspace = true, default-features = true }
 parking_lot = "0.12.1"
 parity-db = "0.4.12"
 tokio = { version = "1.22.0", features = ["time"] }
@@ -13,7 +13,7 @@ workspace = true

 [dependencies]
 clap = { version = "4.4.18", features = ["derive", "string"] }
-log = "0.4.17"
+log = { workspace = true, default-features = true }
 fs4 = "0.7.0"
 sp-core = { path = "../../primitives/core" }
 tokio = { version = "1.22.0", features = ["time"] }
@@ -19,7 +19,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 futures = "0.3.19"
 libc = "0.2"
-log = "0.4.17"
+log = { workspace = true, default-features = true }
 rand = "0.8.5"
 rand_pcg = "0.3.1"
 derive_more = "0.99"
@@ -20,7 +20,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 chrono = "0.4.31"
 futures = "0.3.21"
 libp2p = { version = "0.51.4", features = ["dns", "tcp", "tokio", "wasm-ext", "websocket"] }
-log = "0.4.17"
+log = { workspace = true, default-features = true }
 parking_lot = "0.12.1"
 pin-project = "1.0.12"
 sc-utils = { path = "../utils" }
@@ -22,7 +22,7 @@ chrono = "0.4.31"
 codec = { package = "parity-scale-codec", version = "3.6.1" }
 lazy_static = "1.4.0"
 libc = "0.2.152"
-log = { version = "0.4.17" }
+log = { workspace = true, default-features = true }
 parking_lot = "0.12.1"
 regex = "1.6.0"
 rustc-hash = "1.1.0"
@@ -21,7 +21,7 @@ codec = { package = "parity-scale-codec", version = "3.6.1" }
 futures = "0.3.21"
 futures-timer = "3.0.2"
 linked-hash-map = "0.5.4"
-log = "0.4.17"
+log = { workspace = true, default-features = true }
 parking_lot = "0.12.1"
 serde = { version = "1.0.195", features = ["derive"] }
 thiserror = "1.0.48"
@@ -15,7 +15,7 @@ workspace = true
 async-trait = "0.1.74"
 codec = { package = "parity-scale-codec", version = "3.6.1" }
 futures = "0.3.21"
-log = "0.4.17"
+log = { workspace = true, default-features = true }
 serde = { version = "1.0.195", features = ["derive"] }
 thiserror = "1.0.48"
 sp-blockchain = { path = "../../../primitives/blockchain" }
@@ -17,7 +17,7 @@ async-channel = "1.8.0"
 futures = "0.3.21"
 futures-timer = "3.0.2"
 lazy_static = "1.4.0"
-log = "0.4"
+log = { workspace = true, default-features = true }
 parking_lot = "0.12.1"
 prometheus = { version = "0.13.0", default-features = false }
 sp-arithmetic = { path = "../../primitives/arithmetic", default-features = false }