Lift dependencies to the workspace (Part 2/x) (#3366)

Lifting some more dependencies to the workspace. Just using the
most-often updated ones for now.
It can be reproduced locally.

```sh
# First you can check if there would be semver incompatible bumps (looks good in this case):
$ zepter transpose dependency lift-to-workspace --ignore-errors syn quote thiserror "regex:^serde.*"

# Then apply the changes:
$ zepter transpose dependency lift-to-workspace --version-resolver=highest syn quote thiserror "regex:^serde.*" --fix

# And format the changes:
$ taplo format --config .config/taplo.toml
```

---------

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
This commit is contained in:
Oliver Tale-Yazdi
2024-02-20 15:28:05 +01:00
committed by GitHub
parent ef6ac94f52
commit e89d0fca35
185 changed files with 283 additions and 274 deletions
+1 -1
View File
@@ -18,6 +18,6 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
log = { workspace = true, default-features = true }
thiserror = "1.0.48"
thiserror = { workspace = true }
sp-core = { path = "../../primitives/core" }
sp-wasm-interface = { path = "../../primitives/wasm-interface" }
+1 -1
View File
@@ -41,6 +41,6 @@ sp-storage = { path = "../../primitives/storage" }
sp-trie = { path = "../../primitives/trie" }
[dev-dependencies]
thiserror = "1.0.48"
thiserror = { workspace = true }
sp-test-primitives = { path = "../../primitives/test-primitives" }
substrate-test-runtime = { path = "../../test-utils/runtime" }
@@ -32,7 +32,7 @@ multihash = { version = "0.18.1", default-features = false, features = [
log = { workspace = true, default-features = true }
prost = "0.12"
rand = "0.8.5"
thiserror = "1.0"
thiserror = { workspace = true }
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus" }
sc-client-api = { path = "../api" }
sc-network = { path = "../network" }
+2 -2
View File
@@ -18,8 +18,8 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
memmap2 = "0.9.3"
serde = { version = "1.0.196", features = ["derive"] }
serde_json = "1.0.113"
serde = { features = ["derive"], workspace = true, default-features = true }
serde_json = { workspace = true, default-features = true }
sc-client-api = { path = "../api" }
sc-chain-spec-derive = { path = "derive" }
sc-executor = { path = "../executor" }
@@ -20,5 +20,5 @@ proc-macro = true
[dependencies]
proc-macro-crate = "3.0.0"
proc-macro2 = "1.0.56"
quote = "1.0.28"
syn = "2.0.49"
quote = { workspace = true }
syn = { workspace = true }
+3 -3
View File
@@ -29,9 +29,9 @@ parity-scale-codec = "3.6.1"
rand = "0.8.5"
regex = "1.6.0"
rpassword = "7.0.0"
serde = "1.0.196"
serde_json = "1.0.113"
thiserror = "1.0.48"
serde = { workspace = true, default-features = true }
serde_json = { workspace = true, default-features = true }
thiserror = { workspace = true }
bip39 = "2.0.0"
tokio = { version = "1.22.0", features = ["parking_lot", "rt-multi-thread", "signal"] }
sc-client-api = { path = "../api" }
+1 -1
View File
@@ -20,7 +20,7 @@ async-trait = "0.1.74"
codec = { package = "parity-scale-codec", version = "3.6.1" }
futures = "0.3.21"
log = { workspace = true, default-features = true }
thiserror = "1.0"
thiserror = { workspace = true }
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus" }
sc-block-builder = { path = "../../block-builder" }
sc-client-api = { path = "../../api" }
+1 -1
View File
@@ -25,7 +25,7 @@ num-bigint = "0.4.3"
num-rational = "0.4.1"
num-traits = "0.2.17"
parking_lot = "0.12.1"
thiserror = "1.0"
thiserror = { workspace = true }
fork-tree = { path = "../../../utils/fork-tree" }
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus" }
sc-client-api = { path = "../../api" }
@@ -18,8 +18,8 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
jsonrpsee = { version = "0.22", features = ["client-core", "macros", "server"] }
futures = "0.3.21"
serde = { version = "1.0.196", features = ["derive"] }
thiserror = "1.0"
serde = { features = ["derive"], workspace = true, default-features = true }
thiserror = { workspace = true }
sc-consensus-babe = { path = ".." }
sc-consensus-epochs = { path = "../../epochs" }
sc-rpc-api = { path = "../../../rpc-api" }
@@ -33,7 +33,7 @@ sp-keystore = { path = "../../../../primitives/keystore" }
sp-runtime = { path = "../../../../primitives/runtime" }
[dev-dependencies]
serde_json = "1.0.113"
serde_json = { workspace = true, default-features = true }
tokio = "1.22.0"
sc-consensus = { path = "../../common" }
sc-keystore = { path = "../../../keystore" }
+2 -2
View File
@@ -20,7 +20,7 @@ fnv = "1.0.6"
futures = "0.3"
log = { workspace = true, default-features = true }
parking_lot = "0.12.1"
thiserror = "1.0"
thiserror = { workspace = true }
wasm-timer = "0.2.5"
prometheus = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus" }
sc-client-api = { path = "../../api" }
@@ -44,7 +44,7 @@ tokio = "1.22.0"
[dev-dependencies]
serde = "1.0.196"
serde = { workspace = true, default-features = true }
tempfile = "3.1.0"
sc-block-builder = { path = "../../block-builder" }
sc-network-test = { path = "../../network/test" }
@@ -17,8 +17,8 @@ futures = "0.3.21"
jsonrpsee = { version = "0.22", features = ["client-core", "macros", "server"] }
log = { workspace = true, default-features = true }
parking_lot = "0.12.1"
serde = { version = "1.0.196", features = ["derive"] }
thiserror = "1.0"
serde = { features = ["derive"], workspace = true, default-features = true }
thiserror = { workspace = true }
sc-consensus-beefy = { path = ".." }
sp-consensus-beefy = { path = "../../../../primitives/consensus/beefy" }
sc-rpc = { path = "../../../rpc" }
@@ -26,7 +26,7 @@ sp-core = { path = "../../../../primitives/core" }
sp-runtime = { path = "../../../../primitives/runtime" }
[dev-dependencies]
serde_json = "1.0.113"
serde_json = { workspace = true, default-features = true }
sc-rpc = { path = "../../../rpc", features = ["test-helpers"] }
substrate-test-runtime-client = { path = "../../../../test-utils/runtime/client" }
tokio = { version = "1.22.0", features = ["macros"] }
+2 -2
View File
@@ -23,8 +23,8 @@ libp2p-identity = { version = "0.1.3", features = ["ed25519", "peerid"] }
log = { workspace = true, default-features = true }
mockall = "0.11.3"
parking_lot = "0.12.1"
serde = { version = "1.0", features = ["derive"] }
thiserror = "1.0.48"
serde = { features = ["derive"], workspace = true, default-features = true }
thiserror = { workspace = true }
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus" }
sc-client-api = { path = "../../api" }
sc-utils = { path = "../../utils" }
@@ -28,8 +28,8 @@ log = { workspace = true, default-features = true }
parity-scale-codec = { version = "3.6.1", features = ["derive"] }
parking_lot = "0.12.1"
rand = "0.8.5"
serde_json = "1.0.113"
thiserror = "1.0"
serde_json = { workspace = true, default-features = true }
thiserror = { workspace = true }
fork-tree = { path = "../../../utils/fork-tree" }
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus" }
sc-block-builder = { path = "../../block-builder" }
@@ -57,7 +57,7 @@ sp-runtime = { path = "../../../primitives/runtime" }
[dev-dependencies]
assert_matches = "1.3.0"
finality-grandpa = { version = "0.16.2", features = ["derive-codec", "test-helpers"] }
serde = "1.0.196"
serde = { workspace = true, default-features = true }
tokio = "1.22.0"
sc-network = { path = "../../network" }
sc-network-test = { path = "../../network/test" }
@@ -18,8 +18,8 @@ futures = "0.3.16"
jsonrpsee = { version = "0.22", features = ["client-core", "macros", "server"] }
log = { workspace = true, default-features = true }
parity-scale-codec = { version = "3.6.1", features = ["derive"] }
serde = { version = "1.0.196", features = ["derive"] }
thiserror = "1.0"
serde = { features = ["derive"], workspace = true, default-features = true }
thiserror = { workspace = true }
sc-client-api = { path = "../../../api" }
sc-consensus-grandpa = { path = ".." }
sc-rpc = { path = "../../../rpc" }
@@ -23,8 +23,8 @@ codec = { package = "parity-scale-codec", version = "3.6.1" }
futures = "0.3.21"
futures-timer = "3.0.1"
log = { workspace = true, default-features = true }
serde = { version = "1.0", features = ["derive"] }
thiserror = "1.0"
serde = { features = ["derive"], workspace = true, default-features = true }
thiserror = { workspace = true }
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus" }
sc-client-api = { path = "../../api" }
sc-consensus = { path = "../common" }
+1 -1
View File
@@ -22,7 +22,7 @@ futures = "0.3.21"
futures-timer = "3.0.1"
log = { workspace = true, default-features = true }
parking_lot = "0.12.1"
thiserror = "1.0"
thiserror = { workspace = true }
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus" }
sc-client-api = { path = "../../api" }
sc-consensus = { path = "../common" }
+1 -1
View File
@@ -17,7 +17,7 @@ workspace = true
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
thiserror = "1.0.48"
thiserror = { workspace = true }
wasm-instrument = "0.4"
sc-allocator = { path = "../../allocator" }
sp-maybe-compressed-blob = { path = "../../../primitives/maybe-compressed-blob" }
+2 -2
View File
@@ -19,8 +19,8 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
array-bytes = "6.1"
parking_lot = "0.12.1"
serde_json = "1.0.113"
thiserror = "1.0"
serde_json = { workspace = true, default-features = true }
thiserror = { workspace = true }
sp-application-crypto = { path = "../../primitives/application-crypto" }
sp-core = { path = "../../primitives/core" }
sp-keystore = { path = "../../primitives/keystore" }
@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { package = "parity-scale-codec", version = "3.6.1" }
jsonrpsee = { version = "0.22", features = ["client-core", "macros", "server"] }
serde = { version = "1.0.196", features = ["derive"] }
serde = { features = ["derive"], workspace = true, default-features = true }
sp-api = { path = "../../../primitives/api" }
sp-blockchain = { path = "../../../primitives/blockchain" }
sp-core = { path = "../../../primitives/core" }
@@ -25,4 +25,4 @@ sp-mmr-primitives = { path = "../../../primitives/merkle-mountain-range" }
sp-runtime = { path = "../../../primitives/runtime" }
[dev-dependencies]
serde_json = "1.0.113"
serde_json = { workspace = true, default-features = true }
+1 -1
View File
@@ -37,4 +37,4 @@ sp-core = { path = "../../primitives/core" }
sp-keystore = { path = "../../primitives/keystore" }
sp-mixnet = { path = "../../primitives/mixnet" }
sp-runtime = { path = "../../primitives/runtime" }
thiserror = "1.0"
thiserror = { workspace = true }
+3 -3
View File
@@ -36,10 +36,10 @@ parking_lot = "0.12.1"
partial_sort = "0.2.0"
pin-project = "1.0.12"
rand = "0.8.5"
serde = { version = "1.0.196", features = ["derive"] }
serde_json = "1.0.113"
serde = { features = ["derive"], workspace = true, default-features = true }
serde_json = { workspace = true, default-features = true }
smallvec = "1.11.0"
thiserror = "1.0"
thiserror = { workspace = true }
tokio = { version = "1.22.0", features = ["macros", "sync"] }
tokio-stream = "0.1.7"
unsigned-varint = { version = "0.7.1", features = ["asynchronous_codec", "futures"] }
+1 -1
View File
@@ -25,7 +25,7 @@ futures = "0.3.21"
libp2p-identity = { version = "0.1.3", features = ["peerid"] }
log = { workspace = true, default-features = true }
prost = "0.12"
thiserror = "1.0"
thiserror = { workspace = true }
unsigned-varint = { version = "0.7.1", features = ["asynchronous_codec", "futures"] }
sc-client-api = { path = "../../api" }
sc-network = { path = ".." }
+1 -1
View File
@@ -33,4 +33,4 @@ sc-client-api = { path = "../../api" }
sc-network = { path = ".." }
sp-core = { path = "../../../primitives/core" }
sp-runtime = { path = "../../../primitives/runtime" }
thiserror = "1.0"
thiserror = { workspace = true }
+1 -1
View File
@@ -31,7 +31,7 @@ mockall = "0.11.3"
prost = "0.12"
schnellru = "0.2.1"
smallvec = "1.11.0"
thiserror = "1.0"
thiserror = { workspace = true }
tokio-stream = "0.1.14"
tokio = { version = "1.32.0", features = ["macros", "time"] }
fork-tree = { path = "../../../utils/fork-tree" }
+3 -3
View File
@@ -18,9 +18,9 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { package = "parity-scale-codec", version = "3.6.1" }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.196", features = ["derive"] }
serde_json = "1.0.113"
thiserror = "1.0"
serde = { features = ["derive"], workspace = true, default-features = true }
serde_json = { workspace = true, default-features = true }
thiserror = { workspace = true }
sc-chain-spec = { path = "../chain-spec" }
sc-mixnet = { path = "../mixnet" }
sc-transaction-pool-api = { path = "../transaction-pool/api" }
+1 -1
View File
@@ -18,7 +18,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
jsonrpsee = { version = "0.22", features = ["server"] }
log = { workspace = true, default-features = true }
serde_json = "1.0.113"
serde_json = { workspace = true, default-features = true }
tokio = { version = "1.22.0", features = ["parking_lot"] }
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus" }
tower-http = { version = "0.4.0", features = ["cors"] }
+3 -3
View File
@@ -31,8 +31,8 @@ sc-client-api = { path = "../api" }
sc-utils = { path = "../utils" }
sc-rpc = { path = "../rpc" }
codec = { package = "parity-scale-codec", version = "3.6.1" }
thiserror = "1.0"
serde = "1.0"
thiserror = { workspace = true }
serde = { workspace = true, default-features = true }
hex = "0.4"
futures = "0.3.21"
parking_lot = "0.12.1"
@@ -44,7 +44,7 @@ futures-util = { version = "0.3.30", default-features = false }
rand = "0.8.5"
[dev-dependencies]
serde_json = "1.0.113"
serde_json = { workspace = true, default-features = true }
tokio = { version = "1.22.0", features = ["macros"] }
substrate-test-runtime-client = { path = "../../test-utils/runtime/client" }
substrate-test-runtime = { path = "../../test-utils/runtime" }
+1 -1
View File
@@ -21,7 +21,7 @@ futures = "0.3.21"
jsonrpsee = { version = "0.22", features = ["server"] }
log = { workspace = true, default-features = true }
parking_lot = "0.12.1"
serde_json = "1.0.113"
serde_json = { workspace = true, default-features = true }
sc-block-builder = { path = "../block-builder" }
sc-chain-spec = { path = "../chain-spec" }
sc-client-api = { path = "../api" }
+3 -3
View File
@@ -29,7 +29,7 @@ runtime-benchmarks = [
[dependencies]
jsonrpsee = { version = "0.22", features = ["server"] }
thiserror = "1.0.48"
thiserror = { workspace = true }
futures = "0.3.21"
rand = "0.8.5"
parking_lot = "0.12.1"
@@ -37,8 +37,8 @@ log = { workspace = true, default-features = true }
futures-timer = "3.0.1"
exit-future = "0.2.0"
pin-project = "1.0.12"
serde = "1.0.196"
serde_json = "1.0.113"
serde = { workspace = true, default-features = true }
serde_json = { workspace = true, default-features = true }
sc-keystore = { path = "../keystore" }
sp-runtime = { path = "../../primitives/runtime" }
sp-trie = { path = "../../primitives/trie" }
+1 -1
View File
@@ -17,4 +17,4 @@ log = { workspace = true, default-features = true }
fs4 = "0.7.0"
sp-core = { path = "../../primitives/core" }
tokio = { version = "1.22.0", features = ["time"] }
thiserror = "1.0.48"
thiserror = { workspace = true }
+3 -3
View File
@@ -17,9 +17,9 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { package = "parity-scale-codec", version = "3.6.1" }
jsonrpsee = { version = "0.22", features = ["client-core", "macros", "server"] }
serde = { version = "1.0.196", features = ["derive"] }
serde_json = "1.0.113"
thiserror = "1.0.48"
serde = { features = ["derive"], workspace = true, default-features = true }
serde_json = { workspace = true, default-features = true }
thiserror = { workspace = true }
sc-chain-spec = { path = "../chain-spec" }
sc-client-api = { path = "../api" }
sc-consensus-babe = { path = "../consensus/babe" }
+2 -2
View File
@@ -24,8 +24,8 @@ rand = "0.8.5"
rand_pcg = "0.3.1"
derive_more = "0.99"
regex = "1"
serde = { version = "1.0.196", features = ["derive"] }
serde_json = "1.0.113"
serde = { features = ["derive"], workspace = true, default-features = true }
serde_json = { workspace = true, default-features = true }
sc-telemetry = { path = "../telemetry" }
sp-core = { path = "../../primitives/core" }
sp-crypto-hashing = { path = "../../primitives/crypto/hashing" }
+3 -3
View File
@@ -25,7 +25,7 @@ parking_lot = "0.12.1"
pin-project = "1.0.12"
sc-utils = { path = "../utils" }
rand = "0.8.5"
serde = { version = "1.0.196", features = ["derive"] }
serde_json = "1.0.113"
thiserror = "1.0.48"
serde = { features = ["derive"], workspace = true, default-features = true }
serde_json = { workspace = true, default-features = true }
thiserror = { workspace = true }
wasm-timer = "0.2.5"
+2 -2
View File
@@ -26,8 +26,8 @@ log = { workspace = true, default-features = true }
parking_lot = "0.12.1"
regex = "1.6.0"
rustc-hash = "1.1.0"
serde = "1.0.196"
thiserror = "1.0.48"
serde = { workspace = true, default-features = true }
thiserror = { workspace = true }
tracing = "0.1.29"
tracing-log = "0.1.3"
tracing-subscriber = { version = "0.2.25", features = ["parking_lot"] }
@@ -20,5 +20,5 @@ proc-macro = true
[dependencies]
proc-macro-crate = "3.0.0"
proc-macro2 = "1.0.56"
quote = { version = "1.0.28", features = ["proc-macro"] }
syn = { version = "2.0.49", features = ["extra-traits", "full", "parsing", "proc-macro"] }
quote = { features = ["proc-macro"], workspace = true }
syn = { features = ["extra-traits", "full", "parsing", "proc-macro"], workspace = true }
+2 -2
View File
@@ -23,8 +23,8 @@ futures-timer = "3.0.2"
linked-hash-map = "0.5.4"
log = { workspace = true, default-features = true }
parking_lot = "0.12.1"
serde = { version = "1.0.196", features = ["derive"] }
thiserror = "1.0.48"
serde = { features = ["derive"], workspace = true, default-features = true }
thiserror = { workspace = true }
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus" }
sc-client-api = { path = "../api" }
sc-transaction-pool-api = { path = "api" }
@@ -16,11 +16,11 @@ async-trait = "0.1.74"
codec = { package = "parity-scale-codec", version = "3.6.1" }
futures = "0.3.21"
log = { workspace = true, default-features = true }
serde = { version = "1.0.196", features = ["derive"] }
thiserror = "1.0.48"
serde = { features = ["derive"], workspace = true, default-features = true }
thiserror = { workspace = true }
sp-blockchain = { path = "../../../primitives/blockchain" }
sp-core = { path = "../../../primitives/core", default-features = false }
sp-runtime = { path = "../../../primitives/runtime", default-features = false }
[dev-dependencies]
serde_json = "1.0.113"
serde_json = { workspace = true, default-features = true }