Skip to content

Commit

Permalink
Pull all dependencies to the workspace (#314)
Browse files Browse the repository at this point in the history 
Changes:
- Pull all dependencies to the workspace and add a CI check.
- Fixup the crates that had differing dependency aliases.
- Add CI check to keep deps in the workspace
- Add Taplo config for TOML formatting (follow up: add CI check)

This is a preliminary to updating to the new SDK version as we currently
use conflicting aliases for a few packages while packages are not able
to rename workspace deps, see
rust-lang/cargo#12546

This is a No-OP change, as can be verified with this:
```bash
git checkout oty-fix-dependencies
cargo tree -e features > oty.tree

git checkout origin/main
cargo tree -e features > main.tree

diff main.tree oty.tree
```

- [x] Does not require a CHANGELOG entry

---------

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Co-authored-by: ordian <noreply@reusable.software>
  • Loading branch information
@ggwpez @ordian
ggwpez and ordian authored May 18, 2024
1 parent c08d8ca commit 03d2571
Show file tree
Hide file tree
Showing 67 changed files with 793 additions and 705 deletions.
46 changes: 23 additions & 23 deletions .cargo/config.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,27 @@
# RUSTFLAGS= cargo clippy
[target.'cfg(feature = "cargo-clippy")']
rustflags = [
"-Aclippy::all",
"-Dclippy::correctness",
"-Aclippy::if-same-then-else",
"-Asuspicious_double_ref_op",
"-Dclippy::complexity",
"-Aclippy::zero-prefixed-literal", # 00_1000_000
"-Aclippy::type_complexity", # raison d'etre
"-Aclippy::nonminimal-bool", # maybe
"-Aclippy::borrowed-box", # Reasonable to fix this one
"-Aclippy::too-many-arguments", # (Turning this on would lead to)
"-Aclippy::unnecessary_cast", # Types may change
"-Aclippy::identity-op", # One case where we do 0 +
"-Aclippy::useless_conversion", # Types may change
"-Aclippy::unit_arg", # styalistic.
"-Aclippy::option-map-unit-fn", # styalistic
"-Aclippy::bind_instead_of_map", # styalistic
"-Aclippy::erasing_op", # E.g. 0 * DOLLARS
"-Aclippy::eq_op", # In tests we test equality.
"-Aclippy::while_immutable_condition", # false positives
"-Aclippy::needless_option_as_deref", # false positives
"-Aclippy::derivable_impls", # false positives
"-Aclippy::stable_sort_primitive", # prefer stable sort
"-Aclippy::extra-unused-type-parameters", # stylistic
"-Aclippy::all",
"-Aclippy::bind_instead_of_map", # stylistic
"-Aclippy::borrowed-box", # Reasonable to fix this one
"-Aclippy::derivable_impls", # false positives
"-Aclippy::eq_op", # In tests we test equality.
"-Aclippy::erasing_op", # E.g. 0 * DOLLARS
"-Aclippy::extra-unused-type-parameters", # stylistic
"-Aclippy::identity-op", # One case where we do 0 +
"-Aclippy::if-same-then-else",
"-Aclippy::needless_option_as_deref", # false positives
"-Aclippy::nonminimal-bool", # maybe
"-Aclippy::option-map-unit-fn", # stylistic
"-Aclippy::stable_sort_primitive", # prefer stable sort
"-Aclippy::too-many-arguments", # (Turning this on would lead to)
"-Aclippy::type_complexity", # raison d'etre
"-Aclippy::unit_arg", # stylistic
"-Aclippy::unnecessary_cast", # Types may change
"-Aclippy::useless_conversion", # Types may change
"-Aclippy::while_immutable_condition", # false positives
"-Aclippy::zero-prefixed-literal", # 00_1000_000
"-Asuspicious_double_ref_op",
"-Dclippy::complexity",
"-Dclippy::correctness",
]
29 changes: 29 additions & 0 deletions .config/taplo.toml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# all options https://taplo.tamasfe.dev/configuration/formatter-options.html

exclude = [
"target/**",
]

# global rules
[formatting]
reorder_arrays = true
inline_table_expand = false
array_auto_expand = false
array_auto_collapse = false
indent_string = " " # tab

# don't re-order order-dependent deb package metadata
[[rule]]
include = ["polkadot/Cargo.toml"]
keys = ["package.metadata.deb"]

[rule.formatting]
reorder_arrays = false

# don't re-order order-dependent rustflags
[[rule]]
include = [".cargo/config.toml"]
keys = ["build"]

[rule.formatting]
reorder_arrays = false
5 changes: 4 additions & 1 deletion .github/workflows/check-features.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,7 @@ jobs:
fetch-depth: 0 # Dont clone historic commits.

- name: Check features
run: zepter run check
run: |
zepter run check
# We will add this to the config file once its stabilized. Just run it in the CI for now.
zepter transpose dep lift-to-workspace 'regex:.*'
94 changes: 63 additions & 31 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,25 @@ version = "1.0.0"
authors = ["Polkadot Fellowship"]
edition = "2021"
repository = "https://github.com/polkadot-fellows/runtimes.git"
license = "GPL-3.0-only" # TODO <https://github.com/polkadot-fellows/runtimes/issues/29>
license = "GPL-3.0-only" # TODO <https://github.com/polkadot-fellows/runtimes/issues/29>

[workspace.dependencies]
assert_matches = { version = "1.5.0" }
asset-hub-kusama-emulated-chain = { path = "integration-tests/emulated/chains/parachains/assets/asset-hub-kusama" }
asset-hub-kusama-runtime = { path = "system-parachains/asset-hubs/asset-hub-kusama" }
asset-hub-polkadot-emulated-chain = { path = "integration-tests/emulated/chains/parachains/assets/asset-hub-polkadot" }
asset-hub-polkadot-runtime = { path = "system-parachains/asset-hubs/asset-hub-polkadot" }
asset-test-utils = { version = "8.0.1" }
assets-common = { version = "0.8.0", default-features = false }
authority-discovery-primitives = { version = "27.0.0", default-features = false, package = "sp-authority-discovery" }
babe-primitives = { version = "0.33.0", default-features = false, package = "sp-consensus-babe" }
beefy-primitives = { version = "14.0.0", default-features = false, package = "sp-consensus-beefy" }
binary-merkle-tree = { version = "14.0.0", default-features = false }
bp-asset-hub-kusama = { path = "system-parachains/asset-hubs/asset-hub-kusama/primitives", default-features = false }
bp-asset-hub-polkadot = { path = "system-parachains/asset-hubs/asset-hub-polkadot/primitives", default-features = false }
bp-bridge-hub-cumulus = { version = "0.8.0", default-features = false }
bp-bridge-hub-kusama = { path = "system-parachains/bridge-hubs/bridge-hub-kusama/primitives", default-features = false }
bp-bridge-hub-polkadot = { path = "system-parachains/bridge-hubs/bridge-hub-polkadot/primitives", default-features = false }
bp-header-chain = { version = "0.8.1", default-features = false }
bp-kusama = { version = "0.6.0", default-features = false }
bp-messages = { version = "0.8.0", default-features = false }
Expand All @@ -21,9 +32,18 @@ bp-relayers = { version = "0.8.0", default-features = false }
bp-runtime = { version = "0.8.0", default-features = false }
bp-xcm-bridge-hub-router = { version = "0.7.0", default-features = false }
bridge-hub-common = { version = "0.1.0", default-features = false }
bridge-hub-kusama-emulated-chain = { path = "integration-tests/emulated/chains/parachains/bridges/bridge-hub-kusama" }
bridge-hub-kusama-runtime = { path = "system-parachains/bridge-hubs/bridge-hub-kusama" }
bridge-hub-polkadot-emulated-chain = { path = "integration-tests/emulated/chains/parachains/bridges/bridge-hub-polkadot" }
bridge-hub-polkadot-runtime = { path = "system-parachains/bridge-hubs/bridge-hub-polkadot" }
bridge-hub-test-utils = { version = "0.8.0" }
bridge-runtime-common = { version = "0.8.0", default-features = false }
clap = { version = "4.5.0" }
codec = { package = "parity-scale-codec", version = "3.6.9", default-features = false }
collectives-polkadot-emulated-chain = { path = "integration-tests/emulated/chains/parachains/collectives/collectives-polkadot" }
collectives-polkadot-runtime = { path = "system-parachains/collectives/collectives-polkadot" }
collectives-polkadot-runtime-constants = { path = "system-parachains/collectives/collectives-polkadot/constants" }
coretime-kusama-runtime = { path = "system-parachains/coretime/coretime-kusama" }
cumulus-pallet-aura-ext = { version = "0.8.0", default-features = false }
cumulus-pallet-dmp-queue = { version = "0.8.0", default-features = false }
cumulus-pallet-parachain-system = { version = "0.8.1", default-features = false }
Expand All @@ -36,18 +56,26 @@ cumulus-primitives-utility = { version = "0.8.1", default-features = false }
emulated-integration-tests-common = { version = "4.0.0" }
encointer-balances-tx-payment = { version = "~6.1.0", default-features = false }
encointer-balances-tx-payment-rpc-runtime-api = { version = "~6.1.0", default-features = false }
encointer-kusama-runtime = { path = "system-parachains/encointer" }
encointer-primitives = { version = "~6.1.0", default-features = false }
enumflags2 = { version = "0.7.7" }
frame-benchmarking = { version = "29.0.0", default-features = false }
frame-election-provider-support = { version = "29.0.0", default-features = false }
frame-executive = { version = "29.0.0", default-features = false }
frame-remote-externalities = { version = "0.36.0" }
frame-support = { version = "29.0.2", default-features = false }
frame-system = { version = "29.0.0", default-features = false }
frame-system-benchmarking = { version = "29.0.0", default-features = false }
frame-system-rpc-runtime-api = { version = "27.0.0", default-features = false }
frame-try-runtime = { version = "0.35.0", default-features = false }
glutton-kusama-runtime = { path = "system-parachains/gluttons/glutton-kusama" }
grandpa = { version = "0.20.0", package = "sc-consensus-grandpa" }
hex-literal = { version = "0.4.1" }
integration-tests-helpers = { path = "integration-tests/emulated/helpers" }
kusama-emulated-chain = { path = "integration-tests/emulated/chains/relays/kusama" }
kusama-polkadot-system-emulated-network = { path = "integration-tests/emulated/networks/kusama-polkadot-system" }
kusama-runtime = { path = "relay/kusama", package = "staging-kusama-runtime" }
kusama-runtime-constants = { path = "relay/kusama/constants", default-features = false }
kusama-system-emulated-network = { path = "integration-tests/emulated/networks/kusama-system" }
log = { version = "0.4.20", default-features = false }
pallet-alliance = { version = "28.0.0", default-features = false }
pallet-asset-conversion = { version = "11.0.0", default-features = false }
Expand Down Expand Up @@ -133,19 +161,26 @@ pallet-xcm = { version = "8.0.5", default-features = false }
pallet-xcm-benchmarks = { version = "8.0.2", default-features = false }
pallet-xcm-bridge-hub = { version = "0.3.0", default-features = false }
pallet-xcm-bridge-hub-router = { version = "0.6.0", default-features = false }
parachain-info = { version = "0.8.0", default-features = false, package = "staging-parachain-info" }
parachains-common = { version = "8.0.0", default-features = false }
parachains-runtimes-test-utils = { version = "8.0.0" }
parity-scale-codec = { version = "3.6.9", default-features = false }
paste = { version = "1.0.14" }
penpal-emulated-chain = { path = "integration-tests/emulated/chains/parachains/testing/penpal" }
penpal-runtime = { version = "0.15.1" }
people-kusama-emulated-chain = { path = "integration-tests/emulated/chains/parachains/people/people-kusama" }
people-kusama-runtime = { path = "system-parachains/people/people-kusama" }
polkadot-core-primitives = { version = "8.0.0", default-features = false }
polkadot-emulated-chain = { path = "integration-tests/emulated/chains/relays/polkadot" }
polkadot-parachain-primitives = { version = "7.0.0", default-features = false }
polkadot-primitives = { version = "8.0.1", default-features = false }
polkadot-runtime = { path = "relay/polkadot" }
polkadot-runtime-common = { version = "8.0.1", default-features = false }
polkadot-runtime-parachains = { version = "8.0.1", default-features = false }
polkadot-runtime-constants = { path = "relay/polkadot/constants", default-features = false }
polkadot-system-emulated-network = { path = "integration-tests/emulated/networks/polkadot-system" }
primitive-types = { version = "0.12.2", default-features = false }
remote-externalities = { version = "0.36.0", package = "frame-remote-externalities" }
runtime-parachains = { version = "8.0.1", default-features = false, package = "polkadot-runtime-parachains" }
sc-chain-spec = { version = "28.0.0" }
sc-consensus-grandpa = { version = "0.20.0" }
scale-info = { version = "2.10.0", default-features = false }
separator = { version = "0.4.1" }
serde = { version = "1.0.196" }
Expand All @@ -166,11 +201,8 @@ snowbridge-system-runtime-api = { version = "0.1.0", default-features = false }
sp-api = { version = "27.0.0", default-features = false }
sp-application-crypto = { version = "31.0.0", default-features = false }
sp-arithmetic = { version = "24.0.0", default-features = false }
sp-authority-discovery = { version = "27.0.0", default-features = false }
sp-block-builder = { version = "27.0.0", default-features = false }
sp-consensus-aura = { version = "0.33.0", default-features = false }
sp-consensus-babe = { version = "0.33.0", default-features = false }
sp-consensus-beefy = { version = "14.0.0", default-features = false }
sp-core = { version = "29.0.0", default-features = false }
sp-debug-derive = { version = "14.0.0", default-features = false }
sp-genesis-builder = { version = "0.8.0", default-features = false }
Expand All @@ -189,20 +221,39 @@ sp-transaction-pool = { version = "27.0.0", default-features = false }
sp-trie = { version = "30.0.0" }
sp-version = { version = "30.0.0", default-features = false }
sp-weights = { version = "28.0.0", default-features = false }
staging-parachain-info = { version = "0.8.0", default-features = false }
staging-xcm = { version = "8.0.1", default-features = false }
staging-xcm-builder = { version = "8.0.1", default-features = false }
staging-xcm-executor = { version = "8.0.2", default-features = false }
static_assertions = { version = "1.1.0" }
substrate-wasm-builder = { version = "18.0.0" }
system-parachains-constants = { path = "system-parachains/constants", default-features = false }
tokio = { version = "1.36.0" }
xcm = { version = "8.0.1", default-features = false, package = "staging-xcm" }
xcm-builder = { version = "8.0.1", default-features = false, package = "staging-xcm-builder" }
xcm-emulator = { version = "0.6.0" }
xcm-executor = { version = "8.0.1", default-features = false, package = "staging-xcm-executor" }

[workspace]
resolver = "2"

members = [
"chain-spec-generator",
"integration-tests/emulated/chains/parachains/assets/asset-hub-kusama",
"integration-tests/emulated/chains/parachains/assets/asset-hub-polkadot",
"integration-tests/emulated/chains/parachains/bridges/bridge-hub-kusama",
"integration-tests/emulated/chains/parachains/bridges/bridge-hub-polkadot",
"integration-tests/emulated/chains/parachains/collectives/collectives-polkadot",
"integration-tests/emulated/chains/parachains/people/people-kusama",
"integration-tests/emulated/chains/parachains/testing/penpal",
"integration-tests/emulated/chains/relays/kusama",
"integration-tests/emulated/chains/relays/polkadot",
"integration-tests/emulated/helpers",
"integration-tests/emulated/networks/kusama-polkadot-system",
"integration-tests/emulated/networks/kusama-system",
"integration-tests/emulated/networks/polkadot-system",
"integration-tests/emulated/tests/assets/asset-hub-kusama",
"integration-tests/emulated/tests/assets/asset-hub-polkadot",
"integration-tests/emulated/tests/bridges/bridge-hub-kusama",
"integration-tests/emulated/tests/bridges/bridge-hub-polkadot",
"integration-tests/emulated/tests/collectives/collectives-polkadot",
"integration-tests/emulated/tests/people/people-kusama",
"relay/kusama",
"relay/kusama/constants",
"relay/polkadot",
Expand All @@ -222,25 +273,6 @@ members = [
"system-parachains/encointer",
"system-parachains/gluttons/glutton-kusama",
"system-parachains/people/people-kusama",
"integration-tests/emulated/chains/relays/kusama",
"integration-tests/emulated/chains/relays/polkadot",
"integration-tests/emulated/chains/parachains/assets/asset-hub-kusama",
"integration-tests/emulated/chains/parachains/assets/asset-hub-polkadot",
"integration-tests/emulated/chains/parachains/bridges/bridge-hub-kusama",
"integration-tests/emulated/chains/parachains/bridges/bridge-hub-polkadot",
"integration-tests/emulated/chains/parachains/collectives/collectives-polkadot",
"integration-tests/emulated/chains/parachains/people/people-kusama",
"integration-tests/emulated/chains/parachains/testing/penpal",
"integration-tests/emulated/helpers",
"integration-tests/emulated/networks/kusama-system",
"integration-tests/emulated/networks/polkadot-system",
"integration-tests/emulated/networks/kusama-polkadot-system",
"integration-tests/emulated/tests/assets/asset-hub-kusama",
"integration-tests/emulated/tests/assets/asset-hub-polkadot",
"integration-tests/emulated/tests/bridges/bridge-hub-kusama",
"integration-tests/emulated/tests/bridges/bridge-hub-polkadot",
"integration-tests/emulated/tests/collectives/collectives-polkadot",
"integration-tests/emulated/tests/people/people-kusama",
]

[profile.release]
Expand Down
Loading

0 comments on commit 03d2571

Please sign in to comment.