diff --git a/substrate/.maintain/frame-weight-template.hbs b/substrate/.maintain/frame-weight-template.hbs index 595c2a7d31..146cc4cfcb 100644 --- a/substrate/.maintain/frame-weight-template.hbs +++ b/substrate/.maintain/frame-weight-template.hbs @@ -33,68 +33,68 @@ 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(PhantomData); impl WeightInfo for SubstrateWeight { - {{#each benchmarks as |benchmark| ~}} + {{~#each benchmarks as |benchmark|}} 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|}} .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}} } // For backwards compatibility and tests impl WeightInfo for () { - {{#each benchmarks as |benchmark| ~}} + {{~#each benchmarks as |benchmark|}} 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|}} .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}} } diff --git a/substrate/frame/democracy/src/weights.rs b/substrate/frame/democracy/src/weights.rs index 9d17d3a768..e386e5fb55 100644 --- a/substrate/frame/democracy/src/weights.rs +++ b/substrate/frame/democracy/src/weights.rs @@ -17,7 +17,7 @@ //! Weights for pallet_democracy //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0 -//! DATE: 2020-10-27, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: [] +//! DATE: 2020-10-28, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: [] //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128 // Executed Command: @@ -44,372 +44,323 @@ use sp_std::marker::PhantomData; /// Weight functions needed for pallet_democracy. pub trait WeightInfo { fn propose() -> Weight; - fn second(_s: u32, ) -> Weight; - fn vote_new(_r: u32, ) -> Weight; - fn vote_existing(_r: u32, ) -> Weight; + fn second(s: u32, ) -> Weight; + fn vote_new(r: u32, ) -> Weight; + fn vote_existing(r: u32, ) -> Weight; fn emergency_cancel() -> Weight; - fn blacklist(_p: u32, ) -> Weight; - fn external_propose(_v: u32, ) -> Weight; + fn blacklist(p: u32, ) -> Weight; + fn external_propose(v: u32, ) -> Weight; fn external_propose_majority() -> Weight; fn external_propose_default() -> Weight; fn fast_track() -> Weight; - fn veto_external(_v: u32, ) -> Weight; - fn cancel_proposal(_p: u32, ) -> Weight; + fn veto_external(v: u32, ) -> Weight; + fn cancel_proposal(p: u32, ) -> Weight; fn cancel_referendum() -> Weight; - fn cancel_queued(_r: u32, ) -> Weight; - fn on_initialize_base(_r: u32, ) -> Weight; - fn delegate(_r: u32, ) -> Weight; - fn undelegate(_r: u32, ) -> Weight; + fn cancel_queued(r: u32, ) -> Weight; + fn on_initialize_base(r: u32, ) -> Weight; + fn delegate(r: u32, ) -> Weight; + fn undelegate(r: u32, ) -> Weight; fn clear_public_proposals() -> Weight; - fn note_preimage(_b: u32, ) -> Weight; - fn note_imminent_preimage(_b: u32, ) -> Weight; - fn reap_preimage(_b: u32, ) -> Weight; - fn unlock_remove(_r: u32, ) -> Weight; - fn unlock_set(_r: u32, ) -> Weight; - fn remove_vote(_r: u32, ) -> Weight; - fn remove_other_vote(_r: u32, ) -> Weight; - + fn note_preimage(b: u32, ) -> Weight; + fn note_imminent_preimage(b: u32, ) -> Weight; + fn reap_preimage(b: u32, ) -> Weight; + fn unlock_remove(r: u32, ) -> Weight; + fn unlock_set(r: u32, ) -> Weight; + fn remove_vote(r: u32, ) -> Weight; + fn remove_other_vote(r: u32, ) -> Weight; } /// Weights for pallet_democracy using the Substrate node and recommended hardware. pub struct SubstrateWeight(PhantomData); impl WeightInfo for SubstrateWeight { fn propose() -> Weight { - (86_479_000 as Weight) + (87_883_000 as Weight) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) - } fn second(s: u32, ) -> Weight { - (52_126_000 as Weight) - .saturating_add((211_000 as Weight).saturating_mul(s as Weight)) + (52_998_000 as Weight) + .saturating_add((251_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } fn vote_new(r: u32, ) -> Weight { - (62_010_000 as Weight) - .saturating_add((288_000 as Weight).saturating_mul(r as Weight)) + (63_300_000 as Weight) + .saturating_add((284_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) - } fn vote_existing(r: u32, ) -> Weight { - (61_870_000 as Weight) - .saturating_add((294_000 as Weight).saturating_mul(r as Weight)) + (63_127_000 as Weight) + .saturating_add((289_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) - } fn emergency_cancel() -> Weight { - (37_329_000 as Weight) + (38_877_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) - } fn blacklist(p: u32, ) -> Weight { - (105_595_000 as Weight) - .saturating_add((812_000 as Weight).saturating_mul(p as Weight)) + (108_060_000 as Weight) + .saturating_add((795_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().writes(6 as Weight)) - } fn external_propose(v: u32, ) -> Weight { - (18_670_000 as Weight) - .saturating_add((110_000 as Weight).saturating_mul(v as Weight)) + (19_052_000 as Weight) + .saturating_add((111_000 as Weight).saturating_mul(v as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } fn external_propose_majority() -> Weight { - (4_413_000 as Weight) + (4_544_000 as Weight) .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } fn external_propose_default() -> Weight { - (4_365_000 as Weight) + (4_608_000 as Weight) .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } fn fast_track() -> Weight { - (37_914_000 as Weight) + (38_876_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) - } fn veto_external(v: u32, ) -> Weight { - (38_965_000 as Weight) - .saturating_add((188_000 as Weight).saturating_mul(v as Weight)) + (40_283_000 as Weight) + .saturating_add((187_000 as Weight).saturating_mul(v as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) - } fn cancel_proposal(p: u32, ) -> Weight { - (66_560_000 as Weight) - .saturating_add((898_000 as Weight).saturating_mul(p as Weight)) + (68_449_000 as Weight) + .saturating_add((876_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) - } fn cancel_referendum() -> Weight { - (22_971_000 as Weight) + (23_670_000 as Weight) .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } fn cancel_queued(r: u32, ) -> Weight { - (41_431_000 as Weight) - .saturating_add((4_598_000 as Weight).saturating_mul(r as Weight)) + (43_247_000 as Weight) + .saturating_add((4_578_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) - } fn on_initialize_base(r: u32, ) -> Weight { - (14_908_000 as Weight) - .saturating_add((6_638_000 as Weight).saturating_mul(r as Weight)) + (15_278_000 as Weight) + .saturating_add((6_696_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) - } fn delegate(r: u32, ) -> Weight { - (82_620_000 as Weight) - .saturating_add((9_780_000 as Weight).saturating_mul(r as Weight)) + (83_002_000 as Weight) + .saturating_add((9_889_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) .saturating_add(T::DbWeight::get().writes(4 as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight))) } fn undelegate(r: u32, ) -> Weight { - (40_817_000 as Weight) - .saturating_add((9_870_000 as Weight).saturating_mul(r as Weight)) + (43_552_000 as Weight) + .saturating_add((9_887_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) .saturating_add(T::DbWeight::get().writes(2 as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight))) } fn clear_public_proposals() -> Weight { - (4_071_000 as Weight) + (4_404_000 as Weight) .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } fn note_preimage(b: u32, ) -> Weight { - (58_361_000 as Weight) + (60_073_000 as Weight) .saturating_add((4_000 as Weight).saturating_mul(b as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } fn note_imminent_preimage(b: u32, ) -> Weight { - (39_294_000 as Weight) - .saturating_add((3_000 as Weight).saturating_mul(b as Weight)) + (38_896_000 as Weight) + .saturating_add((4_000 as Weight).saturating_mul(b as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } fn reap_preimage(b: u32, ) -> Weight { - (52_829_000 as Weight) + (54_861_000 as Weight) .saturating_add((3_000 as Weight).saturating_mul(b as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } fn unlock_remove(r: u32, ) -> Weight { - (52_058_000 as Weight) - .saturating_add((131_000 as Weight).saturating_mul(r as Weight)) + (52_956_000 as Weight) + .saturating_add((126_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) - } fn unlock_set(r: u32, ) -> Weight { - (47_488_000 as Weight) - .saturating_add((317_000 as Weight).saturating_mul(r as Weight)) + (49_789_000 as Weight) + .saturating_add((274_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) - } fn remove_vote(r: u32, ) -> Weight { - (28_231_000 as Weight) - .saturating_add((311_000 as Weight).saturating_mul(r as Weight)) + (29_790_000 as Weight) + .saturating_add((283_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) - } fn remove_other_vote(r: u32, ) -> Weight { - (27_743_000 as Weight) + (28_497_000 as Weight) .saturating_add((217_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) - } - } // For backwards compatibility and tests impl WeightInfo for () { fn propose() -> Weight { - (86_479_000 as Weight) + (87_883_000 as Weight) .saturating_add(RocksDbWeight::get().reads(3 as Weight)) .saturating_add(RocksDbWeight::get().writes(3 as Weight)) - } fn second(s: u32, ) -> Weight { - (52_126_000 as Weight) - .saturating_add((211_000 as Weight).saturating_mul(s as Weight)) + (52_998_000 as Weight) + .saturating_add((251_000 as Weight).saturating_mul(s as Weight)) .saturating_add(RocksDbWeight::get().reads(1 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) - } fn vote_new(r: u32, ) -> Weight { - (62_010_000 as Weight) - .saturating_add((288_000 as Weight).saturating_mul(r as Weight)) + (63_300_000 as Weight) + .saturating_add((284_000 as Weight).saturating_mul(r as Weight)) .saturating_add(RocksDbWeight::get().reads(3 as Weight)) .saturating_add(RocksDbWeight::get().writes(3 as Weight)) - } fn vote_existing(r: u32, ) -> Weight { - (61_870_000 as Weight) - .saturating_add((294_000 as Weight).saturating_mul(r as Weight)) + (63_127_000 as Weight) + .saturating_add((289_000 as Weight).saturating_mul(r as Weight)) .saturating_add(RocksDbWeight::get().reads(3 as Weight)) .saturating_add(RocksDbWeight::get().writes(3 as Weight)) - } fn emergency_cancel() -> Weight { - (37_329_000 as Weight) + (38_877_000 as Weight) .saturating_add(RocksDbWeight::get().reads(2 as Weight)) .saturating_add(RocksDbWeight::get().writes(2 as Weight)) - } fn blacklist(p: u32, ) -> Weight { - (105_595_000 as Weight) - .saturating_add((812_000 as Weight).saturating_mul(p as Weight)) + (108_060_000 as Weight) + .saturating_add((795_000 as Weight).saturating_mul(p as Weight)) .saturating_add(RocksDbWeight::get().reads(5 as Weight)) .saturating_add(RocksDbWeight::get().writes(6 as Weight)) - } fn external_propose(v: u32, ) -> Weight { - (18_670_000 as Weight) - .saturating_add((110_000 as Weight).saturating_mul(v as Weight)) + (19_052_000 as Weight) + .saturating_add((111_000 as Weight).saturating_mul(v as Weight)) .saturating_add(RocksDbWeight::get().reads(2 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) - } fn external_propose_majority() -> Weight { - (4_413_000 as Weight) + (4_544_000 as Weight) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) - } fn external_propose_default() -> Weight { - (4_365_000 as Weight) + (4_608_000 as Weight) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) - } fn fast_track() -> Weight { - (37_914_000 as Weight) + (38_876_000 as Weight) .saturating_add(RocksDbWeight::get().reads(2 as Weight)) .saturating_add(RocksDbWeight::get().writes(3 as Weight)) - } fn veto_external(v: u32, ) -> Weight { - (38_965_000 as Weight) - .saturating_add((188_000 as Weight).saturating_mul(v as Weight)) + (40_283_000 as Weight) + .saturating_add((187_000 as Weight).saturating_mul(v as Weight)) .saturating_add(RocksDbWeight::get().reads(2 as Weight)) .saturating_add(RocksDbWeight::get().writes(2 as Weight)) - } fn cancel_proposal(p: u32, ) -> Weight { - (66_560_000 as Weight) - .saturating_add((898_000 as Weight).saturating_mul(p as Weight)) + (68_449_000 as Weight) + .saturating_add((876_000 as Weight).saturating_mul(p as Weight)) .saturating_add(RocksDbWeight::get().reads(3 as Weight)) .saturating_add(RocksDbWeight::get().writes(3 as Weight)) - } fn cancel_referendum() -> Weight { - (22_971_000 as Weight) + (23_670_000 as Weight) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) - } fn cancel_queued(r: u32, ) -> Weight { - (41_431_000 as Weight) - .saturating_add((4_598_000 as Weight).saturating_mul(r as Weight)) + (43_247_000 as Weight) + .saturating_add((4_578_000 as Weight).saturating_mul(r as Weight)) .saturating_add(RocksDbWeight::get().reads(2 as Weight)) .saturating_add(RocksDbWeight::get().writes(2 as Weight)) - } fn on_initialize_base(r: u32, ) -> Weight { - (14_908_000 as Weight) - .saturating_add((6_638_000 as Weight).saturating_mul(r as Weight)) + (15_278_000 as Weight) + .saturating_add((6_696_000 as Weight).saturating_mul(r as Weight)) .saturating_add(RocksDbWeight::get().reads(5 as Weight)) .saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) - } fn delegate(r: u32, ) -> Weight { - (82_620_000 as Weight) - .saturating_add((9_780_000 as Weight).saturating_mul(r as Weight)) + (83_002_000 as Weight) + .saturating_add((9_889_000 as Weight).saturating_mul(r as Weight)) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) .saturating_add(RocksDbWeight::get().writes(4 as Weight)) .saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(r as Weight))) } fn undelegate(r: u32, ) -> Weight { - (40_817_000 as Weight) - .saturating_add((9_870_000 as Weight).saturating_mul(r as Weight)) + (43_552_000 as Weight) + .saturating_add((9_887_000 as Weight).saturating_mul(r as Weight)) .saturating_add(RocksDbWeight::get().reads(2 as Weight)) .saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) .saturating_add(RocksDbWeight::get().writes(2 as Weight)) .saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(r as Weight))) } fn clear_public_proposals() -> Weight { - (4_071_000 as Weight) + (4_404_000 as Weight) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) - } fn note_preimage(b: u32, ) -> Weight { - (58_361_000 as Weight) + (60_073_000 as Weight) .saturating_add((4_000 as Weight).saturating_mul(b as Weight)) .saturating_add(RocksDbWeight::get().reads(1 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) - } fn note_imminent_preimage(b: u32, ) -> Weight { - (39_294_000 as Weight) - .saturating_add((3_000 as Weight).saturating_mul(b as Weight)) + (38_896_000 as Weight) + .saturating_add((4_000 as Weight).saturating_mul(b as Weight)) .saturating_add(RocksDbWeight::get().reads(1 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) - } fn reap_preimage(b: u32, ) -> Weight { - (52_829_000 as Weight) + (54_861_000 as Weight) .saturating_add((3_000 as Weight).saturating_mul(b as Weight)) .saturating_add(RocksDbWeight::get().reads(2 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) - } fn unlock_remove(r: u32, ) -> Weight { - (52_058_000 as Weight) - .saturating_add((131_000 as Weight).saturating_mul(r as Weight)) + (52_956_000 as Weight) + .saturating_add((126_000 as Weight).saturating_mul(r as Weight)) .saturating_add(RocksDbWeight::get().reads(3 as Weight)) .saturating_add(RocksDbWeight::get().writes(3 as Weight)) - } fn unlock_set(r: u32, ) -> Weight { - (47_488_000 as Weight) - .saturating_add((317_000 as Weight).saturating_mul(r as Weight)) + (49_789_000 as Weight) + .saturating_add((274_000 as Weight).saturating_mul(r as Weight)) .saturating_add(RocksDbWeight::get().reads(3 as Weight)) .saturating_add(RocksDbWeight::get().writes(3 as Weight)) - } fn remove_vote(r: u32, ) -> Weight { - (28_231_000 as Weight) - .saturating_add((311_000 as Weight).saturating_mul(r as Weight)) + (29_790_000 as Weight) + .saturating_add((283_000 as Weight).saturating_mul(r as Weight)) .saturating_add(RocksDbWeight::get().reads(2 as Weight)) .saturating_add(RocksDbWeight::get().writes(2 as Weight)) - } fn remove_other_vote(r: u32, ) -> Weight { - (27_743_000 as Weight) + (28_497_000 as Weight) .saturating_add((217_000 as Weight).saturating_mul(r as Weight)) .saturating_add(RocksDbWeight::get().reads(2 as Weight)) .saturating_add(RocksDbWeight::get().writes(2 as Weight)) - } - } diff --git a/substrate/frame/system/src/weights.rs b/substrate/frame/system/src/weights.rs index fb07e12507..5f3c84deb4 100644 --- a/substrate/frame/system/src/weights.rs +++ b/substrate/frame/system/src/weights.rs @@ -17,7 +17,7 @@ //! Weights for frame_system //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0 -//! DATE: 2020-10-27, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: [] +//! DATE: 2020-10-28, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: [] //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128 // Executed Command: @@ -43,91 +43,80 @@ use sp_std::marker::PhantomData; /// Weight functions needed for frame_system. pub trait WeightInfo { - fn remark(_b: u32, ) -> Weight; + fn remark(b: u32, ) -> Weight; fn set_heap_pages() -> Weight; fn set_changes_trie_config() -> Weight; - fn set_storage(_i: u32, ) -> Weight; - fn kill_storage(_i: u32, ) -> Weight; - fn kill_prefix(_p: u32, ) -> Weight; + fn set_storage(i: u32, ) -> Weight; + fn kill_storage(i: u32, ) -> Weight; + fn kill_prefix(p: u32, ) -> Weight; fn suicide() -> Weight; - } /// Weights for frame_system using the Substrate node and recommended hardware. pub struct SubstrateWeight(PhantomData); impl WeightInfo for SubstrateWeight { fn remark(_b: u32, ) -> Weight { - (1_906_000 as Weight) - + (1_973_000 as Weight) } fn set_heap_pages() -> Weight { - (2_792_000 as Weight) + (2_816_000 as Weight) .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } fn set_changes_trie_config() -> Weight { - (12_029_000 as Weight) + (11_539_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) - } fn set_storage(i: u32, ) -> Weight { (0 as Weight) - .saturating_add((842_000 as Weight).saturating_mul(i as Weight)) + .saturating_add((833_000 as Weight).saturating_mul(i as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight))) } fn kill_storage(i: u32, ) -> Weight { - (1_120_000 as Weight) - .saturating_add((599_000 as Weight).saturating_mul(i as Weight)) + (2_131_000 as Weight) + .saturating_add((597_000 as Weight).saturating_mul(i as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight))) } fn kill_prefix(p: u32, ) -> Weight { - (9_470_000 as Weight) - .saturating_add((861_000 as Weight).saturating_mul(p as Weight)) + (11_844_000 as Weight) + .saturating_add((857_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight))) } fn suicide() -> Weight { - (38_469_000 as Weight) - + (37_209_000 as Weight) } - } // For backwards compatibility and tests impl WeightInfo for () { fn remark(_b: u32, ) -> Weight { - (1_906_000 as Weight) - + (1_973_000 as Weight) } fn set_heap_pages() -> Weight { - (2_792_000 as Weight) + (2_816_000 as Weight) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) - } fn set_changes_trie_config() -> Weight { - (12_029_000 as Weight) + (11_539_000 as Weight) .saturating_add(RocksDbWeight::get().reads(1 as Weight)) .saturating_add(RocksDbWeight::get().writes(2 as Weight)) - } fn set_storage(i: u32, ) -> Weight { (0 as Weight) - .saturating_add((842_000 as Weight).saturating_mul(i as Weight)) + .saturating_add((833_000 as Weight).saturating_mul(i as Weight)) .saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(i as Weight))) } fn kill_storage(i: u32, ) -> Weight { - (1_120_000 as Weight) - .saturating_add((599_000 as Weight).saturating_mul(i as Weight)) + (2_131_000 as Weight) + .saturating_add((597_000 as Weight).saturating_mul(i as Weight)) .saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(i as Weight))) } fn kill_prefix(p: u32, ) -> Weight { - (9_470_000 as Weight) - .saturating_add((861_000 as Weight).saturating_mul(p as Weight)) + (11_844_000 as Weight) + .saturating_add((857_000 as Weight).saturating_mul(p as Weight)) .saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(p as Weight))) } fn suicide() -> Weight { - (38_469_000 as Weight) - + (37_209_000 as Weight) } - } diff --git a/substrate/utils/frame/benchmarking-cli/src/template.hbs b/substrate/utils/frame/benchmarking-cli/src/template.hbs index 7280b7b9cd..7f7e2d6dcb 100644 --- a/substrate/utils/frame/benchmarking-cli/src/template.hbs +++ b/substrate/utils/frame/benchmarking-cli/src/template.hbs @@ -18,28 +18,28 @@ use sp_std::marker::PhantomData; /// Weight functions for {{pallet}}. pub struct WeightInfo(PhantomData); impl {{pallet}}::WeightInfo for WeightInfo { - {{#each benchmarks as |benchmark| ~}} + {{~#each benchmarks as |benchmark|}} 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|}} .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}} }