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>
This commit is contained in:
Oliver Tale-Yazdi
2024-02-12 12:19:20 +01:00
committed by GitHub
parent 8362a6810d
commit e80c24733f
200 changed files with 200 additions and 199 deletions
+1 -1
View File
@@ -20,7 +20,7 @@ crate-type = ["cdylib", "rlib"]
[dependencies]
cfg-if = "1.0"
clap = { version = "4.4.18", features = ["derive"], optional = true }
log = "0.4.17"
log = { workspace = true, default-features = true }
thiserror = "1.0.48"
futures = "0.3.21"
pyro = { package = "pyroscope", version = "0.5.3", optional = true }
@@ -51,5 +51,5 @@ polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
assert_matches = "1.4.0"
kvdb-memorydb = "0.13.0"
test-helpers = { package = "polkadot-primitives-test-helpers", path = "../../../primitives/test-helpers" }
log = "0.4.17"
log = { workspace = true, default-features = true }
env_logger = "0.9.0"
+1 -1
View File
@@ -28,7 +28,7 @@ sp-consensus = { path = "../../../../substrate/primitives/consensus/common", def
polkadot-node-jaeger = { path = "../../jaeger" }
[dev-dependencies]
log = "0.4.17"
log = { workspace = true, default-features = true }
env_logger = "0.9.0"
assert_matches = "1.4.0"
kvdb-memorydb = "0.13.0"
+1 -1
View File
@@ -19,5 +19,5 @@ sc-network = { path = "../../../substrate/client/network" }
sp-core = { path = "../../../substrate/primitives/core" }
thiserror = "1.0.48"
tokio = "1.24.2"
log = "0.4.17"
log = { workspace = true, default-features = true }
parity-scale-codec = { version = "3.6.1", default-features = false }
+1 -1
View File
@@ -24,7 +24,7 @@ sc-tracing = { path = "../../../substrate/client/tracing" }
codec = { package = "parity-scale-codec", version = "3.6.1" }
primitives = { package = "polkadot-primitives", path = "../../primitives" }
bs58 = { version = "0.5.0", features = ["alloc"] }
log = "0.4.17"
log = { workspace = true, default-features = true }
[dev-dependencies]
assert_cmd = "2.0.4"
@@ -38,4 +38,4 @@ schnorrkel = { version = "0.11.4", default-features = false }
rand_core = "0.6.2"
rand_chacha = "0.3.1"
env_logger = "0.9.0"
log = "0.4.17"
log = { workspace = true, default-features = true }
@@ -32,7 +32,7 @@ sc-network = { path = "../../../../substrate/client/network" }
assert_matches = "1.4.0"
env_logger = "0.9.0"
futures-timer = "3.0.2"
log = "0.4.17"
log = { workspace = true, default-features = true }
sp-core = { path = "../../../../substrate/primitives/core" }
sp-keyring = { path = "../../../../substrate/primitives/keyring" }
@@ -29,7 +29,7 @@ sp-authority-discovery = { path = "../../../../substrate/primitives/authority-di
sp-keystore = { path = "../../../../substrate/primitives/keystore" }
sp-keyring = { path = "../../../../substrate/primitives/keyring" }
maplit = "1.0.2"
log = "0.4.17"
log = { workspace = true, default-features = true }
env_logger = "0.9.0"
assert_matches = "1.4.0"
rand_chacha = "0.3.1"
@@ -29,7 +29,7 @@ thiserror = "1.0.48"
tokio-util = "0.7.1"
[dev-dependencies]
log = "0.4.17"
log = { workspace = true, default-features = true }
env_logger = "0.9.0"
assert_matches = "1.4.0"
+1 -1
View File
@@ -83,7 +83,7 @@ futures = "0.3.21"
hex-literal = "0.4.1"
is_executable = "1.0.1"
gum = { package = "tracing-gum", path = "../gum" }
log = "0.4.17"
log = { workspace = true, default-features = true }
schnellru = "0.2.1"
serde = { version = "1.0.195", features = ["derive"] }
serde_json = "1.0.111"
+1 -1
View File
@@ -43,7 +43,7 @@ sha1 = "0.10.6"
hex = "0.4.3"
gum = { package = "tracing-gum", path = "../gum" }
polkadot-erasure-coding = { package = "polkadot-erasure-coding", path = "../../erasure-coding" }
log = "0.4.17"
log = { workspace = true, default-features = true }
env_logger = "0.9.0"
rand = "0.8.5"
# `rand` only supports uniform distribution, we need normal distribution for latency.
+1 -1
View File
@@ -46,7 +46,7 @@ parity-db = { version = "0.4.12" }
assert_matches = "1.4.0"
env_logger = "0.9.0"
futures = { version = "0.3.21", features = ["thread-pool"] }
log = "0.4.17"
log = { workspace = true, default-features = true }
polkadot-node-subsystem-test-helpers = { path = "../subsystem-test-helpers" }
lazy_static = "1.4.0"
polkadot-primitives-test-helpers = { path = "../../primitives/test-helpers" }
@@ -19,7 +19,7 @@ parity-scale-codec = { version = "3.6.1", default-features = false, features = [
clap = { version = "4.4.18", features = ["derive"] }
futures = "0.3.21"
futures-timer = "3.0.2"
log = "0.4.17"
log = { workspace = true, default-features = true }
test-parachain-adder = { path = ".." }
polkadot-primitives = { path = "../../../../primitives" }
@@ -17,7 +17,7 @@ parity-scale-codec = { version = "3.6.1", default-features = false, features = [
sp-std = { path = "../../../../substrate/primitives/std", default-features = false }
tiny-keccak = { version = "2.0.2", features = ["keccak"] }
dlmalloc = { version = "0.2.4", features = ["global"] }
log = { version = "0.4.17", default-features = false }
log = { workspace = true }
# We need to make sure the global allocator is disabled until we have support of full substrate externalities
sp-io = { path = "../../../../substrate/primitives/io", default-features = false, features = ["disable_allocator"] }
@@ -19,7 +19,7 @@ parity-scale-codec = { version = "3.6.1", default-features = false, features = [
clap = { version = "4.4.18", features = ["derive"] }
futures = "0.3.21"
futures-timer = "3.0.2"
log = "0.4.17"
log = { workspace = true, default-features = true }
test-parachain-undying = { path = ".." }
polkadot-primitives = { path = "../../../../primitives" }
+1 -1
View File
@@ -13,7 +13,7 @@ workspace = true
impl-trait-for-tuples = "0.2.2"
bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] }
parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive"] }
log = { version = "0.4.17", default-features = false }
log = { workspace = true }
rustc-hex = { version = "2.1.0", default-features = false }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.195", default-features = false, features = ["alloc"] }
+1 -1
View File
@@ -13,7 +13,7 @@ workspace = true
impl-trait-for-tuples = "0.2.2"
bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] }
parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive", "max-encoded-len"] }
log = { version = "0.4.17", default-features = false }
log = { workspace = true }
rustc-hex = { version = "2.1.0", default-features = false }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.195", default-features = false, features = ["alloc", "derive"] }
+1 -1
View File
@@ -13,7 +13,7 @@ workspace = true
[dependencies]
parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive", "max-encoded-len"] }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
log = { version = "0.4.17", default-features = false }
log = { workspace = true }
serde = { version = "1.0.195", default-features = false }
serde_derive = { version = "1.0.117", optional = true }
static_assertions = "1.1.0"
+1 -1
View File
@@ -13,7 +13,7 @@ workspace = true
[dependencies]
bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] }
parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive"] }
log = { version = "0.4.17", default-features = false }
log = { workspace = true }
rustc-hex = { version = "2.1.0", default-features = false }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.195", default-features = false }
+1 -1
View File
@@ -14,7 +14,7 @@ workspace = true
bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] }
parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive", "max-encoded-len"] }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
log = { version = "0.4.17", default-features = false }
log = { workspace = true }
rustc-hex = { version = "2.1.0", default-features = false }
serde = { version = "1.0.195", default-features = false }
serde_derive = { version = "1.0.117", optional = true }
@@ -19,5 +19,5 @@ frame-system = { path = "../../../../substrate/frame/system" }
sp-core = { path = "../../../../substrate/primitives/core" }
clap = { version = "4.4.18", features = ["derive"] }
log = "0.4.17"
log = { workspace = true, default-features = true }
tokio = { version = "1.24.2", features = ["macros"] }
+1 -1
View File
@@ -14,7 +14,7 @@ array-bytes = "6.1"
bounded-collections = { version = "0.2.0", default-features = false, features = ["serde"] }
derivative = { version = "2.2.0", default-features = false, features = ["use_core"] }
impl-trait-for-tuples = "0.2.2"
log = { version = "0.4.17", default-features = false }
log = { workspace = true }
parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive", "max-encoded-len"] }
scale-info = { version = "2.10.0", default-features = false, features = ["derive", "serde"] }
sp-weights = { path = "../../substrate/primitives/weights", default-features = false, features = ["serde"] }
@@ -24,7 +24,7 @@ xcm-executor = { package = "staging-xcm-executor", path = "../xcm-executor", def
frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false }
xcm = { package = "staging-xcm", path = "..", default-features = false }
xcm-builder = { package = "staging-xcm-builder", path = "../xcm-builder", default-features = false }
log = "0.4.17"
log = { workspace = true, default-features = true }
[dev-dependencies]
pallet-balances = { path = "../../../substrate/frame/balances" }
+1 -1
View File
@@ -14,7 +14,7 @@ bounded-collections = { version = "0.2.0", default-features = false }
codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.195", optional = true, features = ["derive"] }
log = { version = "0.4.17", default-features = false }
log = { workspace = true }
frame-support = { path = "../../../substrate/frame/support", default-features = false }
frame-system = { path = "../../../substrate/frame/system", default-features = false }
+1 -1
View File
@@ -23,7 +23,7 @@ sp-weights = { path = "../../../substrate/primitives/weights", default-features
frame-support = { path = "../../../substrate/frame/support", default-features = false }
frame-system = { path = "../../../substrate/frame/system", default-features = false }
pallet-transaction-payment = { path = "../../../substrate/frame/transaction-payment", default-features = false }
log = { version = "0.4.17", default-features = false }
log = { workspace = true }
# Polkadot dependencies
polkadot-parachain-primitives = { path = "../../parachain", default-features = false }
+1 -1
View File
@@ -22,7 +22,7 @@ sp-core = { path = "../../../substrate/primitives/core", default-features = fals
sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
sp-weights = { path = "../../../substrate/primitives/weights", default-features = false }
frame-support = { path = "../../../substrate/frame/support", default-features = false }
log = { version = "0.4.17", default-features = false }
log = { workspace = true }
frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false, optional = true }
[features]
@@ -12,7 +12,7 @@ workspace = true
[dependencies]
codec = { package = "parity-scale-codec", version = "3.6.1" }
scale-info = { version = "2.10.0", features = ["derive"] }
log = { version = "0.4.14", default-features = false }
log = { workspace = true }
frame-system = { path = "../../../../substrate/frame/system" }
frame-support = { path = "../../../../substrate/frame/support" }