Skip to content

Commit 4b126e5

Browse files
ggwpezDaanvdplas
ggwpez
authored and
Daanvdplas
committed
Fix features (#1194)
* Manually fix conflicting ? Signed-off-by: Oliver Tale-Yazdi <[email protected]> * Remove duplicates Signed-off-by: Oliver Tale-Yazdi <[email protected]> * Autofix feature propagation 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 zepter f f Signed-off-by: Oliver Tale-Yazdi <[email protected]> * Bump zepter Signed-off-by: Oliver Tale-Yazdi <[email protected]> * Add some duplicates Signed-off-by: Oliver Tale-Yazdi <[email protected]> * Revert "Add some duplicates" This reverts commit c6ce627. * Remove default enabled features Signed-off-by: Oliver Tale-Yazdi <[email protected]> * Bump Zepter Signed-off-by: Oliver Tale-Yazdi <[email protected]> * Bump in correct location 🤦 Signed-off-by: Oliver Tale-Yazdi <[email protected]> * DNM: Add some mistakes Signed-off-by: Oliver Tale-Yazdi <[email protected]> * DNM: Add some mistakes Signed-off-by: Oliver Tale-Yazdi <[email protected]> * Revert "DNM: Add some mistakes" This reverts commit d469b3f. * Revert "DNM: Add some mistakes" This reverts commit d892a73. --------- Signed-off-by: Oliver Tale-Yazdi <[email protected]>
1 parent c3a2a24 commit 4b126e5

File tree

74 files changed

+632
-45
lines changed

Some content is hidden

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

74 files changed

+632
-45
lines changed

‎.gitlab/pipeline/check.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ cargo-fmt-manifest:
2727
- .docker-env
2828
- .common-refs
2929
script:
30-
- cargo install zepter --locked --version 0.10.0 -q -f --no-default-features && zepter --version
30+
- cargo install zepter --locked --version 0.11.0 -q -f --no-default-features && zepter --version
3131
- echo "👉 Hello developer! If you see this CI check failing then it means that one of the your changes in a Cargo.toml file introduced ill-formatted or unsorted features. Please take a look at 'docs/STYLE_GUIDE.md#manifest-formatting' to find out more."
3232
- zepter format features --check
3333
allow_failure: true # Experimental
@@ -97,7 +97,7 @@ test-rust-feature-propagation:
9797
- .kubernetes-env
9898
- .test-pr-refs
9999
script:
100-
- cargo install --locked --version 0.10.0 -q -f zepter && zepter --version
100+
- cargo install --locked --version 0.11.1 -q -f zepter && zepter --version
101101
- echo "👉 Hello developer! If you see this CI check failing then it means that one of the crates is missing a feature for one of its dependencies. The output below tells you which feature needs to be added for which dependency to which crate. You can do this by modifying the Cargo.toml file. For more context see the MR where this check was introduced https://github.com/paritytech/substrate/pull/14660"
102102
- zepter lint propagate-feature --feature try-runtime --left-side-feature-missing=ignore --workspace --feature-enables-dep="try-runtime:frame-try-runtime" --locked
103103
- zepter lint propagate-feature --feature runtime-benchmarks --left-side-feature-missing=ignore --workspace --feature-enables-dep="runtime-benchmarks:frame-benchmarking" --locked

‎cumulus/bridges/bin/runtime-common/Cargo.toml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ std = [
5555
"bp-messages/std",
5656
"bp-parachains/std",
5757
"bp-polkadot-core/std",
58+
"bp-relayers/std",
5859
"bp-runtime/std",
5960
"bp-xcm-bridge-hub-router/std",
6061
"codec/std",
@@ -79,10 +80,15 @@ std = [
7980
"xcm/std",
8081
]
8182
runtime-benchmarks = [
83+
"frame-support/runtime-benchmarks",
84+
"frame-system/runtime-benchmarks",
85+
"pallet-balances/runtime-benchmarks",
8286
"pallet-bridge-grandpa/runtime-benchmarks",
8387
"pallet-bridge-messages/runtime-benchmarks",
8488
"pallet-bridge-parachains/runtime-benchmarks",
8589
"pallet-bridge-relayers/runtime-benchmarks",
90+
"pallet-utility/runtime-benchmarks",
91+
"sp-runtime/runtime-benchmarks",
8692
"xcm-builder/runtime-benchmarks",
8793
]
8894
integrity-test = [ "static_assertions" ]

‎cumulus/bridges/modules/grandpa/Cargo.toml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,12 @@ std = [
5656
runtime-benchmarks = [
5757
"bp-test-utils",
5858
"frame-benchmarking/runtime-benchmarks",
59+
"frame-support/runtime-benchmarks",
60+
"frame-system/runtime-benchmarks",
61+
"sp-runtime/runtime-benchmarks",
62+
]
63+
try-runtime = [
64+
"frame-support/try-runtime",
65+
"frame-system/try-runtime",
66+
"sp-runtime/try-runtime",
5967
]
60-
try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime" ]

‎cumulus/bridges/modules/messages/Cargo.toml‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,16 @@ std = [
4747
"sp-runtime/std",
4848
"sp-std/std",
4949
]
50-
runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks" ]
51-
try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime" ]
50+
runtime-benchmarks = [
51+
"frame-benchmarking/runtime-benchmarks",
52+
"frame-support/runtime-benchmarks",
53+
"frame-system/runtime-benchmarks",
54+
"pallet-balances/runtime-benchmarks",
55+
"sp-runtime/runtime-benchmarks",
56+
]
57+
try-runtime = [
58+
"frame-support/try-runtime",
59+
"frame-system/try-runtime",
60+
"pallet-balances/try-runtime",
61+
"sp-runtime/try-runtime",
62+
]

‎cumulus/bridges/modules/parachains/Cargo.toml‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,16 @@ std = [
5151
"sp-std/std",
5252
"sp-trie/std",
5353
]
54-
runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks" ]
55-
try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime" ]
54+
runtime-benchmarks = [
55+
"frame-benchmarking/runtime-benchmarks",
56+
"frame-support/runtime-benchmarks",
57+
"frame-system/runtime-benchmarks",
58+
"pallet-bridge-grandpa/runtime-benchmarks",
59+
"sp-runtime/runtime-benchmarks",
60+
]
61+
try-runtime = [
62+
"frame-support/try-runtime",
63+
"frame-system/try-runtime",
64+
"pallet-bridge-grandpa/try-runtime",
65+
"sp-runtime/try-runtime",
66+
]

‎cumulus/bridges/modules/relayers/Cargo.toml‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,24 @@ std = [
4545
"frame-support/std",
4646
"frame-system/std",
4747
"log/std",
48+
"pallet-bridge-messages/std",
4849
"scale-info/std",
4950
"sp-arithmetic/std",
5051
"sp-runtime/std",
5152
"sp-std/std",
5253
]
53-
runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks" ]
54-
try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime" ]
54+
runtime-benchmarks = [
55+
"frame-benchmarking/runtime-benchmarks",
56+
"frame-support/runtime-benchmarks",
57+
"frame-system/runtime-benchmarks",
58+
"pallet-balances/runtime-benchmarks",
59+
"pallet-bridge-messages/runtime-benchmarks",
60+
"sp-runtime/runtime-benchmarks",
61+
]
62+
try-runtime = [
63+
"frame-support/try-runtime",
64+
"frame-system/try-runtime",
65+
"pallet-balances/try-runtime",
66+
"pallet-bridge-messages/try-runtime",
67+
"sp-runtime/try-runtime",
68+
]

‎cumulus/bridges/modules/xcm-bridge-hub-router/Cargo.toml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,13 @@ std = [
5151
]
5252
runtime-benchmarks = [
5353
"frame-benchmarking/runtime-benchmarks",
54+
"frame-support/runtime-benchmarks",
55+
"frame-system/runtime-benchmarks",
56+
"sp-runtime/runtime-benchmarks",
5457
"xcm-builder/runtime-benchmarks",
5558
]
56-
try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime" ]
59+
try-runtime = [
60+
"frame-support/try-runtime",
61+
"frame-system/try-runtime",
62+
"sp-runtime/try-runtime",
63+
]

‎cumulus/bridges/primitives/test-utils/Cargo.toml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ sp-trie = { path = "../../../../substrate/primitives/trie", default-features = f
2424
default = [ "std" ]
2525
std = [
2626
"bp-header-chain/std",
27+
"bp-parachains/std",
2728
"bp-polkadot-core/std",
29+
"bp-runtime/std",
2830
"codec/std",
2931
"ed25519-dalek/std",
3032
"finality-grandpa/std",
@@ -33,4 +35,5 @@ std = [
3335
"sp-core/std",
3436
"sp-runtime/std",
3537
"sp-std/std",
38+
"sp-trie/std",
3639
]

‎cumulus/pallets/aura-ext/Cargo.toml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,18 @@ std = [
3535
"frame-support/std",
3636
"frame-system/std",
3737
"pallet-aura/std",
38+
"pallet-timestamp/std",
3839
"scale-info/std",
3940
"sp-application-crypto/std",
4041
"sp-consensus-aura/std",
4142
"sp-runtime/std",
4243
"sp-std/std",
4344
]
44-
try-runtime = [ "frame-support/try-runtime" ]
45+
try-runtime = [
46+
"cumulus-pallet-parachain-system/try-runtime",
47+
"frame-support/try-runtime",
48+
"frame-system/try-runtime",
49+
"pallet-aura/try-runtime",
50+
"pallet-timestamp/try-runtime",
51+
"sp-runtime/try-runtime",
52+
]

‎cumulus/pallets/collator-selection/Cargo.toml‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ runtime-benchmarks = [
4444
"frame-benchmarking/runtime-benchmarks",
4545
"frame-support/runtime-benchmarks",
4646
"frame-system/runtime-benchmarks",
47+
"pallet-balances/runtime-benchmarks",
48+
"pallet-timestamp/runtime-benchmarks",
49+
"sp-runtime/runtime-benchmarks",
50+
"sp-staking/runtime-benchmarks",
4751
]
4852
std = [
4953
"codec/std",
@@ -60,6 +64,15 @@ std = [
6064
"sp-std/std",
6165
]
6266

63-
try-runtime = [ "frame-support/try-runtime" ]
67+
try-runtime = [
68+
"frame-support/try-runtime",
69+
"frame-system/try-runtime",
70+
"pallet-aura/try-runtime",
71+
"pallet-authorship/try-runtime",
72+
"pallet-balances/try-runtime",
73+
"pallet-session/try-runtime",
74+
"pallet-timestamp/try-runtime",
75+
"sp-runtime/try-runtime",
76+
]
6477

6578
experimental = [ "pallet-aura/experimental" ]

0 commit comments

Comments
 (0)