Skip to content

Commit

Permalink
Enforce consistent and correct toml formatting (paritytech#2518)
Browse files Browse the repository at this point in the history
Using taplo, fixes all our broken and inconsistent toml formatting and
adds CI to keep them tidy.

If people want we can customise the format rules as described here
https://taplo.tamasfe.dev/configuration/formatter-options.html

@ggwpez, I suggest zepter is used only for checking features are
propagated, and leave formatting for taplo to avoid duplicate work and
conflicts.

TODO
- [x] Use `exclude = [...]` syntax in taplo file to ignore zombienet
tests instead of deleting the dir

---------

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Co-authored-by: Bastian Köcher <git@kchr.de>
  • Loading branch information
3 people committed Dec 1, 2023
1 parent a666b41 commit c9d9365
Show file tree
Hide file tree
Showing 225 changed files with 1,489 additions and 1,460 deletions.
8 changes: 4 additions & 4 deletions substrate/bin/minimal/node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ jsonrpsee = { version = "0.16.2", features = ["server"] }
serde_json = "1.0.108"

sc-cli = { path = "../../../client/cli" }
sc-executor = { path = "../../../client/executor" }
sc-network = { path = "../../../client/network" }
sc-service = { path = "../../../client/service" }
sc-executor = { path = "../../../client/executor" }
sc-network = { path = "../../../client/network" }
sc-service = { path = "../../../client/service" }
sc-telemetry = { path = "../../../client/telemetry" }
sc-transaction-pool = { path = "../../../client/transaction-pool" }
sc-transaction-pool-api = { path = "../../../client/transaction-pool/api" }
Expand All @@ -47,7 +47,7 @@ sp-runtime = { path = "../../../primitives/runtime" }

substrate-frame-rpc-system = { path = "../../../utils/frame/rpc/system" }

frame = { path = "../../../frame", features = ["runtime", "experimental"] }
frame = { path = "../../../frame", features = ["experimental", "runtime"] }
runtime = { package = "minimal-runtime", path = "../runtime" }

[build-dependencies]
Expand Down
8 changes: 4 additions & 4 deletions substrate/bin/minimal/runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ parity-scale-codec = { version = "3.0.0", default-features = false }
scale-info = { version = "2.6.0", default-features = false }

# this is a frame-based runtime, thus importing `frame` with runtime feature enabled.
frame = { path = "../../../frame", default-features = false, features = ["runtime", "experimental"] }
frame-support = { path = "../../../frame/support", default-features = false}
frame = { path = "../../../frame", default-features = false, features = ["experimental", "runtime"] }
frame-support = { path = "../../../frame/support", default-features = false }

# pallets that we want to use
pallet-balances = { path = "../../../frame/balances", default-features = false }
Expand All @@ -24,14 +24,14 @@ pallet-transaction-payment = { path = "../../../frame/transaction-payment", defa
pallet-transaction-payment-rpc-runtime-api = { path = "../../../frame/transaction-payment/rpc/runtime-api", default-features = false }

# genesis builder that allows us to interacto with runtime genesis config
sp-genesis-builder = { path = "../../../primitives/genesis-builder", default-features = false}
sp-genesis-builder = { path = "../../../primitives/genesis-builder", default-features = false }


[build-dependencies]
substrate-wasm-builder = { path = "../../../utils/wasm-builder", optional = true }

[features]
default = [ "std" ]
default = ["std"]
std = [
"frame-support/std",
"frame/std",
Expand Down
6 changes: 3 additions & 3 deletions substrate/bin/node-template/node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ name = "node-template"

[dependencies]
clap = { version = "4.4.10", features = ["derive"] }
futures = { version = "0.3.21", features = ["thread-pool"]}
futures = { version = "0.3.21", features = ["thread-pool"] }
serde_json = "1.0.108"

sc-cli = { path = "../../../client/cli" }
Expand All @@ -42,7 +42,7 @@ sp-timestamp = { path = "../../../primitives/timestamp" }
sp-inherents = { path = "../../../primitives/inherents" }
sp-keyring = { path = "../../../primitives/keyring" }
frame-system = { path = "../../../frame/system" }
pallet-transaction-payment = { path = "../../../frame/transaction-payment", default-features = false}
pallet-transaction-payment = { path = "../../../frame/transaction-payment", default-features = false }

# These dependencies are used for the node template's RPCs
jsonrpsee = { version = "0.16.2", features = ["server"] }
Expand All @@ -62,7 +62,7 @@ frame-benchmarking-cli = { path = "../../../utils/frame/benchmarking-cli" }
node-template-runtime = { path = "../runtime" }

# CLI-specific dependencies
try-runtime-cli = { path = "../../../utils/frame/try-runtime/cli", optional = true}
try-runtime-cli = { path = "../../../utils/frame/try-runtime/cli", optional = true }

[build-dependencies]
substrate-build-script-utils = { path = "../../../utils/build-script-utils" }
Expand Down
10 changes: 5 additions & 5 deletions substrate/bin/node-template/pallets/template/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
"derive",
] }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
frame-benchmarking = { path = "../../../../frame/benchmarking", default-features = false, optional = true}
frame-support = { path = "../../../../frame/support", default-features = false}
frame-system = { path = "../../../../frame/system", default-features = false}
sp-std = { path = "../../../../primitives/std", default-features = false}
frame-benchmarking = { path = "../../../../frame/benchmarking", default-features = false, optional = true }
frame-support = { path = "../../../../frame/support", default-features = false }
frame-system = { path = "../../../../frame/system", default-features = false }
sp-std = { path = "../../../../primitives/std", default-features = false }

[dev-dependencies]
sp-core = { path = "../../../../primitives/core" }
sp-io = { path = "../../../../primitives/io" }
sp-runtime = { path = "../../../../primitives/runtime" }

[features]
default = [ "std" ]
default = ["std"]
std = [
"codec/std",
"frame-benchmarking?/std",
Expand Down
46 changes: 23 additions & 23 deletions substrate/bin/node-template/runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,48 +16,48 @@ targets = ["x86_64-unknown-linux-gnu"]
codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
scale-info = { version = "2.10.0", default-features = false, features = ["derive", "serde"] }

pallet-aura = { path = "../../../frame/aura", default-features = false}
pallet-balances = { path = "../../../frame/balances", default-features = false}
frame-support = { path = "../../../frame/support", default-features = false}
pallet-grandpa = { path = "../../../frame/grandpa", default-features = false}
pallet-sudo = { path = "../../../frame/sudo", default-features = false}
frame-system = { path = "../../../frame/system", default-features = false}
pallet-aura = { path = "../../../frame/aura", default-features = false }
pallet-balances = { path = "../../../frame/balances", default-features = false }
frame-support = { path = "../../../frame/support", default-features = false }
pallet-grandpa = { path = "../../../frame/grandpa", default-features = false }
pallet-sudo = { path = "../../../frame/sudo", default-features = false }
frame-system = { path = "../../../frame/system", default-features = false }
frame-try-runtime = { path = "../../../frame/try-runtime", default-features = false, optional = true }
pallet-timestamp = { path = "../../../frame/timestamp", default-features = false}
pallet-transaction-payment = { path = "../../../frame/transaction-payment", default-features = false}
frame-executive = { path = "../../../frame/executive", default-features = false}
sp-api = { path = "../../../primitives/api", default-features = false}
sp-block-builder = { path = "../../../primitives/block-builder", default-features = false}
pallet-timestamp = { path = "../../../frame/timestamp", default-features = false }
pallet-transaction-payment = { path = "../../../frame/transaction-payment", default-features = false }
frame-executive = { path = "../../../frame/executive", default-features = false }
sp-api = { path = "../../../primitives/api", default-features = false }
sp-block-builder = { path = "../../../primitives/block-builder", default-features = false }
sp-consensus-aura = { path = "../../../primitives/consensus/aura", default-features = false, features = ["serde"] }
sp-consensus-grandpa = { path = "../../../primitives/consensus/grandpa", default-features = false, features = ["serde"] }
sp-core = { path = "../../../primitives/core", default-features = false, features = ["serde"]}
sp-inherents = { path = "../../../primitives/inherents", default-features = false}
sp-offchain = { path = "../../../primitives/offchain", default-features = false}
sp-core = { path = "../../../primitives/core", default-features = false, features = ["serde"] }
sp-inherents = { path = "../../../primitives/inherents", default-features = false }
sp-offchain = { path = "../../../primitives/offchain", default-features = false }
sp-runtime = { path = "../../../primitives/runtime", default-features = false, features = ["serde"] }
sp-session = { path = "../../../primitives/session", default-features = false}
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-session = { path = "../../../primitives/session", default-features = false }
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.108", default-features = false, features = ["alloc"] }
sp-genesis-builder = { default-features = false, path = "../../../primitives/genesis-builder" }

# Used for the node template's RPCs
frame-system-rpc-runtime-api = { path = "../../../frame/system/rpc/runtime-api", default-features = false}
pallet-transaction-payment-rpc-runtime-api = { path = "../../../frame/transaction-payment/rpc/runtime-api", default-features = false}
frame-system-rpc-runtime-api = { path = "../../../frame/system/rpc/runtime-api", default-features = false }
pallet-transaction-payment-rpc-runtime-api = { path = "../../../frame/transaction-payment/rpc/runtime-api", default-features = false }

# Used for runtime benchmarking
frame-benchmarking = { path = "../../../frame/benchmarking", default-features = false, optional = true }
frame-system-benchmarking = { path = "../../../frame/system/benchmarking", default-features = false, optional = true }

# Local Dependencies
pallet-template = { path = "../pallets/template", default-features = false}
pallet-template = { path = "../pallets/template", default-features = false }

[build-dependencies]
substrate-wasm-builder = { path = "../../../utils/wasm-builder", optional = true }

[features]
default = [ "std" ]
default = ["std"]
std = [
"codec/std",
"frame-benchmarking?/std",
Expand Down Expand Up @@ -119,4 +119,4 @@ try-runtime = [
"pallet-transaction-payment/try-runtime",
"sp-runtime/try-runtime",
]
experimental = [ "pallet-aura/experimental" ]
experimental = ["pallet-aura/experimental"]
4 changes: 2 additions & 2 deletions substrate/bin/node-template/rust-toolchain.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ components = [
"rust-analyzer",
"rust-src",
"rust-std",
"rustc-dev",
"rustc",
"rustc-dev",
"rustfmt",
]
targets = [ "wasm32-unknown-unknown" ]
targets = ["wasm32-unknown-unknown"]
profile = "minimal"
2 changes: 1 addition & 1 deletion substrate/bin/node/bench/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ sp-core = { path = "../../../primitives/core" }
sp-consensus = { path = "../../../primitives/consensus/common" }
sc-basic-authorship = { path = "../../../client/basic-authorship" }
sp-inherents = { path = "../../../primitives/inherents" }
sp-timestamp = { path = "../../../primitives/timestamp", default-features = false}
sp-timestamp = { path = "../../../primitives/timestamp", default-features = false }
sp-tracing = { path = "../../../primitives/tracing" }
hash-db = "0.16.0"
tempfile = "3.1.0"
Expand Down
28 changes: 14 additions & 14 deletions substrate/bin/node/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ sc-consensus-babe = { path = "../../../client/consensus/babe" }
grandpa = { package = "sc-consensus-grandpa", path = "../../../client/consensus/grandpa" }
sc-rpc = { path = "../../../client/rpc" }
sc-basic-authorship = { path = "../../../client/basic-authorship" }
sc-service = { path = "../../../client/service", default-features = false}
sc-service = { path = "../../../client/service", default-features = false }
sc-telemetry = { path = "../../../client/telemetry" }
sc-executor = { path = "../../../client/executor" }
sc-authority-discovery = { path = "../../../client/authority-discovery" }
Expand All @@ -96,19 +96,19 @@ frame-system-rpc-runtime-api = { path = "../../../frame/system/rpc/runtime-api"
pallet-assets = { path = "../../../frame/assets" }
pallet-asset-conversion-tx-payment = { path = "../../../frame/transaction-payment/asset-conversion-tx-payment" }
pallet-asset-tx-payment = { path = "../../../frame/transaction-payment/asset-tx-payment" }
pallet-im-online = { path = "../../../frame/im-online", default-features = false}
pallet-skip-feeless-payment = { path = "../../../frame/transaction-payment/skip-feeless-payment", default-features = false}
pallet-im-online = { path = "../../../frame/im-online", default-features = false }
pallet-skip-feeless-payment = { path = "../../../frame/transaction-payment/skip-feeless-payment", default-features = false }

# node-specific dependencies
kitchensink-runtime = { path = "../runtime" }
node-rpc = { path = "../rpc" }
node-primitives = { path = "../primitives" }

# CLI-specific dependencies
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}
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.108"

[dev-dependencies]
Expand All @@ -129,7 +129,7 @@ regex = "1.6.0"
platforms = "3.0"
soketto = "0.7.1"
criterion = { version = "0.4.0", features = ["async_tokio"] }
tokio = { version = "1.22.0", features = ["macros", "time", "parking_lot"] }
tokio = { version = "1.22.0", features = ["macros", "parking_lot", "time"] }
tokio-util = { version = "0.7.4", features = ["compat"] }
wait-timeout = "0.2"
substrate-rpc-client = { path = "../../../utils/frame/rpc/client" }
Expand Down Expand Up @@ -159,17 +159,17 @@ sp-state-machine = { path = "../../../primitives/state-machine" }
[build-dependencies]
clap = { version = "4.4.10", optional = true }
clap_complete = { version = "4.0.2", optional = true }
node-inspect = { package = "staging-node-inspect", path = "../inspect", optional = true}
frame-benchmarking-cli = { path = "../../../utils/frame/benchmarking-cli", optional = true}
substrate-build-script-utils = { path = "../../../utils/build-script-utils", optional = true}
substrate-frame-cli = { path = "../../../utils/frame/frame-utilities-cli", optional = true}
try-runtime-cli = { path = "../../../utils/frame/try-runtime/cli", optional = true}
node-inspect = { package = "staging-node-inspect", path = "../inspect", optional = true }
frame-benchmarking-cli = { path = "../../../utils/frame/benchmarking-cli", optional = true }
substrate-build-script-utils = { path = "../../../utils/build-script-utils", optional = true }
substrate-frame-cli = { path = "../../../utils/frame/frame-utilities-cli", optional = true }
try-runtime-cli = { path = "../../../utils/frame/try-runtime/cli", optional = true }
sc-cli = { path = "../../../client/cli", optional = true }
pallet-balances = { path = "../../../frame/balances" }
sc-storage-monitor = { path = "../../../client/storage-monitor" }

[features]
default = [ "cli" ]
default = ["cli"]
cli = [
"clap",
"clap_complete",
Expand Down
2 changes: 1 addition & 1 deletion substrate/bin/node/inspect/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ codec = { package = "parity-scale-codec", version = "3.6.1" }
thiserror = "1.0"
sc-cli = { path = "../../../client/cli" }
sc-client-api = { path = "../../../client/api" }
sc-service = { path = "../../../client/service", default-features = false}
sc-service = { path = "../../../client/service", default-features = false }
sp-blockchain = { path = "../../../primitives/blockchain" }
sp-core = { path = "../../../primitives/core" }
sp-io = { path = "../../../primitives/io" }
Expand Down
8 changes: 4 additions & 4 deletions substrate/bin/node/primitives/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ publish = false
targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
sp-core = { path = "../../../primitives/core", default-features = false}
sp-runtime = { path = "../../../primitives/runtime", default-features = false}
sp-core = { path = "../../../primitives/core", default-features = false }
sp-runtime = { path = "../../../primitives/runtime", default-features = false }

[features]
default = [ "std" ]
std = [ "sp-core/std", "sp-runtime/std" ]
default = ["std"]
std = ["sp-core/std", "sp-runtime/std"]
Loading

0 comments on commit c9d9365

Please sign in to comment.