Skip to content

Commit

Permalink
Reorder dependencies' keys (#6967)
Browse files Browse the repository at this point in the history 
It doesn't make sense to only reorder the features array.

For example:

This makes it hard for me to compare the dependencies and features,
especially some crates have a really really long dependencies list.
```toml​
[dependencies]
c = "*"
a = "*"
b = "*"

[features]
std = [
  "a",
  "b",
  "c",
]
```

This makes my life easier.
```toml​
[dependencies]
a = "*"
b = "*"
c = "*"

[features]
std = [
  "a",
  "b",
  "c",
]
```

---------

Co-authored-by: Bastian Köcher <[email protected]>
Co-authored-by: command-bot <>
  • Loading branch information
@AurevoirXavier @bkchr
AurevoirXavier and bkchr authored Dec 20, 2024
1 parent 4e805ca commit a843d15
Show file tree
Hide file tree
Showing 426 changed files with 2,643 additions and 2,636 deletions.
7 changes: 7 additions & 0 deletions .config/taplo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,10 @@ keys = ["workspace.dependencies"]

[rule.formatting]
reorder_keys = true

[[rule]]
include = ["**/Cargo.toml"]
keys = ["build-dependencies", "dependencies", "dev-dependencies"]

[rule.formatting]
reorder_keys = true
4 changes: 2 additions & 2 deletions bridges/chains/chain-bridge-hub-cumulus/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ workspace = true
[dependencies]
# Bridge Dependencies

bp-polkadot-core = { workspace = true }
bp-messages = { workspace = true }
bp-polkadot-core = { workspace = true }
bp-runtime = { workspace = true }

# Substrate Based Dependencies

frame-system = { workspace = true }
frame-support = { workspace = true }
frame-system = { workspace = true }
sp-api = { workspace = true }
sp-std = { workspace = true }

Expand Down
2 changes: 1 addition & 1 deletion bridges/chains/chain-bridge-hub-kusama/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ workspace = true
# Bridge Dependencies

bp-bridge-hub-cumulus = { workspace = true }
bp-runtime = { workspace = true }
bp-messages = { workspace = true }
bp-runtime = { workspace = true }

# Substrate Based Dependencies

Expand Down
2 changes: 1 addition & 1 deletion bridges/chains/chain-bridge-hub-polkadot/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ workspace = true
# Bridge Dependencies

bp-bridge-hub-cumulus = { workspace = true }
bp-runtime = { workspace = true }
bp-messages = { workspace = true }
bp-runtime = { workspace = true }

# Substrate Based Dependencies

Expand Down
2 changes: 1 addition & 1 deletion bridges/chains/chain-bridge-hub-rococo/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ codec = { features = ["derive"], workspace = true }

# Bridge Dependencies
bp-bridge-hub-cumulus = { workspace = true }
bp-runtime = { workspace = true }
bp-messages = { workspace = true }
bp-runtime = { workspace = true }
bp-xcm-bridge-hub = { workspace = true }

# Substrate Based Dependencies
Expand Down
2 changes: 1 addition & 1 deletion bridges/chains/chain-bridge-hub-westend/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ codec = { features = ["derive"], workspace = true }

# Bridge Dependencies
bp-bridge-hub-cumulus = { workspace = true }
bp-runtime = { workspace = true }
bp-messages = { workspace = true }
bp-runtime = { workspace = true }
bp-xcm-bridge-hub = { workspace = true }

# Substrate Based Dependencies
Expand Down
4 changes: 2 additions & 2 deletions bridges/modules/beefy/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ sp-runtime = { workspace = true }
sp-std = { workspace = true }

[dev-dependencies]
sp-consensus-beefy = { workspace = true, default-features = true }
bp-test-utils = { workspace = true, default-features = true }
mmr-lib = { workspace = true }
pallet-beefy-mmr = { workspace = true, default-features = true }
pallet-mmr = { workspace = true, default-features = true }
rand = { workspace = true, default-features = true }
sp-consensus-beefy = { workspace = true, default-features = true }
sp-io = { workspace = true, default-features = true }
bp-test-utils = { workspace = true, default-features = true }

[features]
default = ["std"]
Expand Down
2 changes: 1 addition & 1 deletion bridges/modules/grandpa/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ scale-info = { features = ["derive"], workspace = true }

# Bridge Dependencies

bp-runtime = { workspace = true }
bp-header-chain = { workspace = true }
bp-runtime = { workspace = true }

# Substrate Dependencies

Expand Down
2 changes: 1 addition & 1 deletion bridges/modules/messages/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ bp-runtime = { features = ["test-helpers"], workspace = true }
bp-test-utils = { workspace = true }
pallet-balances = { workspace = true }
pallet-bridge-grandpa = { workspace = true }
sp-io = { workspace = true }
sp-core = { workspace = true }
sp-io = { workspace = true }

[features]
default = ["std"]
Expand Down
8 changes: 4 additions & 4 deletions bridges/modules/relayers/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ sp-runtime = { workspace = true }
sp-std = { workspace = true }

[dev-dependencies]
bp-runtime = { workspace = true }
pallet-balances = { workspace = true, default-features = true }
sp-io = { workspace = true }
sp-runtime = { workspace = true }
bp-parachains = { workspace = true }
bp-polkadot-core = { workspace = true }
bp-runtime = { workspace = true }
bp-test-utils = { workspace = true }
pallet-balances = { workspace = true, default-features = true }
pallet-utility = { workspace = true }
sp-core = { workspace = true }
sp-io = { workspace = true }
sp-runtime = { workspace = true }

[features]
default = ["std"]
Expand Down
8 changes: 4 additions & 4 deletions bridges/modules/xcm-bridge-hub/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ xcm-builder = { workspace = true }
xcm-executor = { workspace = true }

[dev-dependencies]
pallet-balances = { workspace = true }
sp-io = { workspace = true }
bp-runtime = { workspace = true }
bp-header-chain = { workspace = true }
pallet-xcm-bridge-hub-router = { workspace = true }
bp-runtime = { workspace = true }
bp-xcm-bridge-hub-router = { workspace = true }
pallet-balances = { workspace = true }
pallet-xcm-bridge-hub-router = { workspace = true }
polkadot-parachain-primitives = { workspace = true }
sp-io = { workspace = true }

[features]
default = ["std"]
Expand Down
2 changes: 1 addition & 1 deletion bridges/primitives/beefy/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ bp-runtime = { workspace = true }
# Substrate Dependencies

binary-merkle-tree = { workspace = true }
sp-consensus-beefy = { workspace = true }
frame-support = { workspace = true }
pallet-beefy-mmr = { workspace = true }
pallet-mmr = { workspace = true }
sp-consensus-beefy = { workspace = true }
sp-runtime = { workspace = true }
sp-std = { workspace = true }

Expand Down
2 changes: 1 addition & 1 deletion bridges/primitives/header-chain/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ bp-runtime = { workspace = true }
# Substrate Dependencies

frame-support = { workspace = true }
sp-core = { features = ["serde"], workspace = true }
sp-consensus-grandpa = { features = ["serde"], workspace = true }
sp-core = { features = ["serde"], workspace = true }
sp-runtime = { features = ["serde"], workspace = true }
sp-std = { workspace = true }

Expand Down
6 changes: 3 additions & 3 deletions bridges/primitives/messages/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@ scale-info = { features = ["bit-vec", "derive"], workspace = true }
serde = { features = ["alloc", "derive"], workspace = true }

# Bridge dependencies
bp-runtime = { workspace = true }
bp-header-chain = { workspace = true }
bp-runtime = { workspace = true }

# Substrate Dependencies
frame-support = { workspace = true }
sp-core = { workspace = true }
sp-std = { workspace = true }
sp-io = { workspace = true }
sp-std = { workspace = true }

[dev-dependencies]
bp-runtime = { workspace = true }
hex = { workspace = true, default-features = true }
hex-literal = { workspace = true, default-features = true }
bp-runtime = { workspace = true }

[features]
default = ["std"]
Expand Down
2 changes: 1 addition & 1 deletion bridges/primitives/relayers/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ bp-parachains = { workspace = true }
bp-runtime = { workspace = true }

# Substrate Dependencies
frame-system = { workspace = true }
frame-support = { workspace = true }
frame-system = { workspace = true }
pallet-utility = { workspace = true }
sp-runtime = { workspace = true }
sp-std = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion bridges/primitives/xcm-bridge-hub-router/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ codec = { features = ["bit-vec", "derive"], workspace = true }
scale-info = { features = ["bit-vec", "derive"], workspace = true }

# Substrate Dependencies
sp-runtime = { workspace = true }
sp-core = { workspace = true }
sp-runtime = { workspace = true }

# Polkadot Dependencies
xcm = { workspace = true }
Expand Down
6 changes: 3 additions & 3 deletions bridges/primitives/xcm-bridge-hub/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ bp-messages = { workspace = true }
bp-runtime = { workspace = true }

# Substrate Dependencies
sp-std = { workspace = true }
sp-io = { workspace = true }
sp-core = { workspace = true }
frame-support = { workspace = true }
sp-core = { workspace = true }
sp-io = { workspace = true }
sp-std = { workspace = true }

# Polkadot Dependencies
xcm = { workspace = true }
Expand Down
6 changes: 3 additions & 3 deletions bridges/relays/client-substrate/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ futures = { workspace = true }
jsonrpsee = { features = ["macros", "ws-client"], workspace = true }
log = { workspace = true }
num-traits = { workspace = true, default-features = true }
quick_cache = { workspace = true }
rand = { workspace = true, default-features = true }
serde_json = { workspace = true }
scale-info = { features = [
"derive",
], workspace = true, default-features = true }
serde_json = { workspace = true }
thiserror = { workspace = true }
tokio = { features = [
"rt-multi-thread",
], workspace = true, default-features = true }
thiserror = { workspace = true }
quick_cache = { workspace = true }

# Bridge dependencies

Expand Down
10 changes: 5 additions & 5 deletions bridges/relays/lib-substrate-relay/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,29 +32,29 @@ bp-relayers = { workspace = true, default-features = true }

equivocation-detector = { workspace = true }
finality-relay = { workspace = true }
parachains-relay = { workspace = true }
relay-utils = { workspace = true }
messages-relay = { workspace = true }
parachains-relay = { workspace = true }
relay-substrate-client = { workspace = true }
relay-utils = { workspace = true }

pallet-bridge-grandpa = { workspace = true, default-features = true }
pallet-bridge-messages = { workspace = true, default-features = true }
pallet-bridge-parachains = { workspace = true, default-features = true }

bp-runtime = { workspace = true, default-features = true }
bp-messages = { workspace = true, default-features = true }
bp-runtime = { workspace = true, default-features = true }

# Substrate Dependencies
frame-support = { workspace = true, default-features = true }
frame-system = { workspace = true, default-features = true }
pallet-balances = { workspace = true, default-features = true }
pallet-grandpa = { workspace = true, default-features = true }
sp-core = { workspace = true, default-features = true }
sp-consensus-grandpa = { workspace = true, default-features = true }
sp-core = { workspace = true, default-features = true }
sp-runtime = { workspace = true, default-features = true }
sp-trie = { workspace = true }

[dev-dependencies]
scale-info = { features = ["derive"], workspace = true }
pallet-transaction-payment = { workspace = true, default-features = true }
relay-substrate-client = { features = ["test-helpers"], workspace = true }
scale-info = { features = ["derive"], workspace = true }
8 changes: 4 additions & 4 deletions bridges/relays/utils/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,24 @@ async-std = { workspace = true }
async-trait = { workspace = true }
backoff = { workspace = true }
console = { workspace = true }
isahc = { workspace = true }
sp-tracing = { workspace = true, default-features = true }
futures = { workspace = true }
isahc = { workspace = true }
jsonpath_lib = { workspace = true }
log = { workspace = true }
num-traits = { workspace = true, default-features = true }
parking_lot = { workspace = true, default-features = true }
serde_json = { workspace = true, default-features = true }
sp-tracing = { workspace = true, default-features = true }
sysinfo = { workspace = true }
thiserror = { workspace = true }
time = { features = ["formatting", "local-offset", "std"], workspace = true }
tokio = { features = ["rt"], workspace = true, default-features = true }
thiserror = { workspace = true }

# Bridge dependencies

bp-runtime = { workspace = true, default-features = true }

# Substrate dependencies

sp-runtime = { workspace = true, default-features = true }
prometheus-endpoint = { workspace = true, default-features = true }
sp-runtime = { workspace = true, default-features = true }
22 changes: 11 additions & 11 deletions bridges/snowbridge/pallets/ethereum-client/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,37 +15,37 @@ workspace = true
targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
serde = { optional = true, workspace = true, default-features = true }
serde_json = { optional = true, workspace = true, default-features = true }
codec = { features = ["derive"], workspace = true }
scale-info = { features = ["derive"], workspace = true }
hex-literal = { optional = true, workspace = true, default-features = true }
log = { workspace = true }
scale-info = { features = ["derive"], workspace = true }
serde = { optional = true, workspace = true, default-features = true }
serde_json = { optional = true, workspace = true, default-features = true }

frame-benchmarking = { optional = true, workspace = true }
frame-support = { workspace = true }
frame-system = { workspace = true }
sp-core = { workspace = true }
sp-std = { workspace = true }
sp-runtime = { workspace = true }
sp-io = { optional = true, workspace = true }
sp-runtime = { workspace = true }
sp-std = { workspace = true }

pallet-timestamp = { optional = true, workspace = true }
snowbridge-beacon-primitives = { workspace = true }
snowbridge-core = { workspace = true }
snowbridge-ethereum = { workspace = true }
snowbridge-pallet-ethereum-client-fixtures = { optional = true, workspace = true }
snowbridge-beacon-primitives = { workspace = true }
static_assertions = { workspace = true }
pallet-timestamp = { optional = true, workspace = true }

[dev-dependencies]
rand = { workspace = true, default-features = true }
sp-keyring = { workspace = true, default-features = true }
serde_json = { workspace = true, default-features = true }
hex-literal = { workspace = true, default-features = true }
pallet-timestamp = { workspace = true, default-features = true }
rand = { workspace = true, default-features = true }
serde = { workspace = true, default-features = true }
serde_json = { workspace = true, default-features = true }
snowbridge-pallet-ethereum-client-fixtures = { workspace = true, default-features = true }
sp-io = { workspace = true, default-features = true }
serde = { workspace = true, default-features = true }
sp-keyring = { workspace = true, default-features = true }

[features]
default = ["std"]
Expand Down
4 changes: 2 additions & 2 deletions bridges/snowbridge/pallets/ethereum-client/fixtures/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
hex-literal = { workspace = true, default-features = true }
snowbridge-beacon-primitives = { workspace = true }
snowbridge-core = { workspace = true }
sp-core = { workspace = true }
sp-std = { workspace = true }
snowbridge-core = { workspace = true }
snowbridge-beacon-primitives = { workspace = true }

[features]
default = ["std"]
Expand Down
Loading

0 comments on commit a843d15

Please sign in to comment.