Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch to workspace deps - batch 1 #4391

Closed
wants to merge 21 commits into from
Closed

Switch to workspace deps - batch 1 #4391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
852b271
Switch `criterion` to workspace dep
jasl May 5, 2024
98e06d0
Switch `array-bytes` to workspace dep
jasl May 5, 2024
122fbf4
Switch `prost` and `prost-build` to workspace dep
jasl May 5, 2024
28a095a
Switch `aquamarine` to workspace dep
jasl May 5, 2024
79c9ad4
Switch `itertools` to workspace dep
jasl May 5, 2024
38a34e9
Switch `tracing-log` to workspace dep
jasl May 6, 2024
bf72e60
Switch `tracing` to workspace dep
jasl May 5, 2024
79b8853
Switch `bs58` to workspace dep
jasl May 5, 2024
77d9bcb
Switch `nix` to workspace dep
jasl May 5, 2024
9228794
Switch `bitflags` to workspace dep
jasl May 5, 2024
7f25d28
Switch `rand` to workspace dep
jasl May 5, 2024
05685e5
Switch `rand_chacha` to workspace dep
jasl May 5, 2024
b9676bc
Switch `rand_core` to workspace dep
jasl May 6, 2024
56d82ac
Align `tracing-subscriber` to workspace
jasl May 3, 2024
48ef4b3
Switch `rand_pcg` to workspace dep
jasl May 6, 2024
27c2f0d
Switch `rand_distr` to workspace dep
jasl May 6, 2024
2e831cb
Switch `tokio`, `tokio-test`, `tokio-stream`, and `tokio-util` to wor…
jasl May 5, 2024
ea2cb9c
Switch `jsonrpsee` to workspace dep
jasl May 5, 2024
a1d0353
Switch `tokio-tungstenite` to workspace dep
jasl May 6, 2024
67d407b
taplo format --config .config/taplo.toml
jasl May 6, 2024
83ba705
Merge branch 'master' into switch-to-workspace-deps-1
jasl May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,18 +558,41 @@ extra-unused-type-parameters = { level = "allow", priority = 2 } # stylistic
default_constructed_unit_structs = { level = "allow", priority = 2 } # stylistic

[workspace.dependencies]
aquamarine = "0.5.0"
array-bytes = { version = "6.2.2", default-features = false }
bitflags = "1.3.2"
bs58 = { version = "0.5.0", default-features = false }
criterion = { version = "0.5.1", default-features = false }
itertools = "0.11.0"
jsonrpsee = "0.22.5"
jsonrpsee-core = "0.22.5"
nix = "0.27.1"
polkavm = "0.9.3"
polkavm-linker = "0.9.2"
polkavm-derive = "0.9.1"
prost = "0.12.4"
prost-build = "0.12.4"
log = { version = "0.4.21", default-features = false }
quote = { version = "1.0.33" }
rand = { version = "0.8.5", default-features = false }
rand_core = "0.6.2"
rand_chacha = { version = "0.3.1", default-features = false }
rand_distr = "0.4.3"
rand_pcg = "0.3.1"
serde = { version = "1.0.197", default-features = false }
serde-big-array = { version = "0.3.2" }
serde_derive = { version = "1.0.117" }
serde_json = { version = "1.0.114", default-features = false }
serde_yaml = { version = "0.9" }
syn = { version = "2.0.53" }
thiserror = { version = "1.0.48" }
tokio = { version = "1.37.0", default-features = false }
tokio-test = "0.4.2"
tokio-tungstenite = "0.20.1"
tokio-stream = "0.1.14"
tokio-util = "0.7.8"
tracing = { version = "0.1.37", default-features = false }
tracing-log = "0.2.0"
tracing-subscriber = { version = "0.3.18" }

[profile.release]
Expand Down
2 changes: 1 addition & 1 deletion bridges/modules/beefy/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ sp-consensus-beefy = { path = "../../../substrate/primitives/consensus/beefy" }
mmr-lib = { package = "ckb-merkle-mountain-range", version = "0.5.2" }
pallet-beefy-mmr = { path = "../../../substrate/frame/beefy-mmr" }
pallet-mmr = { path = "../../../substrate/frame/merkle-mountain-range" }
rand = "0.8.5"
rand = { workspace = true, default-features = true }
sp-io = { path = "../../../substrate/primitives/io" }
bp-test-utils = { path = "../../primitives/test-utils" }

Expand Down
6 changes: 3 additions & 3 deletions bridges/relays/client-substrate/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ async-std = { version = "1.9.0", features = ["attributes"] }
async-trait = "0.1.79"
codec = { package = "parity-scale-codec", version = "3.6.1" }
futures = "0.3.30"
jsonrpsee = { version = "0.22", features = ["macros", "ws-client"] }
jsonrpsee = { workspace = true, features = ["macros", "ws-client"] }
log = { workspace = true }
num-traits = "0.2"
rand = "0.8.5"
rand = { workspace = true, default-features = true }
scale-info = { version = "2.11.1", features = ["derive"] }
tokio = { version = "1.37", features = ["rt-multi-thread"] }
tokio = { workspace = true, default-features = true, features = ["rt-multi-thread"] }
thiserror = { workspace = true }

# Bridge dependencies
Expand Down
2 changes: 1 addition & 1 deletion bridges/relays/utils/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ num-traits = "0.2"
serde_json = { workspace = true, default-features = true }
sysinfo = "0.30"
time = { version = "0.3", features = ["formatting", "local-offset", "std"] }
tokio = { version = "1.37", features = ["rt"] }
tokio = { workspace = true, default-features = true, features = ["rt"] }
thiserror = { workspace = true }

# Bridge dependencies
Expand Down
2 changes: 1 addition & 1 deletion bridges/snowbridge/pallets/ethereum-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ static_assertions = { version = "1.1.0", default-features = false }
pallet-timestamp = { path = "../../../../substrate/frame/timestamp", default-features = false, optional = true }

[dev-dependencies]
rand = "0.8.5"
rand = { workspace = true, default-features = true }
sp-keyring = { path = "../../../../substrate/primitives/keyring" }
serde_json = { workspace = true, default-features = true }
hex-literal = "0.4.1"
Expand Down
2 changes: 1 addition & 1 deletion bridges/snowbridge/pallets/outbound-queue/merkle-tree/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-fea
hex-literal = { version = "0.4.1" }
env_logger = "0.11"
hex = "0.4"
array-bytes = "6.2.2"
array-bytes = { workspace = true, default-features = true }
sp-crypto-hashing = { path = "../../../../../substrate/primitives/crypto/hashing" }

[features]
Expand Down
2 changes: 1 addition & 1 deletion bridges/snowbridge/primitives/ethereum/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ ethabi = { package = "ethabi-decode", version = "1.0.0", default-features = fals

[dev-dependencies]
wasm-bindgen-test = "0.3.19"
rand = "0.8.5"
rand = { workspace = true, default-features = true }
serde_json = { workspace = true, default-features = true }

[features]
Expand Down
2 changes: 1 addition & 1 deletion cumulus/client/collator/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ workspace = true
parking_lot = "0.12.1"
codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive"] }
futures = "0.3.30"
tracing = "0.1.25"
tracing = { workspace = true, default-features = true }

# Substrate
sc-client-api = { path = "../../../substrate/client/api" }
Expand Down
2 changes: 1 addition & 1 deletion cumulus/client/consensus/aura/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ workspace = true
async-trait = "0.1.79"
codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive"] }
futures = "0.3.28"
tracing = "0.1.37"
tracing = { workspace = true, default-features = true }
schnellru = "0.2.1"

# Substrate
Expand Down
2 changes: 1 addition & 1 deletion cumulus/client/consensus/common/Cargo.toml
View file
Open in desktop
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", features = ["derive
dyn-clone = "1.0.16"
futures = "0.3.28"
log = { workspace = true, default-features = true }
tracing = "0.1.37"
tracing = { workspace = true, default-features = true }

# Substrate
sc-client-api = { path = "../../../../substrate/client/api" }
Expand Down
2 changes: 1 addition & 1 deletion cumulus/client/consensus/relay-chain/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ workspace = true
async-trait = "0.1.79"
futures = "0.3.28"
parking_lot = "0.12.1"
tracing = "0.1.37"
tracing = { workspace = true, default-features = true }

# Substrate
sc-consensus = { path = "../../../../substrate/client/consensus/common" }
Expand Down
4 changes: 2 additions & 2 deletions cumulus/client/network/Cargo.toml
View file
Open in desktop
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", features = ["derive
futures = "0.3.28"
futures-timer = "3.0.2"
parking_lot = "0.12.1"
tracing = "0.1.37"
tracing = { workspace = true, default-features = true }

# Substrate
sc-client-api = { path = "../../../substrate/client/api" }
Expand All @@ -35,7 +35,7 @@ cumulus-relay-chain-interface = { path = "../relay-chain-interface" }

[dev-dependencies]
portpicker = "0.1.1"
tokio = { version = "1.32.0", features = ["macros"] }
tokio = { workspace = true, default-features = true, features = ["macros"] }
url = "2.4.0"

# Substrate
Expand Down
2 changes: 1 addition & 1 deletion cumulus/client/parachain-inherent/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ license = "Apache-2.0"
async-trait = "0.1.79"
codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive"] }
scale-info = { version = "2.11.1", features = ["derive"] }
tracing = { version = "0.1.37" }
tracing = { workspace = true, default-features = true }

# Substrate
sc-client-api = { path = "../../../substrate/client/api" }
Expand Down
6 changes: 3 additions & 3 deletions cumulus/client/pov-recovery/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ workspace = true
codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive"] }
futures = "0.3.28"
futures-timer = "3.0.2"
rand = "0.8.5"
tracing = "0.1.37"
rand = { workspace = true, default-features = true }
tracing = { workspace = true, default-features = true }

# Substrate
sc-client-api = { path = "../../../substrate/client/api" }
Expand All @@ -35,7 +35,7 @@ cumulus-relay-chain-interface = { path = "../relay-chain-interface" }
async-trait = "0.1.79"

[dev-dependencies]
tokio = { version = "1.32.0", features = ["macros"] }
tokio = { workspace = true, default-features = true, features = ["macros"] }
portpicker = "0.1.1"

# Cumulus
Expand Down
2 changes: 1 addition & 1 deletion cumulus/client/relay-chain-interface/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ sc-client-api = { path = "../../../substrate/client/api" }
futures = "0.3.28"
async-trait = "0.1.79"
thiserror = { workspace = true }
jsonrpsee-core = "0.22"
jsonrpsee-core = { workspace = true }
parity-scale-codec = "3.6.4"
6 changes: 3 additions & 3 deletions cumulus/client/relay-chain-minimal-node/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ sp-consensus-babe = { path = "../../../substrate/primitives/consensus/babe" }
sp-consensus = { path = "../../../substrate/primitives/consensus/common" }
sp-runtime = { path = "../../../substrate/primitives/runtime" }
sp-blockchain = { path = "../../../substrate/primitives/blockchain" }
tokio = { version = "1.32.0", features = ["macros"] }
tokio = { workspace = true, default-features = true, features = ["macros"] }

# cumulus deps
cumulus-relay-chain-interface = { path = "../relay-chain-interface" }
cumulus-relay-chain-rpc-interface = { path = "../relay-chain-rpc-interface" }
cumulus-primitives-core = { path = "../../primitives/core" }

array-bytes = "6.2.2"
tracing = "0.1.37"
array-bytes = { workspace = true, default-features = true }
tracing = { workspace = true, default-features = true }
async-trait = "0.1.79"
futures = "0.3.28"
parking_lot = "0.12.1"
10 changes: 5 additions & 5 deletions cumulus/client/relay-chain-rpc-interface/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ sc-client-api = { path = "../../../substrate/client/api" }
sc-rpc-api = { path = "../../../substrate/client/rpc-api" }
sc-service = { path = "../../../substrate/client/service" }

tokio = { version = "1.32.0", features = ["sync"] }
tokio-util = { version = "0.7.8", features = ["compat"] }
tokio = { workspace = true, default-features = true, features = ["sync"] }
tokio-util = { workspace = true, features = ["compat"] }

futures = "0.3.28"
futures-timer = "3.0.2"
parity-scale-codec = "3.6.4"
jsonrpsee = { version = "0.22", features = ["ws-client"] }
tracing = "0.1.37"
jsonrpsee = { workspace = true, features = ["ws-client"] }
tracing = { workspace = true, default-features = true }
async-trait = "0.1.79"
url = "2.4.0"
serde_json = { workspace = true, default-features = true }
Expand All @@ -44,5 +44,5 @@ 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 = { workspace = true }
rand = "0.8.5"
rand = { workspace = true, default-features = true }
pin-project = "1.1.3"
2 changes: 1 addition & 1 deletion cumulus/pallets/collator-selection/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
log = { workspace = true }
codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.0.0" }
rand = { version = "0.8.5", features = ["std_rng"], default-features = false }
rand = { workspace = true, default-features = false, features = ["std_rng"] }
scale-info = { version = "2.11.1", default-features = false, features = ["derive"] }

sp-std = { path = "../../../substrate/primitives/std", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion cumulus/pallets/parachain-system/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ assert_matches = "1.5"
hex-literal = "0.4.1"
lazy_static = "1.4"
trie-standardmap = "0.16.0"
rand = "0.8.5"
rand = { workspace = true, default-features = true }
futures = "0.3.28"

# Substrate
Expand Down
6 changes: 3 additions & 3 deletions cumulus/polkadot-parachain/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ coretime-rococo-runtime = { path = "../parachains/runtimes/coretime/coretime-roc
coretime-westend-runtime = { path = "../parachains/runtimes/coretime/coretime-westend" }
bridge-hub-westend-runtime = { path = "../parachains/runtimes/bridge-hubs/bridge-hub-westend" }
penpal-runtime = { path = "../parachains/runtimes/testing/penpal" }
jsonrpsee = { version = "0.22", features = ["server"] }
jsonrpsee = { workspace = true, features = ["server"] }
people-rococo-runtime = { path = "../parachains/runtimes/people/people-rococo" }
people-westend-runtime = { path = "../parachains/runtimes/people/people-westend" }
parachains-common = { path = "../parachains/common" }
Expand Down Expand Up @@ -118,9 +118,9 @@ substrate-build-script-utils = { path = "../../substrate/utils/build-script-util

[dev-dependencies]
assert_cmd = "2.0"
nix = { version = "0.27.1", features = ["signal"] }
nix = { workspace = true, features = ["signal"] }
tempfile = "3.8.0"
tokio = { version = "1.32.0", features = ["macros", "parking_lot", "time"] }
tokio = { workspace = true, default-features = true, features = ["macros", "parking_lot", "time"] }
wait-timeout = "0.2"

[features]
Expand Down
10 changes: 5 additions & 5 deletions cumulus/test/service/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ path = "src/main.rs"
async-trait = "0.1.79"
clap = { version = "4.5.3", features = ["derive"] }
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"
criterion = { workspace = true, default-features = true, features = ["async_tokio"] }
jsonrpsee = { workspace = true, features = ["server"] }
rand = { workspace = true, default-features = true }
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"
tokio = { workspace = true, default-features = true, features = ["macros"] }
tracing = { workspace = true, default-features = true }
url = "2.4.0"
tempfile = "3.8.0"

Expand Down
4 changes: 2 additions & 2 deletions polkadot/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ tikv-jemallocator = { version = "0.5.0", features = ["unprefixed_malloc_on_suppo

[dev-dependencies]
assert_cmd = "2.0.4"
nix = { version = "0.27.1", features = ["signal"] }
nix = { workspace = true, features = ["signal"] }
tempfile = "3.2.0"
tokio = "1.37"
tokio = { workspace = true, default-features = true }
substrate-rpc-client = { path = "../substrate/utils/frame/rpc/client" }
polkadot-core-primitives = { path = "core-primitives" }

Expand Down
2 changes: 1 addition & 1 deletion polkadot/erasure-coding/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ sp-trie = { path = "../../substrate/primitives/trie" }
thiserror = { workspace = true }

[dev-dependencies]
criterion = { version = "0.5.1", default-features = false, features = ["cargo_bench_support"] }
criterion = { workspace = true, default-features = false, features = ["cargo_bench_support"] }

[[bench]]
name = "scaling_with_validators"
Expand Down
8 changes: 4 additions & 4 deletions polkadot/node/core/approval-voting/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ schnorrkel = "0.11.4"
kvdb = "0.13.0"
derive_more = "0.99.17"
thiserror = { workspace = true }
itertools = "0.11"
itertools = { workspace = true }

polkadot-node-subsystem = { path = "../../subsystem" }
polkadot-node-subsystem-util = { path = "../../subsystem-util" }
Expand All @@ -36,9 +36,9 @@ sp-consensus-slots = { path = "../../../../substrate/primitives/consensus/slots"
sp-application-crypto = { path = "../../../../substrate/primitives/application-crypto", default-features = false, features = ["full_crypto"] }
sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false }
# rand_core should match schnorrkel
rand_core = "0.6.2"
rand_chacha = { version = "0.3.1" }
rand = "0.8.5"
rand_core = { workspace = true }
rand_chacha = { workspace = true, default-features = false }
rand = { workspace = true, default-features = false }

[dev-dependencies]
async-trait = "0.1.79"
Expand Down
11 changes: 4 additions & 7 deletions polkadot/node/core/pvf/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@ workspace = true

[dependencies]
always-assert = "0.1"
array-bytes = "6.2.2"
array-bytes = { workspace = true, default-features = true }
blake3 = "1.5"
cfg-if = "1.0"
futures = "0.3.30"
futures-timer = "3.0.2"
gum = { package = "tracing-gum", path = "../../gum" }
is_executable = { version = "1.0.1", optional = true }
pin-project = "1.0.9"
rand = "0.8.5"
rand = { workspace = true, default-features = true }
slotmap = "1.0"
tempfile = "3.3.0"
thiserror = { workspace = true }
tokio = { version = "1.24.2", features = ["fs", "process"] }
tokio = { workspace = true, default-features = true, features = ["fs", "process"] }

parity-scale-codec = { version = "3.6.1", default-features = false, features = [
"derive",
Expand All @@ -44,10 +44,7 @@ polkadot-node-core-pvf-execute-worker = { path = "execute-worker", optional = tr

[dev-dependencies]
assert_matches = "1.4.0"
criterion = { version = "0.5.1", default-features = false, features = [
"async_tokio",
"cargo_bench_support",
] }
criterion = { workspace = true, default-features = false, features = ["async_tokio", "cargo_bench_support"] }
hex-literal = "0.4.1"

polkadot-node-core-pvf-common = { path = "common", features = ["test-utils"] }
Expand Down
2 changes: 1 addition & 1 deletion polkadot/node/core/pvf/common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ cpu-time = "1.0.0"
futures = "0.3.30"
gum = { package = "tracing-gum", path = "../../../gum" }
libc = "0.2.152"
nix = { version = "0.27.1", features = ["resource", "sched"] }
nix = { workspace = true, features = ["resource", "sched"] }
thiserror = { workspace = true }

parity-scale-codec = { version = "3.6.1", default-features = false, features = [
Expand Down
2 changes: 1 addition & 1 deletion polkadot/node/core/pvf/execute-worker/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ workspace = true
cpu-time = "1.0.0"
gum = { package = "tracing-gum", path = "../../../gum" }
cfg-if = "1.0"
nix = { version = "0.27.1", features = ["process", "resource", "sched"] }
nix = { workspace = true, features = ["process", "resource", "sched"] }
libc = "0.2.152"

parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive"] }
Expand Down
Loading
Loading