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

Commit

Permalink
Fix Substrate features (#14660)
Browse files Browse the repository at this point in the history
* Fix std, runtime-benchmarks and try-runtime features

zepter lint propagate-feature --feature try-runtime --left-side-feature-missing=ignore --workspace --fix --feature-enables-dep="try-runtime:frame-try-runtime"
zepter lint propagate-feature --feature runtime-benchmarks --left-side-feature-missing=ignore --workspace --fix --feature-enables-dep="runtime-benchmarks:frame-benchmarking"
zepter lint propagate-feature --feature std --left-side-feature-missing=ignore --workspace --fix

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

* Add propagate feature CI check

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

* Test CI by adding an error

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

* Use --locked

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

* Add help msg

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

* Revert "Test CI by adding an error"

This reverts commit cf4ff6c.

* Test CI by adding an error

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

* No newline in help msg

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

* Revert "Test CI by adding an error"

This reverts commit 5daa06a.

* Test CI by adding an error

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

* Revert "Test CI by adding an error"

This reverts commit ca15de5.

* Fix msg

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

* Revert back to master

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

* Re-do with Zepter v0.7.4

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

* Update Zepter to 0.7.4

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

* Disable rococo try-runtime check

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

* Apply suggestions from code review

Co-authored-by: Bastian Köcher <[email protected]>

* More review fixes

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

---------

Signed-off-by: Oliver Tale-Yazdi <[email protected]>
Co-authored-by: Bastian Köcher <[email protected]>
  • Loading branch information
ggwpez and bkchr authored Aug 1, 2023
1 parent 26ece81 commit b05a9d3
Show file tree
Hide file tree
Showing 122 changed files with 1,105 additions and 123 deletions.
11 changes: 10 additions & 1 deletion bin/node-template/node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,16 @@ runtime-benchmarks = [
"node-template-runtime/runtime-benchmarks",
"frame-benchmarking/runtime-benchmarks",
"frame-benchmarking-cli/runtime-benchmarks",
"frame-system/runtime-benchmarks",
"sc-service/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"]
try-runtime = [
"node-template-runtime/try-runtime",
"try-runtime-cli/try-runtime",
"frame-system/try-runtime",
"pallet-transaction-payment/try-runtime",
"sp-runtime/try-runtime"
]
16 changes: 14 additions & 2 deletions bin/node-template/pallets/template/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,18 @@ std = [
"frame-support/std",
"frame-system/std",
"scale-info/std",
"sp-core/std",
"sp-io/std",
"sp-runtime/std"
]
runtime-benchmarks = [
"frame-benchmarking/runtime-benchmarks",
"frame-support/runtime-benchmarks",
"frame-system/runtime-benchmarks",
"sp-runtime/runtime-benchmarks"
]
try-runtime = [
"frame-support/try-runtime",
"frame-system/try-runtime",
"sp-runtime/try-runtime"
]
runtime-benchmarks = ["frame-benchmarking/runtime-benchmarks"]
try-runtime = ["frame-support/try-runtime"]
1 change: 1 addition & 0 deletions bin/node-template/runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -112,4 +112,5 @@ try-runtime = [
"pallet-template/try-runtime",
"pallet-timestamp/try-runtime",
"pallet-transaction-payment/try-runtime",
"sp-runtime/try-runtime"
]
24 changes: 22 additions & 2 deletions bin/node/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -161,11 +161,31 @@ cli = [
]
runtime-benchmarks = [
"kitchensink-runtime/runtime-benchmarks",
"frame-benchmarking-cli/runtime-benchmarks"
"frame-benchmarking-cli/runtime-benchmarks",
"frame-system/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"
]
# 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"]
try-runtime = [
"kitchensink-runtime/try-runtime",
"try-runtime-cli/try-runtime",
"frame-system/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"
]

[[bench]]
name = "transaction_pool"
Expand Down
7 changes: 7 additions & 0 deletions bin/node/runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,11 @@ runtime-benchmarks = [
"pallet-vesting/runtime-benchmarks",
"pallet-whitelist/runtime-benchmarks",
"frame-system-benchmarking/runtime-benchmarks",
"frame-election-provider-support/runtime-benchmarks",
"pallet-asset-tx-payment/runtime-benchmarks",
"pallet-nomination-pools/runtime-benchmarks",
"pallet-offences/runtime-benchmarks",
"sp-staking/runtime-benchmarks"
]
try-runtime = [
"frame-try-runtime/try-runtime",
Expand Down Expand Up @@ -365,4 +370,6 @@ try-runtime = [
"pallet-nft-fractionalization/try-runtime",
"pallet-vesting/try-runtime",
"pallet-whitelist/try-runtime",
"frame-election-provider-support/try-runtime",
"sp-runtime/try-runtime"
]
5 changes: 4 additions & 1 deletion client/db/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,10 @@ array-bytes = "6.1"
[features]
default = []
test-helpers = []
runtime-benchmarks = []
runtime-benchmarks = [
"kitchensink-runtime/runtime-benchmarks",
"sp-runtime/runtime-benchmarks"
]
rocksdb = ["kvdb-rocksdb"]

[[bench]]
Expand Down
16 changes: 15 additions & 1 deletion client/executor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,19 @@ harness = false
[features]
default = ["std"]
# This crate does not have `no_std` support, we just require this for tests
std = []
std = [
"sc-runtime-test/std",
"sp-api/std",
"sp-core/std",
"sp-externalities/std",
"sp-io/std",
"sp-runtime/std",
"sp-runtime-interface/std",
"sp-state-machine/std",
"sp-tracing/std",
"sp-trie/std",
"sp-version/std",
"sp-wasm-interface/std",
"substrate-test-runtime/std"
]
wasm-extern-trace = []
1 change: 1 addition & 0 deletions client/executor/runtime-test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,5 @@ std = [
"sp-runtime/std",
"sp-std/std",
"substrate-wasm-builder",
"sp-runtime-interface/std"
]
5 changes: 4 additions & 1 deletion client/service/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ default = ["rocksdb"]
rocksdb = ["sc-client-db/rocksdb"]
# exposes the client type
test-helpers = []
runtime-benchmarks = ["sc-client-db/runtime-benchmarks"]
runtime-benchmarks = [
"sc-client-db/runtime-benchmarks",
"sp-runtime/runtime-benchmarks"
]

[dependencies]
jsonrpsee = { version = "0.16.2", features = ["server"] }
Expand Down
6 changes: 6 additions & 0 deletions frame/alliance/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ std = [
"frame-support/std",
"frame-system/std",
"pallet-identity/std",
"pallet-balances/std"
]
runtime-benchmarks = [
"array-bytes",
Expand All @@ -64,8 +65,13 @@ runtime-benchmarks = [
"frame-system/runtime-benchmarks",
"pallet-collective/runtime-benchmarks",
"pallet-identity/runtime-benchmarks",
"pallet-balances/runtime-benchmarks"
]
try-runtime = [
"frame-support/try-runtime",
"frame-system/try-runtime",
"pallet-balances/try-runtime",
"pallet-collective?/try-runtime",
"pallet-identity/try-runtime",
"sp-runtime/try-runtime"
]
18 changes: 16 additions & 2 deletions frame/asset-conversion/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,25 @@ std = [
"scale-info/std",
"sp-std/std",
"sp-runtime/std",
"sp-arithmetic/std"
"sp-arithmetic/std",
"pallet-assets/std",
"pallet-balances/std",
"sp-api/std",
"sp-core/std",
"sp-io/std"
]
runtime-benchmarks = [
"frame-benchmarking/runtime-benchmarks",
"frame-system/runtime-benchmarks",
"sp-runtime/runtime-benchmarks",
"frame-support/runtime-benchmarks",
"pallet-assets/runtime-benchmarks",
"pallet-balances/runtime-benchmarks"
]
try-runtime = [
"frame-support/try-runtime",
"frame-system/try-runtime",
"pallet-assets/try-runtime",
"pallet-balances/try-runtime",
"sp-runtime/try-runtime"
]
try-runtime = ["frame-support/try-runtime"]
6 changes: 5 additions & 1 deletion frame/asset-rate/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,20 @@ std = [
"sp-runtime/std",
"sp-std/std",
"sp-core?/std",
"pallet-balances/std",
"sp-io/std"
]
runtime-benchmarks = [
"frame-benchmarking/runtime-benchmarks",
"frame-support/runtime-benchmarks",
"frame-system/runtime-benchmarks",
"sp-runtime/runtime-benchmarks",
"dep:sp-core",
"sp-core",
"pallet-balances/runtime-benchmarks"
]
try-runtime = [
"frame-support/try-runtime",
"frame-system/try-runtime",
"sp-runtime/try-runtime",
"pallet-balances/try-runtime"
]
11 changes: 10 additions & 1 deletion frame/assets/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,19 @@ std = [
"frame-support/std",
"frame-system/std",
"frame-benchmarking?/std",
"pallet-balances/std",
"sp-io/std"
]
runtime-benchmarks = [
"frame-benchmarking/runtime-benchmarks",
"sp-runtime/runtime-benchmarks",
"frame-system/runtime-benchmarks",
"frame-support/runtime-benchmarks",
"pallet-balances/runtime-benchmarks"
]
try-runtime = [
"frame-support/try-runtime",
"frame-system/try-runtime",
"pallet-balances/try-runtime",
"sp-runtime/try-runtime"
]
try-runtime = ["frame-support/try-runtime"]
8 changes: 7 additions & 1 deletion frame/atomic-swap/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,11 @@ std = [
"sp-io/std",
"sp-runtime/std",
"sp-std/std",
"pallet-balances/std"
]
try-runtime = [
"frame-support/try-runtime",
"frame-system/try-runtime",
"pallet-balances/try-runtime",
"sp-runtime/try-runtime"
]
try-runtime = ["frame-support/try-runtime"]
9 changes: 8 additions & 1 deletion frame/aura/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,12 @@ std = [
"sp-consensus-aura/std",
"sp-runtime/std",
"sp-std/std",
"sp-core/std",
"sp-io/std"
]
try-runtime = [
"frame-support/try-runtime",
"frame-system/try-runtime",
"pallet-timestamp/try-runtime",
"sp-runtime/try-runtime"
]
try-runtime = ["frame-support/try-runtime"]
9 changes: 8 additions & 1 deletion frame/authority-discovery/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,12 @@ std = [
"sp-authority-discovery/std",
"sp-runtime/std",
"sp-std/std",
"sp-core/std",
"sp-io/std"
]
try-runtime = [
"frame-support/try-runtime",
"frame-system/try-runtime",
"pallet-session/try-runtime",
"sp-runtime/try-runtime"
]
try-runtime = ["frame-support/try-runtime"]
8 changes: 7 additions & 1 deletion frame/authorship/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,11 @@ std = [
"scale-info/std",
"sp-runtime/std",
"sp-std/std",
"sp-core/std",
"sp-io/std"
]
try-runtime = [
"frame-support/try-runtime",
"frame-system/try-runtime",
"sp-runtime/try-runtime"
]
try-runtime = ["frame-support/try-runtime"]
30 changes: 28 additions & 2 deletions frame/babe/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,32 @@ std = [
"sp-session/std",
"sp-staking/std",
"sp-std/std",
"frame-election-provider-support/std",
"pallet-balances/std",
"pallet-offences/std",
"pallet-staking/std"
]
runtime-benchmarks = [
"frame-benchmarking/runtime-benchmarks",
"frame-election-provider-support/runtime-benchmarks",
"frame-support/runtime-benchmarks",
"frame-system/runtime-benchmarks",
"pallet-balances/runtime-benchmarks",
"pallet-offences/runtime-benchmarks",
"pallet-staking/runtime-benchmarks",
"pallet-timestamp/runtime-benchmarks",
"sp-runtime/runtime-benchmarks",
"sp-staking/runtime-benchmarks"
]
try-runtime = [
"frame-support/try-runtime",
"frame-election-provider-support/try-runtime",
"frame-system/try-runtime",
"pallet-authorship/try-runtime",
"pallet-balances/try-runtime",
"pallet-offences/try-runtime",
"pallet-session/try-runtime",
"pallet-staking/try-runtime",
"pallet-timestamp/try-runtime",
"sp-runtime/try-runtime"
]
runtime-benchmarks = ["frame-benchmarking/runtime-benchmarks"]
try-runtime = ["frame-support/try-runtime"]
11 changes: 10 additions & 1 deletion frame/bags-list/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ runtime-benchmarks = [
"pallet-balances/runtime-benchmarks",
"sp-tracing",
"frame-election-provider-support/runtime-benchmarks",
"frame-support/runtime-benchmarks",
"frame-system/runtime-benchmarks",
"sp-runtime/runtime-benchmarks"
]
fuzz = [
"sp-core",
Expand All @@ -75,4 +78,10 @@ fuzz = [
"sp-tracing",
"frame-election-provider-support/fuzz",
]
try-runtime = [ "frame-support/try-runtime", "frame-election-provider-support/try-runtime" ]
try-runtime = [
"frame-support/try-runtime",
"frame-election-provider-support/try-runtime",
"frame-system/try-runtime",
"pallet-balances?/try-runtime",
"sp-runtime/try-runtime"
]
17 changes: 15 additions & 2 deletions frame/balances/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,21 @@ std = [
"scale-info/std",
"sp-runtime/std",
"sp-std/std",
"pallet-transaction-payment/std",
"sp-core/std",
"sp-io/std"
]
# Enable support for setting the existential deposit to zero.
insecure_zero_ed = []
runtime-benchmarks = ["frame-benchmarking/runtime-benchmarks"]
try-runtime = ["frame-support/try-runtime"]
runtime-benchmarks = [
"frame-benchmarking/runtime-benchmarks",
"frame-support/runtime-benchmarks",
"frame-system/runtime-benchmarks",
"sp-runtime/runtime-benchmarks"
]
try-runtime = [
"frame-support/try-runtime",
"frame-system/try-runtime",
"pallet-transaction-payment/try-runtime",
"sp-runtime/try-runtime"
]
10 changes: 9 additions & 1 deletion frame/beefy-mmr/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,13 @@ std = [
"sp-runtime/std",
"sp-std/std",
"sp-api/std",
"sp-staking/std"
]
try-runtime = [
"frame-support/try-runtime",
"frame-system/try-runtime",
"pallet-beefy/try-runtime",
"pallet-mmr/try-runtime",
"pallet-session/try-runtime",
"sp-runtime/try-runtime"
]
try-runtime = ["frame-support/try-runtime"]
Loading

0 comments on commit b05a9d3

Please sign in to comment.