Skip to content

Commit

Permalink
Lift dependencies to the workspace (Part 2/x) (#3366)
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
ggwpez authored Feb 20, 2024
1 parent ef6ac94 commit e89d0fc
Show file tree
Hide file tree
Showing 185 changed files with 283 additions and 274 deletions.
1 change: 1 addition & 0 deletions .config/taplo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ exclude = [
"polkadot/node/malus/integrationtests/**",
"polkadot/zombienet_tests/**",
"substrate/zombienet/**",
"target/**",
]

# global rules
Expand Down
8 changes: 8 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -537,6 +537,14 @@ default_constructed_unit_structs = { level = "allow", priority = 2 } # stylistic
polkavm-linker = "0.8.2"
polkavm-derive = "0.8.0"
log = { version = "0.4.20", default-features = false }
quote = { version = "1.0.33" }
serde = { version = "1.0.196", default-features = false }
serde-big-array = { version = "0.3.2" }
serde_derive = { version = "1.0.117" }
serde_json = { version = "1.0.113", default-features = false }
serde_yaml = { version = "0.9" }
syn = { version = "2.0.49" }
thiserror = { version = "1.0.48" }

[profile.release]
# Polkadot runtime requires unwinding.
Expand Down
2 changes: 1 addition & 1 deletion bridges/primitives/header-chain/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ workspace = true
codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false }
finality-grandpa = { version = "0.16.2", default-features = false }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
serde = { version = "1.0", default-features = false, features = ["alloc", "derive"] }
serde = { features = ["alloc", "derive"], workspace = true }

# Bridge dependencies

Expand Down
2 changes: 1 addition & 1 deletion bridges/primitives/messages/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ workspace = true
[dependencies]
codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["bit-vec", "derive"] }
scale-info = { version = "2.10.0", default-features = false, features = ["bit-vec", "derive"] }
serde = { version = "1.0", default-features = false, features = ["alloc", "derive"] }
serde = { features = ["alloc", "derive"], workspace = true }

# Bridge dependencies

Expand Down
2 changes: 1 addition & 1 deletion bridges/primitives/polkadot-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ workspace = true
codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive"] }
parity-util-mem = { version = "0.12.0", optional = true }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
serde = { version = "1.0", optional = true, features = ["derive"] }
serde = { optional = true, features = ["derive"], workspace = true, default-features = true }

# Bridge Dependencies

Expand Down
2 changes: 1 addition & 1 deletion bridges/primitives/runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ impl-trait-for-tuples = "0.2.2"
log = { workspace = true }
num-traits = { version = "0.2", default-features = false }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
serde = { version = "1.0", default-features = false, features = ["alloc", "derive"] }
serde = { features = ["alloc", "derive"], workspace = true }

# Substrate Dependencies

Expand Down
8 changes: 4 additions & 4 deletions bridges/snowbridge/pallets/ethereum-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ workspace = true
targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
serde = { version = "1.0.196", optional = true }
serde_json = { version = "1.0.113", optional = true }
serde = { optional = true, workspace = true, default-features = true }
serde_json = { optional = true, workspace = true, default-features = true }
codec = { version = "3.6.1", package = "parity-scale-codec", default-features = false, features = ["derive"] }
scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
ssz_rs = { version = "0.9.0", default-features = false }
Expand Down Expand Up @@ -45,12 +45,12 @@ pallet-timestamp = { path = "../../../../substrate/frame/timestamp", default-fea
[dev-dependencies]
rand = "0.8.5"
sp-keyring = { path = "../../../../substrate/primitives/keyring" }
serde_json = "1.0.113"
serde_json = { workspace = true, default-features = true }
hex-literal = "0.4.1"
pallet-timestamp = { path = "../../../../substrate/frame/timestamp" }
snowbridge-pallet-ethereum-client-fixtures = { path = "./fixtures" }
sp-io = { path = "../../../../substrate/primitives/io" }
serde = "1.0.196"
serde = { workspace = true, default-features = true }

[features]
default = ["std"]
Expand Down
2 changes: 1 addition & 1 deletion bridges/snowbridge/pallets/inbound-queue/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ workspace = true
targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
serde = { version = "1.0.196", optional = true }
serde = { optional = true, workspace = true, default-features = true }
codec = { version = "3.6.1", package = "parity-scale-codec", default-features = false, features = ["derive"] }
scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
hex-literal = { version = "0.4.1", optional = true }
Expand Down
2 changes: 1 addition & 1 deletion bridges/snowbridge/pallets/outbound-queue/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ workspace = true
targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
serde = { version = "1.0.196", features = ["alloc", "derive"], default-features = false }
serde = { features = ["alloc", "derive"], workspace = true }
codec = { version = "3.6.1", package = "parity-scale-codec", default-features = false, features = ["derive"] }
scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
hex-literal = { version = "0.4.1", optional = true }
Expand Down
2 changes: 1 addition & 1 deletion bridges/snowbridge/primitives/beacon/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ categories = ["cryptography::cryptocurrencies"]
workspace = true

[dependencies]
serde = { version = "1.0.196", optional = true, features = ["derive"] }
serde = { optional = true, features = ["derive"], workspace = true, default-features = true }
hex = { version = "0.4", default-features = false }
codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion bridges/snowbridge/primitives/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ categories = ["cryptography::cryptocurrencies"]
workspace = true

[dependencies]
serde = { version = "1.0.196", optional = true, features = ["alloc", "derive"], default-features = false }
serde = { optional = true, features = ["alloc", "derive"], workspace = true }
codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
hex-literal = { version = "0.4.1" }
Expand Down
6 changes: 3 additions & 3 deletions bridges/snowbridge/primitives/ethereum/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ categories = ["cryptography::cryptocurrencies"]
workspace = true

[dependencies]
serde = { version = "1.0.196", optional = true, features = ["derive"] }
serde-big-array = { version = "0.3.2", optional = true, features = ["const-generics"] }
serde = { optional = true, features = ["derive"], workspace = true, default-features = true }
serde-big-array = { optional = true, features = ["const-generics"], workspace = true }
codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
ethbloom = { version = "0.13.0", default-features = false }
Expand All @@ -33,7 +33,7 @@ ethabi = { package = "ethabi-decode", version = "1.0.0", default-features = fals
[dev-dependencies]
wasm-bindgen-test = "0.3.19"
rand = "0.8.5"
serde_json = "1.0.113"
serde_json = { workspace = true, default-features = true }

[features]
default = ["std"]
Expand Down
2 changes: 1 addition & 1 deletion bridges/snowbridge/primitives/router/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ categories = ["cryptography::cryptocurrencies"]
workspace = true

[dependencies]
serde = { version = "1.0.196", optional = true, features = ["derive"] }
serde = { optional = true, features = ["derive"], workspace = true, default-features = true }
codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
log = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion bridges/snowbridge/runtime/test-common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features =
hex-literal = { version = "0.4.1" }
log = { workspace = true }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.196", optional = true, features = ["derive"] }
serde = { optional = true, features = ["derive"], workspace = true, default-features = true }
smallvec = "1.11.0"

# Substrate
Expand Down
2 changes: 1 addition & 1 deletion cumulus/client/consensus/proposer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ workspace = true
[dependencies]
anyhow = "1.0"
async-trait = "0.1.74"
thiserror = "1.0.48"
thiserror = { workspace = true }

# Substrate
sp-consensus = { path = "../../../../substrate/primitives/consensus/common" }
Expand Down
2 changes: 1 addition & 1 deletion cumulus/client/relay-chain-interface/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ sc-client-api = { path = "../../../substrate/client/api" }

futures = "0.3.28"
async-trait = "0.1.74"
thiserror = "1.0.48"
thiserror = { workspace = true }
jsonrpsee-core = "0.22"
parity-scale-codec = "3.6.4"
6 changes: 3 additions & 3 deletions cumulus/client/relay-chain-rpc-interface/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ jsonrpsee = { version = "0.22", features = ["ws-client"] }
tracing = "0.1.37"
async-trait = "0.1.74"
url = "2.4.0"
serde_json = "1.0.113"
serde = "1.0.196"
serde_json = { workspace = true, default-features = true }
serde = { workspace = true, default-features = true }
schnellru = "0.2.1"
smoldot = { version = "0.11.0", default_features = false, features = ["std"] }
smoldot-light = { version = "0.9.0", default_features = false, features = ["std"] }
either = "1.8.1"
thiserror = "1.0.48"
thiserror = { workspace = true }
rand = "0.8.5"
pin-project = "1.1.3"
4 changes: 2 additions & 2 deletions cumulus/pallets/parachain-system/proc-macro/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ workspace = true
proc-macro = true

[dependencies]
syn = "2.0.49"
syn = { workspace = true }
proc-macro2 = "1.0.64"
quote = "1.0.33"
quote = { workspace = true }
proc-macro-crate = "3.0.0"

[features]
Expand Down
4 changes: 2 additions & 2 deletions cumulus/parachain-template/node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ workspace = true
clap = { version = "4.5.1", features = ["derive"] }
log = { workspace = true, default-features = true }
codec = { package = "parity-scale-codec", version = "3.0.0" }
serde = { version = "1.0.196", features = ["derive"] }
serde = { features = ["derive"], workspace = true, default-features = true }
jsonrpsee = { version = "0.22", features = ["server"] }
futures = "0.3.28"
serde_json = "1.0.113"
serde_json = { workspace = true, default-features = true }

# Local
parachain-template-runtime = { path = "../runtime" }
Expand Down
2 changes: 1 addition & 1 deletion cumulus/parachain-template/pallets/template/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ frame-support = { path = "../../../../substrate/frame/support", default-features
frame-system = { path = "../../../../substrate/frame/system", default-features = false }

[dev-dependencies]
serde = { version = "1.0.196" }
serde = { workspace = true, default-features = true }

# Substrate
sp-core = { path = "../../../../substrate/primitives/core", default-features = false }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ log = { workspace = true }
scale-info = { version = "2.10.0", default-features = false, features = [
"derive",
] }
serde = { version = "1.0.196", optional = true, features = ["derive"] }
serde = { optional = true, features = ["derive"], workspace = true, default-features = true }

# Substrate
frame-benchmarking = { path = "../../../../../substrate/frame/benchmarking", default-features = false, optional = true }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features =
hex-literal = { version = "0.4.1" }
log = { workspace = true }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.196", optional = true, features = ["derive"] }
serde = { optional = true, features = ["derive"], workspace = true, default-features = true }

# Substrate
frame-benchmarking = { path = "../../../../../substrate/frame/benchmarking", default-features = false, optional = true }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features =
hex-literal = "0.4.1"
log = { workspace = true }
scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.196", optional = true, features = ["derive"] }
serde = { optional = true, features = ["derive"], workspace = true, default-features = true }

# Substrate
frame-benchmarking = { path = "../../../../../substrate/frame/benchmarking", default-features = false, optional = true }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features =
hex-literal = "0.4.1"
log = { workspace = true }
scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.196", optional = true, features = ["derive"] }
serde = { optional = true, features = ["derive"], workspace = true, default-features = true }

# Substrate
frame-benchmarking = { path = "../../../../../substrate/frame/benchmarking", default-features = false, optional = true }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ enumflags2 = { version = "0.7.7" }
hex-literal = { version = "0.4.1" }
log = { workspace = true }
scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.196", optional = true, features = ["derive"] }
serde = { optional = true, features = ["derive"], workspace = true, default-features = true }

# Substrate
frame-benchmarking = { path = "../../../../../substrate/frame/benchmarking", default-features = false, optional = true }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ enumflags2 = { version = "0.7.7" }
hex-literal = { version = "0.4.1" }
log = { workspace = true }
scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.196", optional = true, features = ["derive"] }
serde = { optional = true, features = ["derive"], workspace = true, default-features = true }

# Substrate
frame-benchmarking = { path = "../../../../../substrate/frame/benchmarking", default-features = false, optional = true }
Expand Down
4 changes: 2 additions & 2 deletions cumulus/polkadot-parachain/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ codec = { package = "parity-scale-codec", version = "3.0.0" }
futures = "0.3.28"
hex-literal = "0.4.1"
log = { workspace = true, default-features = true }
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 }

# Local
rococo-parachain-runtime = { path = "../parachains/runtimes/testing/rococo-parachain" }
Expand Down
4 changes: 2 additions & 2 deletions cumulus/test/service/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ codec = { package = "parity-scale-codec", version = "3.0.0" }
criterion = { version = "0.5.1", features = ["async_tokio"] }
jsonrpsee = { version = "0.22", features = ["server"] }
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 }
tokio = { version = "1.32.0", features = ["macros"] }
tracing = "0.1.37"
url = "2.4.0"
Expand Down
2 changes: 1 addition & 1 deletion polkadot/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ crate-type = ["cdylib", "rlib"]
cfg-if = "1.0"
clap = { version = "4.5.1", features = ["derive"], optional = true }
log = { workspace = true, default-features = true }
thiserror = "1.0.48"
thiserror = { workspace = true }
futures = "0.3.21"
pyro = { package = "pyroscope", version = "0.5.3", optional = true }
pyroscope_pprofrs = { version = "0.2", optional = true }
Expand Down
2 changes: 1 addition & 1 deletion polkadot/erasure-coding/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ novelpoly = { package = "reed-solomon-novelpoly", version = "2.0.0" }
parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive", "std"] }
sp-core = { path = "../../substrate/primitives/core" }
sp-trie = { path = "../../substrate/primitives/trie" }
thiserror = "1.0.48"
thiserror = { workspace = true }

[dev-dependencies]
criterion = { version = "0.4.0", default-features = false, features = ["cargo_bench_support"] }
Expand Down
2 changes: 1 addition & 1 deletion polkadot/node/collation-generation/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ polkadot-node-subsystem-util = { path = "../subsystem-util" }
polkadot-primitives = { path = "../../primitives" }
sp-core = { path = "../../../substrate/primitives/core" }
sp-maybe-compressed-blob = { path = "../../../substrate/primitives/maybe-compressed-blob" }
thiserror = "1.0.48"
thiserror = { workspace = true }
parity-scale-codec = { version = "3.6.1", default-features = false, features = ["bit-vec", "derive"] }

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion polkadot/node/core/approval-voting/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ merlin = "3.0"
schnorrkel = "0.11.4"
kvdb = "0.13.0"
derive_more = "0.99.17"
thiserror = "1.0.48"
thiserror = { workspace = true }
itertools = "0.10.5"

polkadot-node-subsystem = { path = "../../subsystem" }
Expand Down
2 changes: 1 addition & 1 deletion polkadot/node/core/av-store/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ workspace = true
futures = "0.3.21"
futures-timer = "3.0.2"
kvdb = "0.13.0"
thiserror = "1.0.48"
thiserror = { workspace = true }
gum = { package = "tracing-gum", path = "../../gum" }
bitvec = "1.0.0"

Expand Down
2 changes: 1 addition & 1 deletion polkadot/node/core/backing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ erasure-coding = { package = "polkadot-erasure-coding", path = "../../../erasure
statement-table = { package = "polkadot-statement-table", path = "../../../statement-table" }
bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] }
gum = { package = "tracing-gum", path = "../../gum" }
thiserror = "1.0.48"
thiserror = { workspace = true }
fatality = "0.0.6"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion polkadot/node/core/bitfield-signing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ polkadot-node-subsystem = { path = "../../subsystem" }
polkadot-node-subsystem-util = { path = "../../subsystem-util" }
sp-keystore = { path = "../../../../substrate/primitives/keystore" }
wasm-timer = "0.2.5"
thiserror = "1.0.48"
thiserror = { workspace = true }

[dev-dependencies]
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
Expand Down
2 changes: 1 addition & 1 deletion polkadot/node/core/chain-selection/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ polkadot-node-primitives = { path = "../../primitives" }
polkadot-node-subsystem = { path = "../../subsystem" }
polkadot-node-subsystem-util = { path = "../../subsystem-util" }
kvdb = "0.13.0"
thiserror = "1.0.48"
thiserror = { workspace = true }
parity-scale-codec = "3.6.1"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion polkadot/node/core/dispute-coordinator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ futures = "0.3.21"
gum = { package = "tracing-gum", path = "../../gum" }
parity-scale-codec = "3.6.1"
kvdb = "0.13.0"
thiserror = "1.0.48"
thiserror = { workspace = true }
schnellru = "0.2.1"
fatality = "0.0.6"

Expand Down
2 changes: 1 addition & 1 deletion polkadot/node/core/parachains-inherent/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ workspace = true
futures = "0.3.21"
futures-timer = "3.0.2"
gum = { package = "tracing-gum", path = "../../gum" }
thiserror = "1.0.48"
thiserror = { workspace = true }
async-trait = "0.1.74"
polkadot-node-subsystem = { path = "../../subsystem" }
polkadot-overseer = { path = "../../overseer" }
Expand Down
Loading

0 comments on commit e89d0fc

Please sign in to comment.