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

Commit b05a9d3

Browse files
ggwpezbkchr
ggwpez
and
bkchr
authored
Fix Substrate features (#14660)
* 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]>
1 parent 26ece81 commit b05a9d3

File tree

122 files changed

+1105
-123
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+1105
-123
lines changed

‎bin/node-template/node/Cargo.toml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,16 @@ runtime-benchmarks = [
7373
"node-template-runtime/runtime-benchmarks",
7474
"frame-benchmarking/runtime-benchmarks",
7575
"frame-benchmarking-cli/runtime-benchmarks",
76+
"frame-system/runtime-benchmarks",
77+
"sc-service/runtime-benchmarks",
78+
"sp-runtime/runtime-benchmarks"
7679
]
7780
# Enable features that allow the runtime to be tried and debugged. Name might be subject to change
7881
# in the near future.
79-
try-runtime = ["node-template-runtime/try-runtime", "try-runtime-cli/try-runtime"]
82+
try-runtime = [
83+
"node-template-runtime/try-runtime",
84+
"try-runtime-cli/try-runtime",
85+
"frame-system/try-runtime",
86+
"pallet-transaction-payment/try-runtime",
87+
"sp-runtime/try-runtime"
88+
]

‎bin/node-template/pallets/template/Cargo.toml‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,18 @@ std = [
3434
"frame-support/std",
3535
"frame-system/std",
3636
"scale-info/std",
37+
"sp-core/std",
38+
"sp-io/std",
39+
"sp-runtime/std"
40+
]
41+
runtime-benchmarks = [
42+
"frame-benchmarking/runtime-benchmarks",
43+
"frame-support/runtime-benchmarks",
44+
"frame-system/runtime-benchmarks",
45+
"sp-runtime/runtime-benchmarks"
46+
]
47+
try-runtime = [
48+
"frame-support/try-runtime",
49+
"frame-system/try-runtime",
50+
"sp-runtime/try-runtime"
3751
]
38-
runtime-benchmarks = ["frame-benchmarking/runtime-benchmarks"]
39-
try-runtime = ["frame-support/try-runtime"]

‎bin/node-template/runtime/Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,4 +112,5 @@ try-runtime = [
112112
"pallet-template/try-runtime",
113113
"pallet-timestamp/try-runtime",
114114
"pallet-transaction-payment/try-runtime",
115+
"sp-runtime/try-runtime"
115116
]

‎bin/node/cli/Cargo.toml‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,11 +161,31 @@ cli = [
161161
]
162162
runtime-benchmarks = [
163163
"kitchensink-runtime/runtime-benchmarks",
164-
"frame-benchmarking-cli/runtime-benchmarks"
164+
"frame-benchmarking-cli/runtime-benchmarks",
165+
"frame-system/runtime-benchmarks",
166+
"pallet-asset-tx-payment/runtime-benchmarks",
167+
"pallet-assets/runtime-benchmarks",
168+
"pallet-balances/runtime-benchmarks",
169+
"pallet-im-online/runtime-benchmarks",
170+
"pallet-timestamp/runtime-benchmarks",
171+
"sc-client-db/runtime-benchmarks",
172+
"sc-service/runtime-benchmarks",
173+
"sp-runtime/runtime-benchmarks"
165174
]
166175
# Enable features that allow the runtime to be tried and debugged. Name might be subject to change
167176
# in the near future.
168-
try-runtime = ["kitchensink-runtime/try-runtime", "try-runtime-cli/try-runtime"]
177+
try-runtime = [
178+
"kitchensink-runtime/try-runtime",
179+
"try-runtime-cli/try-runtime",
180+
"frame-system/try-runtime",
181+
"pallet-asset-conversion-tx-payment/try-runtime",
182+
"pallet-asset-tx-payment/try-runtime",
183+
"pallet-assets/try-runtime",
184+
"pallet-balances/try-runtime",
185+
"pallet-im-online/try-runtime",
186+
"pallet-timestamp/try-runtime",
187+
"sp-runtime/try-runtime"
188+
]
169189

170190
[[bench]]
171191
name = "transaction_pool"

‎bin/node/runtime/Cargo.toml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,11 @@ runtime-benchmarks = [
297297
"pallet-vesting/runtime-benchmarks",
298298
"pallet-whitelist/runtime-benchmarks",
299299
"frame-system-benchmarking/runtime-benchmarks",
300+
"frame-election-provider-support/runtime-benchmarks",
301+
"pallet-asset-tx-payment/runtime-benchmarks",
302+
"pallet-nomination-pools/runtime-benchmarks",
303+
"pallet-offences/runtime-benchmarks",
304+
"sp-staking/runtime-benchmarks"
300305
]
301306
try-runtime = [
302307
"frame-try-runtime/try-runtime",
@@ -365,4 +370,6 @@ try-runtime = [
365370
"pallet-nft-fractionalization/try-runtime",
366371
"pallet-vesting/try-runtime",
367372
"pallet-whitelist/try-runtime",
373+
"frame-election-provider-support/try-runtime",
374+
"sp-runtime/try-runtime"
368375
]

‎client/db/Cargo.toml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,10 @@ array-bytes = "6.1"
4949
[features]
5050
default = []
5151
test-helpers = []
52-
runtime-benchmarks = []
52+
runtime-benchmarks = [
53+
"kitchensink-runtime/runtime-benchmarks",
54+
"sp-runtime/runtime-benchmarks"
55+
]
5356
rocksdb = ["kvdb-rocksdb"]
5457

5558
[[bench]]

‎client/executor/Cargo.toml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,19 @@ harness = false
5757
[features]
5858
default = ["std"]
5959
# This crate does not have `no_std` support, we just require this for tests
60-
std = []
60+
std = [
61+
"sc-runtime-test/std",
62+
"sp-api/std",
63+
"sp-core/std",
64+
"sp-externalities/std",
65+
"sp-io/std",
66+
"sp-runtime/std",
67+
"sp-runtime-interface/std",
68+
"sp-state-machine/std",
69+
"sp-tracing/std",
70+
"sp-trie/std",
71+
"sp-version/std",
72+
"sp-wasm-interface/std",
73+
"substrate-test-runtime/std"
74+
]
6175
wasm-extern-trace = []

‎client/executor/runtime-test/Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,5 @@ std = [
3030
"sp-runtime/std",
3131
"sp-std/std",
3232
"substrate-wasm-builder",
33+
"sp-runtime-interface/std"
3334
]

‎client/service/Cargo.toml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ default = ["rocksdb"]
1919
rocksdb = ["sc-client-db/rocksdb"]
2020
# exposes the client type
2121
test-helpers = []
22-
runtime-benchmarks = ["sc-client-db/runtime-benchmarks"]
22+
runtime-benchmarks = [
23+
"sc-client-db/runtime-benchmarks",
24+
"sp-runtime/runtime-benchmarks"
25+
]
2326

2427
[dependencies]
2528
jsonrpsee = { version = "0.16.2", features = ["server"] }

‎frame/alliance/Cargo.toml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ std = [
5454
"frame-support/std",
5555
"frame-system/std",
5656
"pallet-identity/std",
57+
"pallet-balances/std"
5758
]
5859
runtime-benchmarks = [
5960
"array-bytes",
@@ -64,8 +65,13 @@ runtime-benchmarks = [
6465
"frame-system/runtime-benchmarks",
6566
"pallet-collective/runtime-benchmarks",
6667
"pallet-identity/runtime-benchmarks",
68+
"pallet-balances/runtime-benchmarks"
6769
]
6870
try-runtime = [
6971
"frame-support/try-runtime",
7072
"frame-system/try-runtime",
73+
"pallet-balances/try-runtime",
74+
"pallet-collective?/try-runtime",
75+
"pallet-identity/try-runtime",
76+
"sp-runtime/try-runtime"
7177
]

0 commit comments

Comments
 (0)