Skip to content

Commit 7108d56

Browse files
koushirosorpaas
koushiro
and
sorpaas
authoredMay 8, 2023
update substrate to polkadot-v0.9.40 (#1026)
* update substrate to polkadot-v0.9.40 * some improvements and remove RpcResult alias * fix compilation error --------- Co-authored-by: Wei Tang <[email protected]>
1 parent aeb85c3 commit 7108d56

Some content is hidden

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

60 files changed

+888
-731
lines changed
 

‎benchmarking/frame-weight-template.hbs ‎.maintain/frame-weight-template.hbs

+33-33
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,9 @@
1-
// SPDX-License-Identifier: Apache-2.0
2-
// This file is part of Frontier.
3-
//
4-
// Copyright (c) 2020-2022 Parity Technologies (UK) Ltd.
5-
//
6-
// Licensed under the Apache License, Version 2.0 (the "License");
7-
// you may not use this file except in compliance with the License.
8-
// You may obtain a copy of the License at
9-
//
10-
// http://www.apache.org/licenses/LICENSE-2.0
11-
//
12-
// Unless required by applicable law or agreed to in writing, software
13-
// distributed under the License is distributed on an "AS IS" BASIS,
14-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15-
// See the License for the specific language governing permissions and
16-
// limitations under the License.
17-
1+
{{header}}
182
//! Autogenerated weights for {{pallet}}
193
//!
204
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION {{version}}
21-
//! DATE: {{date}}, STEPS: `{{cmd.steps}}`, REPEAT: {{cmd.repeat}}, LOW RANGE: `{{cmd.lowest_range_values}}`, HIGH RANGE: `{{cmd.highest_range_values}}`
5+
//! DATE: {{date}}, STEPS: `{{cmd.steps}}`, REPEAT: `{{cmd.repeat}}`, LOW RANGE: `{{cmd.lowest_range_values}}`, HIGH RANGE: `{{cmd.highest_range_values}}`
6+
//! WORST CASE MAP SIZE: `{{cmd.worst_case_map_values}}`
227
//! HOSTNAME: `{{hostname}}`, CPU: `{{cpuname}}`
238
//! EXECUTION: {{cmd.execution}}, WASM-EXECUTION: {{cmd.wasm_execution}}, CHAIN: {{cmd.chain}}, DB CACHE: {{cmd.db_cache}}
249

@@ -30,9 +15,10 @@
3015
#![cfg_attr(rustfmt, rustfmt_skip)]
3116
#![allow(unused_parens)]
3217
#![allow(unused_imports)]
18+
#![allow(missing_docs)]
3319

3420
use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
35-
use sp_std::marker::PhantomData;
21+
use core::marker::PhantomData;
3622

3723
/// Weight functions needed for {{pallet}}.
3824
pub trait WeightInfo {
@@ -54,7 +40,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
5440
{{/if}}
5541
{{#each benchmarks as |benchmark|}}
5642
{{#each benchmark.comments as |comment|}}
57-
// {{comment}}
43+
/// {{comment}}
5844
{{/each}}
5945
{{#each benchmark.component_ranges as |range|}}
6046
/// The range of component `{{range.name}}` is `[{{range.min}}, {{range.max}}]`.
@@ -64,22 +50,29 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
6450
{{~#each benchmark.components as |c| ~}}
6551
{{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
6652
) -> Weight {
67-
Weight::from_ref_time({{underscore benchmark.base_weight}} as u64)
53+
// Proof Size summary in bytes:
54+
// Measured: `{{benchmark.base_recorded_proof_size}}{{#each benchmark.component_recorded_proof_size as |cp|}} + {{cp.name}} * ({{cp.slope}} ±{{underscore cp.error}}){{/each}}`
55+
// Estimated: `{{benchmark.base_calculated_proof_size}}{{#each benchmark.component_calculated_proof_size as |cp|}} + {{cp.name}} * ({{cp.slope}} ±{{underscore cp.error}}){{/each}}`
56+
// Minimum execution time: {{underscore benchmark.min_execution_time}}_000 picoseconds.
57+
Weight::from_parts({{underscore benchmark.base_weight}}, {{benchmark.base_calculated_proof_size}})
6858
{{#each benchmark.component_weight as |cw|}}
6959
// Standard Error: {{underscore cw.error}}
70-
.saturating_add(Weight::from_ref_time({{underscore cw.slope}} as u64).saturating_mul({{cw.name}} as u64))
60+
.saturating_add(Weight::from_parts({{underscore cw.slope}}, 0).saturating_mul({{cw.name}}.into()))
7161
{{/each}}
7262
{{#if (ne benchmark.base_reads "0")}}
73-
.saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}} as u64))
63+
.saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}}_u64))
7464
{{/if}}
7565
{{#each benchmark.component_reads as |cr|}}
76-
.saturating_add(T::DbWeight::get().reads(({{cr.slope}} as u64).saturating_mul({{cr.name}} as u64)))
66+
.saturating_add(T::DbWeight::get().reads(({{cr.slope}}_u64).saturating_mul({{cr.name}}.into())))
7767
{{/each}}
7868
{{#if (ne benchmark.base_writes "0")}}
79-
.saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}} as u64))
69+
.saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}}_u64))
8070
{{/if}}
8171
{{#each benchmark.component_writes as |cw|}}
82-
.saturating_add(T::DbWeight::get().writes(({{cw.slope}} as u64).saturating_mul({{cw.name}} as u64)))
72+
.saturating_add(T::DbWeight::get().writes(({{cw.slope}}_u64).saturating_mul({{cw.name}}.into())))
73+
{{/each}}
74+
{{#each benchmark.component_calculated_proof_size as |cp|}}
75+
.saturating_add(Weight::from_parts(0, {{cp.slope}}).saturating_mul({{cp.name}}.into()))
8376
{{/each}}
8477
}
8578
{{/each}}
@@ -89,7 +82,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
8982
impl WeightInfo for () {
9083
{{#each benchmarks as |benchmark|}}
9184
{{#each benchmark.comments as |comment|}}
92-
// {{comment}}
85+
/// {{comment}}
9386
{{/each}}
9487
{{#each benchmark.component_ranges as |range|}}
9588
/// The range of component `{{range.name}}` is `[{{range.min}}, {{range.max}}]`.
@@ -99,22 +92,29 @@ impl WeightInfo for () {
9992
{{~#each benchmark.components as |c| ~}}
10093
{{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
10194
) -> Weight {
102-
Weight::from_ref_time({{underscore benchmark.base_weight}} as u64)
95+
// Proof Size summary in bytes:
96+
// Measured: `{{benchmark.base_recorded_proof_size}}{{#each benchmark.component_recorded_proof_size as |cp|}} + {{cp.name}} * ({{cp.slope}} ±{{underscore cp.error}}){{/each}}`
97+
// Estimated: `{{benchmark.base_calculated_proof_size}}{{#each benchmark.component_calculated_proof_size as |cp|}} + {{cp.name}} * ({{cp.slope}} ±{{underscore cp.error}}){{/each}}`
98+
// Minimum execution time: {{underscore benchmark.min_execution_time}}_000 picoseconds.
99+
Weight::from_parts({{underscore benchmark.base_weight}}, {{benchmark.base_calculated_proof_size}})
103100
{{#each benchmark.component_weight as |cw|}}
104101
// Standard Error: {{underscore cw.error}}
105-
.saturating_add(Weight::from_ref_time({{underscore cw.slope}} as u64).saturating_mul({{cw.name}} as u64))
102+
.saturating_add(Weight::from_parts({{underscore cw.slope}}, 0).saturating_mul({{cw.name}}.into()))
106103
{{/each}}
107104
{{#if (ne benchmark.base_reads "0")}}
108-
.saturating_add(RocksDbWeight::get().reads({{benchmark.base_reads}} as u64))
105+
.saturating_add(RocksDbWeight::get().reads({{benchmark.base_reads}}_u64))
109106
{{/if}}
110107
{{#each benchmark.component_reads as |cr|}}
111-
.saturating_add(RocksDbWeight::get().reads(({{cr.slope}} as u64).saturating_mul({{cr.name}} as u64)))
108+
.saturating_add(RocksDbWeight::get().reads(({{cr.slope}}_u64).saturating_mul({{cr.name}}.into())))
112109
{{/each}}
113110
{{#if (ne benchmark.base_writes "0")}}
114-
.saturating_add(RocksDbWeight::get().writes({{benchmark.base_writes}} as u64))
111+
.saturating_add(RocksDbWeight::get().writes({{benchmark.base_writes}}_u64))
115112
{{/if}}
116113
{{#each benchmark.component_writes as |cw|}}
117-
.saturating_add(RocksDbWeight::get().writes(({{cw.slope}} as u64).saturating_mul({{cw.name}} as u64)))
114+
.saturating_add(RocksDbWeight::get().writes(({{cw.slope}}_u64).saturating_mul({{cw.name}}.into())))
115+
{{/each}}
116+
{{#each benchmark.component_calculated_proof_size as |cp|}}
117+
.saturating_add(Weight::from_parts(0, {{cp.slope}}).saturating_mul({{cp.name}}.into()))
118118
{{/each}}
119119
}
120120
{{/each}}

0 commit comments

Comments
 (0)
Please sign in to comment.