Use frame umbrella crate in pallet-proxy and pallet-multisig
#5995
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -40,20 +40,20 @@ def setup_logging(): | |
| setup_logging() | ||
|
|
||
| """ | ||
| BENCH | ||
| """ | ||
|
|
||
| bench_example = '''**Examples**: | ||
| Runs all benchmarks | ||
| %(prog)s | ||
|
|
||
| Runs benchmarks for pallet_balances and pallet_multisig for all runtimes which have these pallets. **--quiet** makes it to output nothing to PR but reactions | ||
| %(prog)s --pallet pallet_balances pallet_xcm_benchmarks::generic --quiet | ||
|
|
||
| Runs bench for all pallets for westend runtime and fails fast on first failed benchmark | ||
| %(prog)s --runtime westend --fail-fast | ||
|
|
||
| Does not output anything and cleans up the previous bot's & author command triggering comments in PR | ||
| %(prog)s --runtime westend rococo --pallet pallet_balances pallet_multisig --quiet --clean | ||
| ''' | ||
|
|
||
|
|
@@ -67,14 +67,14 @@ def setup_logging(): | |
| parser_bench.add_argument('--fail-fast', help='Fail fast on first failed benchmark', action='store_true') | ||
|
|
||
| """ | ||
| FMT | ||
| """ | ||
| parser_fmt = subparsers.add_parser('fmt', help='Formats code (cargo +nightly-VERSION fmt) and configs (taplo format)') | ||
| for arg, config in common_args.items(): | ||
| parser_fmt.add_argument(arg, **config) | ||
|
|
||
| """ | ||
| Update UI | ||
| """ | ||
| parser_ui = subparsers.add_parser('update-ui', help='Updates UI tests') | ||
| for arg, config in common_args.items(): | ||
|
|
@@ -175,7 +175,9 @@ def main(): | |
| print(f'-- package_dir: {package_dir}') | ||
| print(f'-- manifest_path: {manifest_path}') | ||
| output_path = os.path.join(package_dir, "src", "weights.rs") | ||
| # TODO: we can remove once all pallets in dev runtime are migrated to polkadot-sdk-frame | ||
| uses_polkadot_sdk_frame = "true" in os.popen(f"cargo metadata --locked --format-version 1 --no-deps | jq -r '.packages[] | select(.name == \"{pallet.replace('_', '-')}\") | .dependencies | any(.name == \"polkadot-sdk-frame\")'").read() | ||
| template = config['template'] if not uses_polkadot_sdk_frame else "substrate/.maintain/frame-umbrella-weight-template.hbs" | ||
| else: | ||
| default_path = f"./{config['path']}/src/weights" | ||
| xcm_path = f"./{config['path']}/src/weights/xcm" | ||
|
|
@@ -251,4 +253,4 @@ def main(): | |
| print('🚀 Done') | ||
|
|
||
| if __name__ == '__main__': | ||
| main() | ||
|
Contributor
Author
There was a problem hiding this comment. @mordamax can you review this file please? |
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| {{header}} | ||
| //! Autogenerated weights for `{{pallet}}` | ||
| //! | ||
| //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION {{version}} | ||
| //! DATE: {{date}}, STEPS: `{{cmd.steps}}`, REPEAT: `{{cmd.repeat}}`, LOW RANGE: `{{cmd.lowest_range_values}}`, HIGH RANGE: `{{cmd.highest_range_values}}` | ||
| //! WORST CASE MAP SIZE: `{{cmd.worst_case_map_values}}` | ||
| //! HOSTNAME: `{{hostname}}`, CPU: `{{cpuname}}` | ||
| //! WASM-EXECUTION: `{{cmd.wasm_execution}}`, CHAIN: `{{cmd.chain}}`, DB CACHE: `{{cmd.db_cache}}` | ||
|
|
||
| // Executed Command: | ||
| {{#each args as |arg|}} | ||
| // {{arg}} | ||
| {{/each}} | ||
|
|
||
| #![cfg_attr(rustfmt, rustfmt_skip)] | ||
| #![allow(unused_parens)] | ||
| #![allow(unused_imports)] | ||
| #![allow(missing_docs)] | ||
|
|
||
| use frame::weights_prelude::*; | ||
|
|
||
| /// Weight functions needed for `{{pallet}}`. | ||
| pub trait WeightInfo { | ||
| {{#each benchmarks as |benchmark|}} | ||
| fn {{benchmark.name~}} | ||
| ( | ||
| {{~#each benchmark.components as |c| ~}} | ||
| {{c.name}}: u32, {{/each~}} | ||
| ) -> Weight; | ||
| {{/each}} | ||
| } | ||
|
|
||
| /// Weights for `{{pallet}}` using the Substrate node and recommended hardware. | ||
| pub struct SubstrateWeight<T>(PhantomData<T>); | ||
| {{#if (eq pallet "frame_system")}} | ||
| impl<T: crate::Config> WeightInfo for SubstrateWeight<T> { | ||
| {{else}} | ||
| impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> { | ||
| {{/if}} | ||
| {{#each benchmarks as |benchmark|}} | ||
| {{#each benchmark.comments as |comment|}} | ||
| /// {{comment}} | ||
| {{/each}} | ||
| {{#each benchmark.component_ranges as |range|}} | ||
| /// The range of component `{{range.name}}` is `[{{range.min}}, {{range.max}}]`. | ||
| {{/each}} | ||
| fn {{benchmark.name~}} | ||
| ( | ||
| {{~#each benchmark.components as |c| ~}} | ||
| {{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}} | ||
| ) -> Weight { | ||
| // Proof Size summary in bytes: | ||
| // Measured: `{{benchmark.base_recorded_proof_size}}{{#each benchmark.component_recorded_proof_size as |cp|}} + {{cp.name}} * ({{cp.slope}} ±{{underscore cp.error}}){{/each}}` | ||
| // Estimated: `{{benchmark.base_calculated_proof_size}}{{#each benchmark.component_calculated_proof_size as |cp|}} + {{cp.name}} * ({{cp.slope}} ±{{underscore cp.error}}){{/each}}` | ||
| // Minimum execution time: {{underscore benchmark.min_execution_time}}_000 picoseconds. | ||
| Weight::from_parts({{underscore benchmark.base_weight}}, {{benchmark.base_calculated_proof_size}}) | ||
| {{#each benchmark.component_weight as |cw|}} | ||
| // Standard Error: {{underscore cw.error}} | ||
| .saturating_add(Weight::from_parts({{underscore cw.slope}}, 0).saturating_mul({{cw.name}}.into())) | ||
| {{/each}} | ||
| {{#if (ne benchmark.base_reads "0")}} | ||
| .saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}}_u64)) | ||
| {{/if}} | ||
| {{#each benchmark.component_reads as |cr|}} | ||
| .saturating_add(T::DbWeight::get().reads(({{cr.slope}}_u64).saturating_mul({{cr.name}}.into()))) | ||
| {{/each}} | ||
| {{#if (ne benchmark.base_writes "0")}} | ||
| .saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}}_u64)) | ||
| {{/if}} | ||
| {{#each benchmark.component_writes as |cw|}} | ||
| .saturating_add(T::DbWeight::get().writes(({{cw.slope}}_u64).saturating_mul({{cw.name}}.into()))) | ||
| {{/each}} | ||
| {{#each benchmark.component_calculated_proof_size as |cp|}} | ||
| .saturating_add(Weight::from_parts(0, {{cp.slope}}).saturating_mul({{cp.name}}.into())) | ||
| {{/each}} | ||
| } | ||
| {{/each}} | ||
| } | ||
|
|
||
| // For backwards compatibility and tests. | ||
| impl WeightInfo for () { | ||
| {{#each benchmarks as |benchmark|}} | ||
| {{#each benchmark.comments as |comment|}} | ||
| /// {{comment}} | ||
| {{/each}} | ||
| {{#each benchmark.component_ranges as |range|}} | ||
| /// The range of component `{{range.name}}` is `[{{range.min}}, {{range.max}}]`. | ||
| {{/each}} | ||
| fn {{benchmark.name~}} | ||
| ( | ||
| {{~#each benchmark.components as |c| ~}} | ||
| {{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}} | ||
| ) -> Weight { | ||
| // Proof Size summary in bytes: | ||
| // Measured: `{{benchmark.base_recorded_proof_size}}{{#each benchmark.component_recorded_proof_size as |cp|}} + {{cp.name}} * ({{cp.slope}} ±{{underscore cp.error}}){{/each}}` | ||
| // Estimated: `{{benchmark.base_calculated_proof_size}}{{#each benchmark.component_calculated_proof_size as |cp|}} + {{cp.name}} * ({{cp.slope}} ±{{underscore cp.error}}){{/each}}` | ||
| // Minimum execution time: {{underscore benchmark.min_execution_time}}_000 picoseconds. | ||
| Weight::from_parts({{underscore benchmark.base_weight}}, {{benchmark.base_calculated_proof_size}}) | ||
| {{#each benchmark.component_weight as |cw|}} | ||
| // Standard Error: {{underscore cw.error}} | ||
| .saturating_add(Weight::from_parts({{underscore cw.slope}}, 0).saturating_mul({{cw.name}}.into())) | ||
| {{/each}} | ||
| {{#if (ne benchmark.base_reads "0")}} | ||
| .saturating_add(RocksDbWeight::get().reads({{benchmark.base_reads}}_u64)) | ||
| {{/if}} | ||
| {{#each benchmark.component_reads as |cr|}} | ||
| .saturating_add(RocksDbWeight::get().reads(({{cr.slope}}_u64).saturating_mul({{cr.name}}.into()))) | ||
| {{/each}} | ||
| {{#if (ne benchmark.base_writes "0")}} | ||
| .saturating_add(RocksDbWeight::get().writes({{benchmark.base_writes}}_u64)) | ||
| {{/if}} | ||
| {{#each benchmark.component_writes as |cw|}} | ||
| .saturating_add(RocksDbWeight::get().writes(({{cw.slope}}_u64).saturating_mul({{cw.name}}.into()))) | ||
| {{/each}} | ||
| {{#each benchmark.component_calculated_proof_size as |cp|}} | ||
| .saturating_add(Weight::from_parts(0, {{cp.slope}}).saturating_mul({{cp.name}}.into())) | ||
| {{/each}} | ||
| } | ||
| {{/each}} | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,7 +18,13 @@ | |
| //! Storage migrations for the preimage pallet. | ||
|
|
||
| use crate::*; | ||
| use frame_support::{ | ||
| // We cannot use the `pallet_prelude` here as the item `Bounded` will become ambiguous. | ||
| pallet_prelude::{StorageVersion, ValueQuery}, | ||
|
Member
There was a problem hiding this comment. Not sure if i follow. You mean
Contributor
There was a problem hiding this comment. True, because we removed
Contributor
Author
There was a problem hiding this comment. This is a good example of where adding more things to frame_support::pallet_prelude::* turned out to be a headache. |
||
| storage_alias, | ||
| traits::OnRuntimeUpgrade, | ||
| BoundedVec, | ||
| }; | ||
| use frame_system::pallet_prelude::BlockNumberFor; | ||
| use sp_core::H256; | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.