Skip to content

Commit 5a6ad28

Browse files
committed
Merge branch 'master' into tsv-disabling
* master: Removed TODO from test-case for hard-coded delivery fee estimation (#2042) Expose collection attributes from `Inspect` trait (#1914) `polkadot-parachain-primitives` should not depend on `frame-support`. (#1897) [testnet] Align testnet system parachain runtimes using `RelayTreasuryLocation` and `SystemParachains` in the same way (#2023) Sort the benchmarks before listing them (#2026) publish pallet-root-testing (#2017) Contracts: Add benchmarks to include files (#2022) Small optimisation to `--profile dev` wasm builds (#1851) basic-authorship: Improve time recording and logging (#2010) Application Crypto and BEEFY Support for paired (ECDSA,BLS) crypto (#1815) [ci] Run check-rust-feature-propagation in pr and master (#2012) Improve features dev-ex (#1831) Remove obsolete comment. (#2008)
2 parents 42607ad + 21d36b7 commit 5a6ad28

File tree

88 files changed

+1052
-480
lines changed

Some content is hidden

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

88 files changed

+1052
-480
lines changed

.config/zepter.yaml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
version:
2+
format: 1
3+
# Minimum version of the binary that is expected to work. This is just for printing a nice error
4+
# message when someone tries to use an older version.
5+
binary: 0.13.2
6+
7+
# The examples in this file assume crate `A` to have a dependency on crate `B`.
8+
workflows:
9+
check:
10+
- [
11+
'lint',
12+
# Check that `A` activates the features of `B`.
13+
'propagate-feature',
14+
# These are the features to check:
15+
'--features=try-runtime,runtime-benchmarks,std',
16+
# Do not try to add a new section into `[features]` of `A` only because `B` expose that feature. There are edge-cases where this is still needed, but we can add them manually.
17+
'--left-side-feature-missing=ignore',
18+
# Enabling this feature somehow pulls in two versions of `sp-runtime-interface` and makes it impossible to build that crate with `cargo b -p sp-runtime-interface`. We therefore disable it for now.
19+
'--ignore-missing-propagate=sp-core/std:bandersnatch_vrfs/std',
20+
# Ignore the case that `A` it outside of the workspace. Otherwise it will report errors in external dependencies that we have no influence on.
21+
'--left-side-outside-workspace=ignore',
22+
# Some features imply that they activate a specific dependency as non-optional. Otherwise the default behaviour with a `?` is used.
23+
'--feature-enables-dep=try-runtime:frame-try-runtime,runtime-benchmarks:frame-benchmarking',
24+
# Actually modify the files and not just report the issues:
25+
'--offline',
26+
'--locked',
27+
'--show-path',
28+
'--quiet',
29+
]
30+
# Format the features into canonical format:
31+
- ['format', 'features', '--offline', '--locked', '--quiet']
32+
# Same as `check`, but with the `--fix` flag.
33+
default:
34+
- [ $check.0, '--fix' ]
35+
- [ $check.1, '--fix' ]
36+
37+
# Will be displayed when any workflow fails:
38+
help:
39+
text: |
40+
Polkadot-SDK uses the Zepter CLI to detect abnormalities in the feature configuration.
41+
It looks like one more more checks failed; please check the console output. You can try to automatically address them by running `zepter`.
42+
Otherwise please ask directly in the Merge Request, GitHub Discussions or on Matrix Chat, thank you.
43+
links:
44+
- "https://github.com/paritytech/polkadot-sdk/issues/1831"
45+
- "https://github.com/ggwpez/zepter"

.gitlab/pipeline/check.yml

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,6 @@ check-try-runtime:
2121
# experimental code may rely on try-runtime and vice-versa
2222
- time cargo check --locked --all --features try-runtime,experimental
2323

24-
cargo-fmt-manifest:
25-
stage: check
26-
extends:
27-
- .docker-env
28-
- .common-refs
29-
script:
30-
- cargo install zepter --locked --version 0.11.0 -q -f --no-default-features && zepter --version
31-
- 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."
32-
- zepter format features --check
33-
3424
# FIXME
3525
.cargo-deny-licenses:
3626
stage: check
@@ -91,17 +81,14 @@ job-starter:
9181
script:
9282
- echo ok
9383

94-
test-rust-feature-propagation:
84+
check-rust-feature-propagation:
9585
stage: check
9686
extends:
9787
- .kubernetes-env
98-
- .test-pr-refs
88+
- .common-refs
9989
script:
100-
- cargo install --locked --version 0.11.1 -q -f zepter && zepter --version
101-
- 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"
102-
- zepter lint propagate-feature --feature try-runtime --left-side-feature-missing=ignore --workspace --feature-enables-dep="try-runtime:frame-try-runtime" --locked
103-
- zepter lint propagate-feature --feature runtime-benchmarks --left-side-feature-missing=ignore --workspace --feature-enables-dep="runtime-benchmarks:frame-benchmarking" --locked
104-
- zepter lint propagate-feature --feature std --left-side-feature-missing=ignore --workspace --locked
90+
- cargo install --locked --version 0.13.2 -q -f zepter && zepter --version
91+
- zepter run check
10592

10693
# More info can be found here: https://github.com/paritytech/polkadot/pull/5865
10794
.check-runtime-migration:

Cargo.lock

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bridges/primitives/chain-polkadot-bulletin/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ std = [
3535
"codec/std",
3636
"frame-support/std",
3737
"frame-system/std",
38+
"scale-info/std",
3839
"sp-api/std",
3940
"sp-runtime/std",
4041
"sp-std/std",

bridges/primitives/relayers/Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ default = [ "std" ]
3030
std = [
3131
"bp-messages/std",
3232
"bp-runtime/std",
33+
"codec/std",
3334
"frame-support/std",
35+
"scale-info/std",
3436
"sp-runtime/std",
3537
"sp-std/std",
3638
]

cumulus/pallets/parachain-system/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ cumulus-test-relay-sproof-builder = { path = "../../test/relay-sproof-builder" }
5555
[features]
5656
default = [ "std" ]
5757
std = [
58+
"bytes/std",
5859
"codec/std",
5960
"cumulus-pallet-parachain-system-proc-macro/std",
6061
"cumulus-primitives-core/std",

cumulus/pallets/xcmp-queue/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ std = [
5757
"log/std",
5858
"polkadot-runtime-common/std",
5959
"polkadot-runtime-parachains/std",
60+
"rand_chacha/std",
6061
"scale-info/std",
6162
"sp-core/std",
6263
"sp-io/std",

cumulus/parachains/common/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,13 @@ substrate-wasm-builder = { path = "../../../substrate/utils/wasm-builder" }
5252
[features]
5353
default = [ "std" ]
5454
std = [
55+
"codec/std",
5556
"cumulus-primitives-core/std",
5657
"cumulus-primitives-utility/std",
5758
"frame-support/std",
5859
"frame-system/std",
5960
"log/std",
61+
"num-traits/std",
6062
"pallet-asset-tx-payment/std",
6163
"pallet-assets/std",
6264
"pallet-authorship/std",
@@ -66,6 +68,7 @@ std = [
6668
"polkadot-core-primitives/std",
6769
"polkadot-primitives/std",
6870
"rococo-runtime-constants/std",
71+
"scale-info/std",
6972
"sp-consensus-aura/std",
7073
"sp-core/std",
7174
"sp-io/std",

cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo/src/tests/reserve_transfer.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ fn relay_origin_assertions(t: RelayToSystemParaTest) {
3939

4040
fn system_para_dest_assertions_incomplete(_t: RelayToSystemParaTest) {
4141
AssetHubRococo::assert_dmp_queue_incomplete(
42-
Some(Weight::from_parts(1_000_000_000, 0)),
42+
Some(Weight::from_parts(57_185_000, 3504)),
4343
Some(Error::UntrustedReserveLocation),
4444
);
4545
}
@@ -52,8 +52,8 @@ fn system_para_to_para_assertions(t: SystemParaToParaTest) {
5252
type RuntimeEvent = <AssetHubRococo as Chain>::RuntimeEvent;
5353

5454
AssetHubRococo::assert_xcm_pallet_attempted_complete(Some(Weight::from_parts(
55-
630_092_000,
56-
6_196,
55+
864_610_000,
56+
8_799,
5757
)));
5858

5959
assert_expected_events!(
@@ -77,8 +77,8 @@ fn system_para_to_para_assets_assertions(t: SystemParaToParaTest) {
7777
type RuntimeEvent = <AssetHubRococo as Chain>::RuntimeEvent;
7878

7979
AssetHubRococo::assert_xcm_pallet_attempted_complete(Some(Weight::from_parts(
80-
676_119_000,
81-
6196,
80+
864_610_000,
81+
8799,
8282
)));
8383

8484
assert_expected_events!(

cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo/src/tests/send.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,10 @@ fn send_xcm_from_para_to_system_para_paying_fee_with_assets_works() {
8383
AssetHubRococo::execute_with(|| {
8484
type RuntimeEvent = <AssetHubRococo as Chain>::RuntimeEvent;
8585

86-
AssetHubRococo::assert_xcmp_queue_success(Some(Weight::from_parts(2_176_414_000, 203_593)));
86+
AssetHubRococo::assert_xcmp_queue_success(Some(Weight::from_parts(
87+
15_594_564_000,
88+
562_893,
89+
)));
8790

8891
assert_expected_events!(
8992
AssetHubRococo,

0 commit comments

Comments
 (0)