Lift dependencies to the workspace (Part 2/x) (paritytech#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 <[email protected]>
duniter · Feb 20, 2024 · 574f3ba · 574f3ba
1 parent d65c8c4
commit 574f3ba
Show file tree

Hide file tree

Showing 116 changed files with 179 additions and 179 deletions.
diff --git a/substrate/bin/minimal/node/Cargo.toml b/substrate/bin/minimal/node/Cargo.toml
@@ -24,7 +24,7 @@ clap = { version = "4.5.1", features = ["derive"] }
 futures = { version = "0.3.21", features = ["thread-pool"] }
 futures-timer = "3.0.1"
 jsonrpsee = { version = "0.22", features = ["server"] }
-serde_json = "1.0.113"
+serde_json = { workspace = true, default-features = true }
 
 sc-cli = { path = "../../../client/cli" }
 sc-executor = { path = "../../../client/executor" }

diff --git a/substrate/bin/node-template/node/Cargo.toml b/substrate/bin/node-template/node/Cargo.toml
@@ -22,7 +22,7 @@ name = "node-template"
 [dependencies]
 clap = { version = "4.5.1", features = ["derive"] }
 futures = { version = "0.3.21", features = ["thread-pool"] }
-serde_json = "1.0.113"
+serde_json = { workspace = true, default-features = true }
 
 sc-cli = { path = "../../../client/cli" }
 sp-core = { path = "../../../primitives/core" }

diff --git a/substrate/bin/node-template/runtime/Cargo.toml b/substrate/bin/node-template/runtime/Cargo.toml
@@ -42,7 +42,7 @@ sp-std = { path = "../../../primitives/std", default-features = false }
 sp-storage = { path = "../../../primitives/storage", default-features = false }
 sp-transaction-pool = { path = "../../../primitives/transaction-pool", default-features = false }
 sp-version = { path = "../../../primitives/version", default-features = false, features = ["serde"] }
-serde_json = { version = "1.0.113", default-features = false, features = ["alloc"] }
+serde_json = { features = ["alloc"], workspace = true }
 sp-genesis-builder = { default-features = false, path = "../../../primitives/genesis-builder" }
 
 # Used for the node template's RPCs

diff --git a/substrate/bin/node/bench/Cargo.toml b/substrate/bin/node/bench/Cargo.toml
@@ -24,8 +24,8 @@ kitchensink-runtime = { path = "../runtime" }
 sc-client-api = { path = "../../../client/api" }
 sp-runtime = { path = "../../../primitives/runtime" }
 sp-state-machine = { path = "../../../primitives/state-machine" }
-serde = "1.0.196"
-serde_json = "1.0.113"
+serde = { workspace = true, default-features = true }
+serde_json = { workspace = true, default-features = true }
 derive_more = { version = "0.99.17", default-features = false, features = ["display"] }
 kvdb = "0.13.0"
 kvdb-rocksdb = "0.19.0"

diff --git a/substrate/bin/node/cli/Cargo.toml b/substrate/bin/node/cli/Cargo.toml
@@ -43,7 +43,7 @@ crate-type = ["cdylib", "rlib"]
 array-bytes = "6.1"
 clap = { version = "4.5.1", features = ["derive"], optional = true }
 codec = { package = "parity-scale-codec", version = "3.6.1" }
-serde = { version = "1.0.196", features = ["derive"] }
+serde = { features = ["derive"], workspace = true, default-features = true }
 jsonrpsee = { version = "0.22", features = ["server"] }
 futures = "0.3.21"
 log = { workspace = true, default-features = true }
@@ -116,7 +116,7 @@ sc-cli = { path = "../../../client/cli", optional = true }
 frame-benchmarking-cli = { path = "../../../utils/frame/benchmarking-cli", optional = true }
 node-inspect = { package = "staging-node-inspect", path = "../inspect", optional = true }
 try-runtime-cli = { path = "../../../utils/frame/try-runtime/cli", optional = true }
-serde_json = "1.0.113"
+serde_json = { workspace = true, default-features = true }
 
 [dev-dependencies]
 sc-keystore = { path = "../../../client/keystore" }
@@ -159,7 +159,7 @@ sp-consensus-babe = { path = "../../../primitives/consensus/babe" }
 sp-externalities = { path = "../../../primitives/externalities" }
 sp-keyring = { path = "../../../primitives/keyring" }
 sp-runtime = { path = "../../../primitives/runtime" }
-serde_json = "1.0.113"
+serde_json = { workspace = true, default-features = true }
 scale-info = { version = "2.10.0", features = ["derive", "serde"] }
 sp-trie = { path = "../../../primitives/trie" }
 sp-state-machine = { path = "../../../primitives/state-machine" }

diff --git a/substrate/bin/node/inspect/Cargo.toml b/substrate/bin/node/inspect/Cargo.toml
@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 clap = { version = "4.5.1", features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "3.6.1" }
-thiserror = "1.0"
+thiserror = { workspace = true }
 sc-cli = { path = "../../../client/cli" }
 sc-client-api = { path = "../../../client/api" }
 sc-service = { path = "../../../client/service", default-features = false }

diff --git a/substrate/bin/node/runtime/Cargo.toml b/substrate/bin/node/runtime/Cargo.toml
@@ -26,7 +26,7 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 scale-info = { version = "2.10.0", default-features = false, features = ["derive", "serde"] }
 static_assertions = "1.1.0"
 log = { workspace = true }
-serde_json = { version = "1.0.113", default-features = false, features = ["alloc", "arbitrary_precision"] }
+serde_json = { features = ["alloc", "arbitrary_precision"], workspace = true }
 
 # pallet-asset-conversion: turn on "num-traits" feature
 primitive-types = { version = "0.12.0", default-features = false, features = ["codec", "num-traits", "scale-info"] }

diff --git a/substrate/bin/utils/chain-spec-builder/Cargo.toml b/substrate/bin/utils/chain-spec-builder/Cargo.toml
@@ -26,5 +26,5 @@ crate-type = ["rlib"]
 clap = { version = "4.5.1", features = ["derive"] }
 log = { workspace = true, default-features = true }
 sc-chain-spec = { path = "../../../client/chain-spec" }
-serde_json = "1.0.113"
+serde_json = { workspace = true, default-features = true }
 sp-tracing = { path = "../../../primitives/tracing" }
diff --git a/substrate/client/allocator/Cargo.toml b/substrate/client/allocator/Cargo.toml
@@ -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" }
diff --git a/substrate/client/api/Cargo.toml b/substrate/client/api/Cargo.toml
@@ -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" }
diff --git a/substrate/client/authority-discovery/Cargo.toml b/substrate/client/authority-discovery/Cargo.toml
@@ -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" }

diff --git a/substrate/client/chain-spec/Cargo.toml b/substrate/client/chain-spec/Cargo.toml
@@ -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" }

diff --git a/substrate/client/chain-spec/derive/Cargo.toml b/substrate/client/chain-spec/derive/Cargo.toml
@@ -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 }
diff --git a/substrate/client/cli/Cargo.toml b/substrate/client/cli/Cargo.toml
@@ -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" }

diff --git a/substrate/client/consensus/aura/Cargo.toml b/substrate/client/consensus/aura/Cargo.toml
@@ -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" }

diff --git a/substrate/client/consensus/babe/Cargo.toml b/substrate/client/consensus/babe/Cargo.toml
@@ -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" }

diff --git a/substrate/client/consensus/babe/rpc/Cargo.toml b/substrate/client/consensus/babe/rpc/Cargo.toml
@@ -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" }

diff --git a/substrate/client/consensus/beefy/Cargo.toml b/substrate/client/consensus/beefy/Cargo.toml
@@ -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" }

diff --git a/substrate/client/consensus/beefy/rpc/Cargo.toml b/substrate/client/consensus/beefy/rpc/Cargo.toml
@@ -17,16 +17,16 @@ 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" }
 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"] }
diff --git a/substrate/client/consensus/common/Cargo.toml b/substrate/client/consensus/common/Cargo.toml
@@ -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" }

diff --git a/substrate/client/consensus/grandpa/Cargo.toml b/substrate/client/consensus/grandpa/Cargo.toml
@@ -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" }

diff --git a/substrate/client/consensus/grandpa/rpc/Cargo.toml b/substrate/client/consensus/grandpa/rpc/Cargo.toml
@@ -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" }

diff --git a/substrate/client/consensus/manual-seal/Cargo.toml b/substrate/client/consensus/manual-seal/Cargo.toml
@@ -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" }

diff --git a/substrate/client/consensus/pow/Cargo.toml b/substrate/client/consensus/pow/Cargo.toml
@@ -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" }

diff --git a/substrate/client/executor/common/Cargo.toml b/substrate/client/executor/common/Cargo.toml
@@ -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" }

diff --git a/substrate/client/keystore/Cargo.toml b/substrate/client/keystore/Cargo.toml
@@ -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" }

diff --git a/substrate/client/merkle-mountain-range/rpc/Cargo.toml b/substrate/client/merkle-mountain-range/rpc/Cargo.toml
@@ -17,12 +17,12 @@ 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" }
 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 }
diff --git a/substrate/client/mixnet/Cargo.toml b/substrate/client/mixnet/Cargo.toml
@@ -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 }
diff --git a/substrate/client/network/Cargo.toml b/substrate/client/network/Cargo.toml
@@ -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"] }

diff --git a/substrate/client/network/bitswap/Cargo.toml b/substrate/client/network/bitswap/Cargo.toml
@@ -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 = ".." }

diff --git a/substrate/client/network/light/Cargo.toml b/substrate/client/network/light/Cargo.toml
@@ -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 }
diff --git a/substrate/client/network/sync/Cargo.toml b/substrate/client/network/sync/Cargo.toml
@@ -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" }

diff --git a/substrate/client/rpc-api/Cargo.toml b/substrate/client/rpc-api/Cargo.toml
@@ -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" }

diff --git a/substrate/client/rpc-servers/Cargo.toml b/substrate/client/rpc-servers/Cargo.toml
@@ -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"] }