Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Commit

Permalink
Format and Sort features in Cargo.toml files (#14803)
Browse files Browse the repository at this point in the history
* CI: Add feature sorting check

Signed-off-by: Oliver Tale-Yazdi <[email protected]>

* Sort all features

Signed-off-by: Oliver Tale-Yazdi <[email protected]>

* Add some mistakes

Signed-off-by: Oliver Tale-Yazdi <[email protected]>

* Revert "Add some mistakes"

This reverts commit b2b1099.

* CI job naming

Signed-off-by: Oliver Tale-Yazdi <[email protected]>

* Add oneliner formatting

Signed-off-by: Oliver Tale-Yazdi <[email protected]>

* Explain tool

Signed-off-by: Oliver Tale-Yazdi <[email protected]>

* Use latest version

Signed-off-by: Oliver Tale-Yazdi <[email protected]>

* Better erorr message

Signed-off-by: Oliver Tale-Yazdi <[email protected]>

* Format after master merge

Signed-off-by: Oliver Tale-Yazdi <[email protected]>

* Use --check option

Signed-off-by: Oliver Tale-Yazdi <[email protected]>

* Messed up the merge commit...

Signed-off-by: Oliver Tale-Yazdi <[email protected]>

---------

Signed-off-by: Oliver Tale-Yazdi <[email protected]>
  • Loading branch information
ggwpez committed Aug 23, 2023
1 parent df383f2 commit b7c18f1
Show file tree
Hide file tree
Showing 161 changed files with 1,058 additions and 1,136 deletions.
12 changes: 6 additions & 6 deletions bin/node-template/node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -70,19 +70,19 @@ substrate-build-script-utils = { version = "3.0.0", path = "../../../utils/build
default = []
# Dependencies that are only required if runtime benchmarking should be build.
runtime-benchmarks = [
"node-template-runtime/runtime-benchmarks",
"frame-benchmarking/runtime-benchmarks",
"frame-benchmarking-cli/runtime-benchmarks",
"frame-benchmarking/runtime-benchmarks",
"frame-system/runtime-benchmarks",
"node-template-runtime/runtime-benchmarks",
"sc-service/runtime-benchmarks",
"sp-runtime/runtime-benchmarks"
"sp-runtime/runtime-benchmarks",
]
# Enable features that allow the runtime to be tried and debugged. Name might be subject to change
# in the near future.
try-runtime = [
"node-template-runtime/try-runtime",
"try-runtime-cli/try-runtime",
"frame-system/try-runtime",
"node-template-runtime/try-runtime",
"pallet-transaction-payment/try-runtime",
"sp-runtime/try-runtime"
"sp-runtime/try-runtime",
"try-runtime-cli/try-runtime",
]
8 changes: 4 additions & 4 deletions bin/node-template/pallets/template/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ sp-io = { version = "23.0.0", path = "../../../../primitives/io" }
sp-runtime = { version = "24.0.0", path = "../../../../primitives/runtime" }

[features]
default = ["std"]
default = [ "std" ]
std = [
"codec/std",
"frame-benchmarking?/std",
Expand All @@ -36,16 +36,16 @@ std = [
"scale-info/std",
"sp-core/std",
"sp-io/std",
"sp-runtime/std"
"sp-runtime/std",
]
runtime-benchmarks = [
"frame-benchmarking/runtime-benchmarks",
"frame-support/runtime-benchmarks",
"frame-system/runtime-benchmarks",
"sp-runtime/runtime-benchmarks"
"sp-runtime/runtime-benchmarks",
]
try-runtime = [
"frame-support/try-runtime",
"frame-system/try-runtime",
"sp-runtime/try-runtime"
"sp-runtime/try-runtime",
]
18 changes: 9 additions & 9 deletions bin/node-template/runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -54,18 +54,17 @@ pallet-template = { version = "4.0.0-dev", default-features = false, path = "../
substrate-wasm-builder = { version = "5.0.0-dev", path = "../../../utils/wasm-builder", optional = true }

[features]
default = ["std"]
default = [ "std" ]
std = [
"frame-try-runtime?/std",
"frame-system-benchmarking?/std",
"frame-benchmarking?/std",
"codec/std",
"scale-info/std",
"frame-benchmarking?/std",
"frame-executive/std",
"frame-support/std",
"frame-system-benchmarking?/std",
"frame-system-rpc-runtime-api/std",
"frame-system/std",
"frame-try-runtime/std",
"frame-try-runtime?/std",
"pallet-aura/std",
"pallet-balances/std",
"pallet-grandpa/std",
Expand All @@ -74,6 +73,7 @@ std = [
"pallet-timestamp/std",
"pallet-transaction-payment-rpc-runtime-api/std",
"pallet-transaction-payment/std",
"scale-info/std",
"sp-api/std",
"sp-block-builder/std",
"sp-consensus-aura/std",
Expand Down Expand Up @@ -101,17 +101,17 @@ runtime-benchmarks = [
"sp-runtime/runtime-benchmarks",
]
try-runtime = [
"frame-try-runtime/try-runtime",
"frame-executive/try-runtime",
"frame-system/try-runtime",
"frame-support/try-runtime",
"frame-system/try-runtime",
"frame-try-runtime/try-runtime",
"pallet-aura/try-runtime",
"pallet-balances/try-runtime",
"pallet-grandpa/try-runtime",
"pallet-sudo/try-runtime",
"pallet-template/try-runtime",
"pallet-timestamp/try-runtime",
"pallet-transaction-payment/try-runtime",
"sp-runtime/try-runtime"
"sp-runtime/try-runtime",
]
experimental = ["pallet-aura/experimental"]
experimental = [ "pallet-aura/experimental" ]
20 changes: 10 additions & 10 deletions bin/node/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -147,45 +147,45 @@ pallet-balances = { version = "4.0.0-dev", path = "../../../frame/balances" }
sc-storage-monitor = { version = "0.1.0", path = "../../../client/storage-monitor" }

[features]
default = ["cli"]
default = [ "cli" ]
cli = [
"clap",
"clap_complete",
"frame-benchmarking-cli",
"node-inspect",
"sc-cli",
"frame-benchmarking-cli",
"substrate-frame-cli",
"sc-service/rocksdb",
"clap",
"clap_complete",
"substrate-build-script-utils",
"substrate-frame-cli",
"try-runtime-cli",
]
runtime-benchmarks = [
"kitchensink-runtime/runtime-benchmarks",
"frame-benchmarking-cli/runtime-benchmarks",
"frame-system/runtime-benchmarks",
"kitchensink-runtime/runtime-benchmarks",
"pallet-asset-tx-payment/runtime-benchmarks",
"pallet-assets/runtime-benchmarks",
"pallet-balances/runtime-benchmarks",
"pallet-im-online/runtime-benchmarks",
"pallet-timestamp/runtime-benchmarks",
"sc-client-db/runtime-benchmarks",
"sc-service/runtime-benchmarks",
"sp-runtime/runtime-benchmarks"
"sp-runtime/runtime-benchmarks",
]
# Enable features that allow the runtime to be tried and debugged. Name might be subject to change
# in the near future.
try-runtime = [
"kitchensink-runtime/try-runtime",
"try-runtime-cli/try-runtime",
"frame-system/try-runtime",
"kitchensink-runtime/try-runtime",
"pallet-asset-conversion-tx-payment/try-runtime",
"pallet-asset-tx-payment/try-runtime",
"pallet-assets/try-runtime",
"pallet-balances/try-runtime",
"pallet-im-online/try-runtime",
"pallet-timestamp/try-runtime",
"sp-runtime/try-runtime",
"substrate-cli-test-utils/try-runtime"
"substrate-cli-test-utils/try-runtime",
"try-runtime-cli/try-runtime",
]

[[bench]]
Expand Down
7 changes: 2 additions & 5 deletions bin/node/primitives/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,5 @@ sp-core = { version = "21.0.0", default-features = false, path = "../../../primi
sp-runtime = { version = "24.0.0", default-features = false, path = "../../../primitives/runtime" }

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

0 comments on commit b7c18f1

Please sign in to comment.