From 6c6788d87aa048e59cce77c08a3f8cabb225fb56 Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Thu, 18 Nov 2021 00:14:16 -0400
Subject: [PATCH] Fix Weight Handlebar Template (#10302)
* fix template
* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_identity --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/identity/src/weights.rs --template=./.maintain/frame-weight-template.hbs
Co-authored-by: Parity Bot <admin@parity.io>
---
substrate/.maintain/frame-weight-template.hbs | 68 +++----
substrate/frame/identity/src/weights.rs | 191 +++++++++---------
.../frame/benchmarking-cli/src/template.hbs | 30 +--
3 files changed, 144 insertions(+), 145 deletions(-)
diff --git a/substrate/.maintain/frame-weight-template.hbs b/substrate/.maintain/frame-weight-template.hbs
index 045140d54df..4f34707b960 100644
--- a/substrate/.maintain/frame-weight-template.hbs
+++ b/substrate/.maintain/frame-weight-template.hbs
@@ -22,7 +22,7 @@
//! EXECUTION: {{cmd.execution}}, WASM-EXECUTION: {{cmd.wasm_execution}}, CHAIN: {{cmd.chain}}, DB CACHE: {{cmd.db_cache}}
// Executed Command:
-{{#each args as |arg|~}}
+{{#each args as |arg|}}
// {{arg}}
{{/each}}
@@ -35,80 +35,80 @@ use sp_std::marker::PhantomData;
/// Weight functions needed for {{pallet}}.
pub trait WeightInfo {
- {{~#each benchmarks as |benchmark|}}
+ {{#each benchmarks as |benchmark|}}
fn {{benchmark.name~}}
(
{{~#each benchmark.components as |c| ~}}
{{c.name}}: u32, {{/each~}}
) -> Weight;
- {{~/each}}
+ {{/each}}
}
/// Weights for {{pallet}} using the Substrate node and recommended hardware.
pub struct SubstrateWeight<T>(PhantomData<T>);
-{{~#if (eq pallet "frame_system")}}
+{{#if (eq pallet "frame_system")}}
impl<T: crate::Config> WeightInfo for SubstrateWeight<T> {
-{{~else}}
+{{else}}
impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
-{{~/if}}
- {{~#each benchmarks as |benchmark|}}
- {{~#each benchmark.comments as |comment|}}
+{{/if}}
+ {{#each benchmarks as |benchmark|}}
+ {{#each benchmark.comments as |comment|}}
// {{comment}}
- {{~/each}}
+ {{/each}}
fn {{benchmark.name~}}
(
{{~#each benchmark.components as |c| ~}}
{{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
) -> Weight {
({{underscore benchmark.base_weight}} as Weight)
- {{~#each benchmark.component_weight as |cw|}}
+ {{#each benchmark.component_weight as |cw|}}
// Standard Error: {{underscore cw.error}}
.saturating_add(({{underscore cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight))
- {{~/each}}
- {{~#if (ne benchmark.base_reads "0")}}
+ {{/each}}
+ {{#if (ne benchmark.base_reads "0")}}
.saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}} as Weight))
- {{~/if}}
- {{~#each benchmark.component_reads as |cr|}}
+ {{/if}}
+ {{#each benchmark.component_reads as |cr|}}
.saturating_add(T::DbWeight::get().reads(({{cr.slope}} as Weight).saturating_mul({{cr.name}} as Weight)))
- {{~/each}}
- {{~#if (ne benchmark.base_writes "0")}}
+ {{/each}}
+ {{#if (ne benchmark.base_writes "0")}}
.saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}} as Weight))
- {{~/if}}
- {{~#each benchmark.component_writes as |cw|}}
+ {{/if}}
+ {{#each benchmark.component_writes as |cw|}}
.saturating_add(T::DbWeight::get().writes(({{cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight)))
- {{~/each}}
+ {{/each}}
}
- {{~/each}}
+ {{/each}}
}
// For backwards compatibility and tests
impl WeightInfo for () {
- {{~#each benchmarks as |benchmark|}}
- {{~#each benchmark.comments as |comment|}}
+ {{#each benchmarks as |benchmark|}}
+ {{#each benchmark.comments as |comment|}}
// {{comment}}
- {{~/each}}
+ {{/each}}
fn {{benchmark.name~}}
(
{{~#each benchmark.components as |c| ~}}
{{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
) -> Weight {
({{underscore benchmark.base_weight}} as Weight)
- {{~#each benchmark.component_weight as |cw|}}
+ {{#each benchmark.component_weight as |cw|}}
// Standard Error: {{underscore cw.error}}
.saturating_add(({{underscore cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight))
- {{~/each}}
- {{~#if (ne benchmark.base_reads "0")}}
+ {{/each}}
+ {{#if (ne benchmark.base_reads "0")}}
.saturating_add(RocksDbWeight::get().reads({{benchmark.base_reads}} as Weight))
- {{~/if}}
- {{~#each benchmark.component_reads as |cr|}}
+ {{/if}}
+ {{#each benchmark.component_reads as |cr|}}
.saturating_add(RocksDbWeight::get().reads(({{cr.slope}} as Weight).saturating_mul({{cr.name}} as Weight)))
- {{~/each}}
- {{~#if (ne benchmark.base_writes "0")}}
+ {{/each}}
+ {{#if (ne benchmark.base_writes "0")}}
.saturating_add(RocksDbWeight::get().writes({{benchmark.base_writes}} as Weight))
- {{~/if}}
- {{~#each benchmark.component_writes as |cw|}}
+ {{/if}}
+ {{#each benchmark.component_writes as |cw|}}
.saturating_add(RocksDbWeight::get().writes(({{cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight)))
- {{~/each}}
+ {{/each}}
}
- {{~/each}}
+ {{/each}}
}
diff --git a/substrate/frame/identity/src/weights.rs b/substrate/frame/identity/src/weights.rs
index 611909f326e..92bc4cbaae9 100644
--- a/substrate/frame/identity/src/weights.rs
+++ b/substrate/frame/identity/src/weights.rs
@@ -18,7 +18,7 @@
//! Autogenerated weights for pallet_identity
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2021-08-07, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-11-17, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
// Executed Command:
@@ -35,7 +35,6 @@
// --output=./frame/identity/src/weights.rs
// --template=./.maintain/frame-weight-template.hbs
-
#![cfg_attr(rustfmt, rustfmt_skip)]
#![allow(unused_parens)]
#![allow(unused_imports)]
@@ -68,19 +67,19 @@ pub struct SubstrateWeight<T>(PhantomData<T>);
impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Storage: Identity Registrars (r:1 w:1)
fn add_registrar(r: u32, ) -> Weight {
- (22_152_000 as Weight)
- // Standard Error: 6_000
- .saturating_add((339_000 as Weight).saturating_mul(r as Weight))
+ (19_176_000 as Weight)
+ // Standard Error: 5_000
+ .saturating_add((313_000 as Weight).saturating_mul(r as Weight))
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
// Storage: Identity IdentityOf (r:1 w:1)
fn set_identity(r: u32, x: u32, ) -> Weight {
- (53_017_000 as Weight)
- // Standard Error: 14_000
- .saturating_add((279_000 as Weight).saturating_mul(r as Weight))
+ (44_668_000 as Weight)
+ // Standard Error: 12_000
+ .saturating_add((244_000 as Weight).saturating_mul(r as Weight))
// Standard Error: 1_000
- .saturating_add((1_081_000 as Weight).saturating_mul(x as Weight))
+ .saturating_add((811_000 as Weight).saturating_mul(x as Weight))
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
@@ -88,9 +87,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Storage: Identity SubsOf (r:1 w:1)
// Storage: Identity SuperOf (r:1 w:1)
fn set_subs_new(s: u32, ) -> Weight {
- (44_693_000 as Weight)
- // Standard Error: 1_000
- .saturating_add((6_631_000 as Weight).saturating_mul(s as Weight))
+ (38_917_000 as Weight)
+ // Standard Error: 3_000
+ .saturating_add((5_331_000 as Weight).saturating_mul(s as Weight))
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight)))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
@@ -100,9 +99,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Storage: Identity SubsOf (r:1 w:1)
// Storage: Identity SuperOf (r:0 w:1)
fn set_subs_old(p: u32, ) -> Weight {
- (42_017_000 as Weight)
+ (36_057_000 as Weight)
// Standard Error: 1_000
- .saturating_add((2_193_000 as Weight).saturating_mul(p as Weight))
+ .saturating_add((1_756_000 as Weight).saturating_mul(p as Weight))
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
@@ -111,13 +110,13 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Storage: Identity IdentityOf (r:1 w:1)
// Storage: Identity SuperOf (r:0 w:100)
fn clear_identity(r: u32, s: u32, x: u32, ) -> Weight {
- (50_989_000 as Weight)
- // Standard Error: 11_000
- .saturating_add((258_000 as Weight).saturating_mul(r as Weight))
+ (44_348_000 as Weight)
+ // Standard Error: 9_000
+ .saturating_add((183_000 as Weight).saturating_mul(r as Weight))
// Standard Error: 1_000
- .saturating_add((2_184_000 as Weight).saturating_mul(s as Weight))
+ .saturating_add((1_724_000 as Weight).saturating_mul(s as Weight))
// Standard Error: 1_000
- .saturating_add((579_000 as Weight).saturating_mul(x as Weight))
+ .saturating_add((439_000 as Weight).saturating_mul(x as Weight))
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(2 as Weight))
.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
@@ -125,56 +124,56 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Storage: Identity Registrars (r:1 w:0)
// Storage: Identity IdentityOf (r:1 w:1)
fn request_judgement(r: u32, x: u32, ) -> Weight {
- (55_562_000 as Weight)
+ (46_592_000 as Weight)
// Standard Error: 5_000
- .saturating_add((317_000 as Weight).saturating_mul(r as Weight))
+ .saturating_add((321_000 as Weight).saturating_mul(r as Weight))
// Standard Error: 0
- .saturating_add((1_137_000 as Weight).saturating_mul(x as Weight))
+ .saturating_add((858_000 as Weight).saturating_mul(x as Weight))
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
// Storage: Identity IdentityOf (r:1 w:1)
fn cancel_request(r: u32, x: u32, ) -> Weight {
- (51_744_000 as Weight)
+ (43_556_000 as Weight)
// Standard Error: 6_000
- .saturating_add((192_000 as Weight).saturating_mul(r as Weight))
+ .saturating_add((174_000 as Weight).saturating_mul(r as Weight))
// Standard Error: 0
- .saturating_add((1_131_000 as Weight).saturating_mul(x as Weight))
+ .saturating_add((850_000 as Weight).saturating_mul(x as Weight))
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
// Storage: Identity Registrars (r:1 w:1)
fn set_fee(r: u32, ) -> Weight {
- (9_472_000 as Weight)
- // Standard Error: 3_000
- .saturating_add((321_000 as Weight).saturating_mul(r as Weight))
+ (7_971_000 as Weight)
+ // Standard Error: 4_000
+ .saturating_add((283_000 as Weight).saturating_mul(r as Weight))
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
// Storage: Identity Registrars (r:1 w:1)
fn set_account_id(r: u32, ) -> Weight {
- (9_705_000 as Weight)
- // Standard Error: 3_000
- .saturating_add((312_000 as Weight).saturating_mul(r as Weight))
+ (8_234_000 as Weight)
+ // Standard Error: 4_000
+ .saturating_add((280_000 as Weight).saturating_mul(r as Weight))
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
// Storage: Identity Registrars (r:1 w:1)
fn set_fields(r: u32, ) -> Weight {
- (9_537_000 as Weight)
- // Standard Error: 3_000
- .saturating_add((318_000 as Weight).saturating_mul(r as Weight))
+ (8_126_000 as Weight)
+ // Standard Error: 4_000
+ .saturating_add((275_000 as Weight).saturating_mul(r as Weight))
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
// Storage: Identity Registrars (r:1 w:0)
// Storage: Identity IdentityOf (r:1 w:1)
fn provide_judgement(r: u32, x: u32, ) -> Weight {
- (36_298_000 as Weight)
+ (30_949_000 as Weight)
// Standard Error: 5_000
- .saturating_add((284_000 as Weight).saturating_mul(r as Weight))
+ .saturating_add((286_000 as Weight).saturating_mul(r as Weight))
// Standard Error: 0
- .saturating_add((1_141_000 as Weight).saturating_mul(x as Weight))
+ .saturating_add((856_000 as Weight).saturating_mul(x as Weight))
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
@@ -183,11 +182,11 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Storage: System Account (r:1 w:1)
// Storage: Identity SuperOf (r:0 w:100)
fn kill_identity(r: u32, s: u32, _x: u32, ) -> Weight {
- (63_238_000 as Weight)
- // Standard Error: 10_000
- .saturating_add((246_000 as Weight).saturating_mul(r as Weight))
+ (63_792_000 as Weight)
+ // Standard Error: 11_000
+ .saturating_add((242_000 as Weight).saturating_mul(r as Weight))
// Standard Error: 1_000
- .saturating_add((2_184_000 as Weight).saturating_mul(s as Weight))
+ .saturating_add((1_738_000 as Weight).saturating_mul(s as Weight))
.saturating_add(T::DbWeight::get().reads(3 as Weight))
.saturating_add(T::DbWeight::get().writes(3 as Weight))
.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
@@ -196,18 +195,18 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Storage: Identity SuperOf (r:1 w:1)
// Storage: Identity SubsOf (r:1 w:1)
fn add_sub(s: u32, ) -> Weight {
- (57_394_000 as Weight)
+ (48_751_000 as Weight)
// Standard Error: 1_000
- .saturating_add((208_000 as Weight).saturating_mul(s as Weight))
+ .saturating_add((193_000 as Weight).saturating_mul(s as Weight))
.saturating_add(T::DbWeight::get().reads(3 as Weight))
.saturating_add(T::DbWeight::get().writes(2 as Weight))
}
// Storage: Identity IdentityOf (r:1 w:0)
// Storage: Identity SuperOf (r:1 w:1)
fn rename_sub(s: u32, ) -> Weight {
- (18_274_000 as Weight)
+ (15_892_000 as Weight)
// Standard Error: 0
- .saturating_add((52_000 as Weight).saturating_mul(s as Weight))
+ .saturating_add((49_000 as Weight).saturating_mul(s as Weight))
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
@@ -215,18 +214,18 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Storage: Identity SuperOf (r:1 w:1)
// Storage: Identity SubsOf (r:1 w:1)
fn remove_sub(s: u32, ) -> Weight {
- (58_184_000 as Weight)
+ (49_746_000 as Weight)
// Standard Error: 1_000
- .saturating_add((195_000 as Weight).saturating_mul(s as Weight))
+ .saturating_add((181_000 as Weight).saturating_mul(s as Weight))
.saturating_add(T::DbWeight::get().reads(3 as Weight))
.saturating_add(T::DbWeight::get().writes(2 as Weight))
}
// Storage: Identity SuperOf (r:1 w:1)
// Storage: Identity SubsOf (r:1 w:1)
fn quit_sub(s: u32, ) -> Weight {
- (36_304_000 as Weight)
+ (32_286_000 as Weight)
// Standard Error: 1_000
- .saturating_add((191_000 as Weight).saturating_mul(s as Weight))
+ .saturating_add((166_000 as Weight).saturating_mul(s as Weight))
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(2 as Weight))
}
@@ -236,19 +235,19 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
impl WeightInfo for () {
// Storage: Identity Registrars (r:1 w:1)
fn add_registrar(r: u32, ) -> Weight {
- (22_152_000 as Weight)
- // Standard Error: 6_000
- .saturating_add((339_000 as Weight).saturating_mul(r as Weight))
+ (19_176_000 as Weight)
+ // Standard Error: 5_000
+ .saturating_add((313_000 as Weight).saturating_mul(r as Weight))
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
// Storage: Identity IdentityOf (r:1 w:1)
fn set_identity(r: u32, x: u32, ) -> Weight {
- (53_017_000 as Weight)
- // Standard Error: 14_000
- .saturating_add((279_000 as Weight).saturating_mul(r as Weight))
+ (44_668_000 as Weight)
+ // Standard Error: 12_000
+ .saturating_add((244_000 as Weight).saturating_mul(r as Weight))
// Standard Error: 1_000
- .saturating_add((1_081_000 as Weight).saturating_mul(x as Weight))
+ .saturating_add((811_000 as Weight).saturating_mul(x as Weight))
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
@@ -256,9 +255,9 @@ impl WeightInfo for () {
// Storage: Identity SubsOf (r:1 w:1)
// Storage: Identity SuperOf (r:1 w:1)
fn set_subs_new(s: u32, ) -> Weight {
- (44_693_000 as Weight)
- // Standard Error: 1_000
- .saturating_add((6_631_000 as Weight).saturating_mul(s as Weight))
+ (38_917_000 as Weight)
+ // Standard Error: 3_000
+ .saturating_add((5_331_000 as Weight).saturating_mul(s as Weight))
.saturating_add(RocksDbWeight::get().reads(2 as Weight))
.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(s as Weight)))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
@@ -268,9 +267,9 @@ impl WeightInfo for () {
// Storage: Identity SubsOf (r:1 w:1)
// Storage: Identity SuperOf (r:0 w:1)
fn set_subs_old(p: u32, ) -> Weight {
- (42_017_000 as Weight)
+ (36_057_000 as Weight)
// Standard Error: 1_000
- .saturating_add((2_193_000 as Weight).saturating_mul(p as Weight))
+ .saturating_add((1_756_000 as Weight).saturating_mul(p as Weight))
.saturating_add(RocksDbWeight::get().reads(2 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
@@ -279,13 +278,13 @@ impl WeightInfo for () {
// Storage: Identity IdentityOf (r:1 w:1)
// Storage: Identity SuperOf (r:0 w:100)
fn clear_identity(r: u32, s: u32, x: u32, ) -> Weight {
- (50_989_000 as Weight)
- // Standard Error: 11_000
- .saturating_add((258_000 as Weight).saturating_mul(r as Weight))
+ (44_348_000 as Weight)
+ // Standard Error: 9_000
+ .saturating_add((183_000 as Weight).saturating_mul(r as Weight))
// Standard Error: 1_000
- .saturating_add((2_184_000 as Weight).saturating_mul(s as Weight))
+ .saturating_add((1_724_000 as Weight).saturating_mul(s as Weight))
// Standard Error: 1_000
- .saturating_add((579_000 as Weight).saturating_mul(x as Weight))
+ .saturating_add((439_000 as Weight).saturating_mul(x as Weight))
.saturating_add(RocksDbWeight::get().reads(2 as Weight))
.saturating_add(RocksDbWeight::get().writes(2 as Weight))
.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
@@ -293,56 +292,56 @@ impl WeightInfo for () {
// Storage: Identity Registrars (r:1 w:0)
// Storage: Identity IdentityOf (r:1 w:1)
fn request_judgement(r: u32, x: u32, ) -> Weight {
- (55_562_000 as Weight)
+ (46_592_000 as Weight)
// Standard Error: 5_000
- .saturating_add((317_000 as Weight).saturating_mul(r as Weight))
+ .saturating_add((321_000 as Weight).saturating_mul(r as Weight))
// Standard Error: 0
- .saturating_add((1_137_000 as Weight).saturating_mul(x as Weight))
+ .saturating_add((858_000 as Weight).saturating_mul(x as Weight))
.saturating_add(RocksDbWeight::get().reads(2 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
// Storage: Identity IdentityOf (r:1 w:1)
fn cancel_request(r: u32, x: u32, ) -> Weight {
- (51_744_000 as Weight)
+ (43_556_000 as Weight)
// Standard Error: 6_000
- .saturating_add((192_000 as Weight).saturating_mul(r as Weight))
+ .saturating_add((174_000 as Weight).saturating_mul(r as Weight))
// Standard Error: 0
- .saturating_add((1_131_000 as Weight).saturating_mul(x as Weight))
+ .saturating_add((850_000 as Weight).saturating_mul(x as Weight))
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
// Storage: Identity Registrars (r:1 w:1)
fn set_fee(r: u32, ) -> Weight {
- (9_472_000 as Weight)
- // Standard Error: 3_000
- .saturating_add((321_000 as Weight).saturating_mul(r as Weight))
+ (7_971_000 as Weight)
+ // Standard Error: 4_000
+ .saturating_add((283_000 as Weight).saturating_mul(r as Weight))
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
// Storage: Identity Registrars (r:1 w:1)
fn set_account_id(r: u32, ) -> Weight {
- (9_705_000 as Weight)
- // Standard Error: 3_000
- .saturating_add((312_000 as Weight).saturating_mul(r as Weight))
+ (8_234_000 as Weight)
+ // Standard Error: 4_000
+ .saturating_add((280_000 as Weight).saturating_mul(r as Weight))
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
// Storage: Identity Registrars (r:1 w:1)
fn set_fields(r: u32, ) -> Weight {
- (9_537_000 as Weight)
- // Standard Error: 3_000
- .saturating_add((318_000 as Weight).saturating_mul(r as Weight))
+ (8_126_000 as Weight)
+ // Standard Error: 4_000
+ .saturating_add((275_000 as Weight).saturating_mul(r as Weight))
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
// Storage: Identity Registrars (r:1 w:0)
// Storage: Identity IdentityOf (r:1 w:1)
fn provide_judgement(r: u32, x: u32, ) -> Weight {
- (36_298_000 as Weight)
+ (30_949_000 as Weight)
// Standard Error: 5_000
- .saturating_add((284_000 as Weight).saturating_mul(r as Weight))
+ .saturating_add((286_000 as Weight).saturating_mul(r as Weight))
// Standard Error: 0
- .saturating_add((1_141_000 as Weight).saturating_mul(x as Weight))
+ .saturating_add((856_000 as Weight).saturating_mul(x as Weight))
.saturating_add(RocksDbWeight::get().reads(2 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
@@ -351,11 +350,11 @@ impl WeightInfo for () {
// Storage: System Account (r:1 w:1)
// Storage: Identity SuperOf (r:0 w:100)
fn kill_identity(r: u32, s: u32, _x: u32, ) -> Weight {
- (63_238_000 as Weight)
- // Standard Error: 10_000
- .saturating_add((246_000 as Weight).saturating_mul(r as Weight))
+ (63_792_000 as Weight)
+ // Standard Error: 11_000
+ .saturating_add((242_000 as Weight).saturating_mul(r as Weight))
// Standard Error: 1_000
- .saturating_add((2_184_000 as Weight).saturating_mul(s as Weight))
+ .saturating_add((1_738_000 as Weight).saturating_mul(s as Weight))
.saturating_add(RocksDbWeight::get().reads(3 as Weight))
.saturating_add(RocksDbWeight::get().writes(3 as Weight))
.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
@@ -364,18 +363,18 @@ impl WeightInfo for () {
// Storage: Identity SuperOf (r:1 w:1)
// Storage: Identity SubsOf (r:1 w:1)
fn add_sub(s: u32, ) -> Weight {
- (57_394_000 as Weight)
+ (48_751_000 as Weight)
// Standard Error: 1_000
- .saturating_add((208_000 as Weight).saturating_mul(s as Weight))
+ .saturating_add((193_000 as Weight).saturating_mul(s as Weight))
.saturating_add(RocksDbWeight::get().reads(3 as Weight))
.saturating_add(RocksDbWeight::get().writes(2 as Weight))
}
// Storage: Identity IdentityOf (r:1 w:0)
// Storage: Identity SuperOf (r:1 w:1)
fn rename_sub(s: u32, ) -> Weight {
- (18_274_000 as Weight)
+ (15_892_000 as Weight)
// Standard Error: 0
- .saturating_add((52_000 as Weight).saturating_mul(s as Weight))
+ .saturating_add((49_000 as Weight).saturating_mul(s as Weight))
.saturating_add(RocksDbWeight::get().reads(2 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
@@ -383,18 +382,18 @@ impl WeightInfo for () {
// Storage: Identity SuperOf (r:1 w:1)
// Storage: Identity SubsOf (r:1 w:1)
fn remove_sub(s: u32, ) -> Weight {
- (58_184_000 as Weight)
+ (49_746_000 as Weight)
// Standard Error: 1_000
- .saturating_add((195_000 as Weight).saturating_mul(s as Weight))
+ .saturating_add((181_000 as Weight).saturating_mul(s as Weight))
.saturating_add(RocksDbWeight::get().reads(3 as Weight))
.saturating_add(RocksDbWeight::get().writes(2 as Weight))
}
// Storage: Identity SuperOf (r:1 w:1)
// Storage: Identity SubsOf (r:1 w:1)
fn quit_sub(s: u32, ) -> Weight {
- (36_304_000 as Weight)
+ (32_286_000 as Weight)
// Standard Error: 1_000
- .saturating_add((191_000 as Weight).saturating_mul(s as Weight))
+ .saturating_add((166_000 as Weight).saturating_mul(s as Weight))
.saturating_add(RocksDbWeight::get().reads(2 as Weight))
.saturating_add(RocksDbWeight::get().writes(2 as Weight))
}
diff --git a/substrate/utils/frame/benchmarking-cli/src/template.hbs b/substrate/utils/frame/benchmarking-cli/src/template.hbs
index 36abf27f59a..ea734e16591 100644
--- a/substrate/utils/frame/benchmarking-cli/src/template.hbs
+++ b/substrate/utils/frame/benchmarking-cli/src/template.hbs
@@ -6,7 +6,7 @@
//! EXECUTION: {{cmd.execution}}, WASM-EXECUTION: {{cmd.wasm_execution}}, CHAIN: {{cmd.chain}}, DB CACHE: {{cmd.db_cache}}
// Executed Command:
-{{#each args as |arg|~}}
+{{#each args as |arg|}}
// {{arg}}
{{/each}}
@@ -20,32 +20,32 @@ use sp_std::marker::PhantomData;
/// Weight functions for `{{pallet}}`.
pub struct WeightInfo<T>(PhantomData<T>);
impl<T: frame_system::Config> {{pallet}}::WeightInfo for WeightInfo<T> {
- {{~#each benchmarks as |benchmark|}}
- {{~#each benchmark.comments as |comment|}}
+ {{#each benchmarks as |benchmark|}}
+ {{#each benchmark.comments as |comment|}}
// {{comment}}
- {{~/each}}
+ {{/each}}
fn {{benchmark.name~}}
(
{{~#each benchmark.components as |c| ~}}
{{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
) -> Weight {
({{underscore benchmark.base_weight}} as Weight)
- {{~#each benchmark.component_weight as |cw|}}
+ {{#each benchmark.component_weight as |cw|}}
// Standard Error: {{underscore cw.error}}
.saturating_add(({{underscore cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight))
- {{~/each}}
- {{~#if (ne benchmark.base_reads "0")}}
+ {{/each}}
+ {{#if (ne benchmark.base_reads "0")}}
.saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}} as Weight))
- {{~/if}}
- {{~#each benchmark.component_reads as |cr|}}
+ {{/if}}
+ {{#each benchmark.component_reads as |cr|}}
.saturating_add(T::DbWeight::get().reads(({{cr.slope}} as Weight).saturating_mul({{cr.name}} as Weight)))
- {{~/each}}
- {{~#if (ne benchmark.base_writes "0")}}
+ {{/each}}
+ {{#if (ne benchmark.base_writes "0")}}
.saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}} as Weight))
- {{~/if}}
- {{~#each benchmark.component_writes as |cw|}}
+ {{/if}}
+ {{#each benchmark.component_writes as |cw|}}
.saturating_add(T::DbWeight::get().writes(({{cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight)))
- {{~/each}}
+ {{/each}}
}
- {{~/each}}
+ {{/each}}
}
--
GitLab