Explorar el Código

benchmark: working-group: use worst-case instance for working-group benchmark

conectado hace 4 años
padre
commit
9feaed010b

+ 1 - 1
runtime-modules/proposals/codex/src/tests/mock.rs

@@ -270,7 +270,7 @@ impl working_group::WeightInfo for WorkingGroupWeightInfo {
     fn terminate_role_worker(_: u32) -> Weight {
         0
     }
-    fn terminate_role_lead() -> Weight {
+    fn terminate_role_lead(_: u32) -> Weight {
         0
     }
     fn increase_stake() -> Weight {

+ 1 - 1
runtime-modules/service-discovery/src/mock.rs

@@ -188,7 +188,7 @@ impl working_group::WeightInfo for WorkingGroupWeightInfo {
     fn terminate_role_worker(_: u32) -> Weight {
         0
     }
-    fn terminate_role_lead() -> Weight {
+    fn terminate_role_lead(_: u32) -> Weight {
         0
     }
     fn increase_stake() -> Weight {

+ 1 - 1
runtime-modules/storage/src/tests/mock.rs

@@ -204,7 +204,7 @@ impl working_group::WeightInfo for WorkingGroupWeightInfo {
     fn terminate_role_worker(_: u32) -> Weight {
         0
     }
-    fn terminate_role_lead() -> Weight {
+    fn terminate_role_lead(_: u32) -> Weight {
         0
     }
     fn increase_stake() -> Weight {

+ 5 - 2
runtime-modules/working-group/src/lib.rs

@@ -76,7 +76,7 @@ pub trait WeightInfo {
     fn withdraw_application() -> Weight;
     fn slash_stake(i: u32) -> Weight;
     fn terminate_role_worker(i: u32) -> Weight;
-    fn terminate_role_lead() -> Weight; // Parameter not used so it's discarded
+    fn terminate_role_lead(i: u32) -> Weight;
     fn increase_stake() -> Weight;
     fn decrease_stake() -> Weight;
     fn spend_from_budget() -> Weight;
@@ -571,7 +571,10 @@ decl_module! {
         /// - DB:
         ///    - O(1) doesn't depend on the state or parameters
         /// # </weight>
-        #[weight = WeightInfoWorkingGroup::<T, I>::terminate_role_lead()
+        #[weight = WeightInfoWorkingGroup::<T, I>::terminate_role_lead(
+                    penalty.as_ref().map(|penalty| penalty.slashing_text.len().saturated_into())
+                    .unwrap_or_else(|| 0)
+                )
                 .max(WeightInfoWorkingGroup::<T, I>::terminate_role_worker(
                         penalty.as_ref().map(|penalty| penalty.slashing_text.len().saturated_into())
                             .unwrap_or_else(|| 0)

+ 1 - 1
runtime-modules/working-group/src/tests/mock.rs

@@ -161,7 +161,7 @@ impl crate::WeightInfo for () {
     fn terminate_role_worker(_: u32) -> Weight {
         0
     }
-    fn terminate_role_lead() -> Weight {
+    fn terminate_role_lead(_: u32) -> Weight {
         0
     }
     fn increase_stake() -> Weight {

+ 2 - 2
runtime/src/runtime_api.rs

@@ -262,7 +262,7 @@ impl_runtime_apis! {
             use crate::ProposalsDiscussion;
             use crate::ProposalsEngine;
             use crate::Constitution;
-            use crate::ForumWorkingGroup;
+            use crate::ContentDirectoryWorkingGroup;
 
             let whitelist: Vec<TrackedStorageKey> = vec![
                 // Block Number
@@ -288,7 +288,7 @@ impl_runtime_apis! {
             add_benchmark!(params, batches, proposals_discussion, ProposalsDiscussion);
             add_benchmark!(params, batches, proposals_engine, ProposalsEngine);
             add_benchmark!(params, batches, pallet_constitution, Constitution);
-            add_benchmark!(params, batches, working_group, ForumWorkingGroup);
+            add_benchmark!(params, batches, working_group, ContentDirectoryWorkingGroup);
 
             if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) }
             Ok(batches)

+ 32 - 32
runtime/src/weights/working_group.rs

@@ -9,133 +9,133 @@ pub struct WeightInfo;
 impl working_group::WeightInfo for WeightInfo {
     fn on_initialize_leaving(i: u32) -> Weight {
         (0 as Weight)
-            .saturating_add((661_028_000 as Weight).saturating_mul(i as Weight))
+            .saturating_add((744_041_000 as Weight).saturating_mul(i as Weight))
             .saturating_add(DbWeight::get().reads(4 as Weight))
             .saturating_add(DbWeight::get().reads((3 as Weight).saturating_mul(i as Weight)))
             .saturating_add(DbWeight::get().writes(3 as Weight))
             .saturating_add(DbWeight::get().writes((3 as Weight).saturating_mul(i as Weight)))
     }
     fn on_initialize_rewarding_with_missing_reward(i: u32) -> Weight {
-        (0 as Weight)
-            .saturating_add((470_374_000 as Weight).saturating_mul(i as Weight))
+        (2_692_227_000 as Weight)
+            .saturating_add((490_219_000 as Weight).saturating_mul(i as Weight))
             .saturating_add(DbWeight::get().reads(2 as Weight))
             .saturating_add(DbWeight::get().reads((2 as Weight).saturating_mul(i as Weight)))
             .saturating_add(DbWeight::get().writes(1 as Weight))
             .saturating_add(DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
     }
     fn on_initialize_rewarding_with_missing_reward_cant_pay(i: u32) -> Weight {
-        (90_637_000 as Weight)
-            .saturating_add((326_660_000 as Weight).saturating_mul(i as Weight))
+        (106_702_000 as Weight)
+            .saturating_add((382_691_000 as Weight).saturating_mul(i as Weight))
             .saturating_add(DbWeight::get().reads(2 as Weight))
             .saturating_add(DbWeight::get().reads((1 as Weight).saturating_mul(i as Weight)))
             .saturating_add(DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
     }
     fn on_initialize_rewarding_without_missing_reward(i: u32) -> Weight {
-        (168_436_000 as Weight)
-            .saturating_add((297_407_000 as Weight).saturating_mul(i as Weight))
+        (946_654_000 as Weight)
+            .saturating_add((326_825_000 as Weight).saturating_mul(i as Weight))
             .saturating_add(DbWeight::get().reads(2 as Weight))
             .saturating_add(DbWeight::get().reads((2 as Weight).saturating_mul(i as Weight)))
             .saturating_add(DbWeight::get().writes(2 as Weight))
     }
     fn apply_on_opening(i: u32) -> Weight {
-        (549_364_000 as Weight)
+        (583_905_000 as Weight)
             .saturating_add((2_000 as Weight).saturating_mul(i as Weight))
             .saturating_add(DbWeight::get().reads(5 as Weight))
             .saturating_add(DbWeight::get().writes(4 as Weight))
     }
     fn fill_opening_lead() -> Weight {
-        (507_605_000 as Weight)
+        (517_943_000 as Weight)
             .saturating_add(DbWeight::get().reads(5 as Weight))
             .saturating_add(DbWeight::get().writes(6 as Weight))
     }
     fn fill_opening_worker(i: u32) -> Weight {
-        (215_972_000 as Weight)
-            .saturating_add((295_997_000 as Weight).saturating_mul(i as Weight))
+        (0 as Weight)
+            .saturating_add((337_560_000 as Weight).saturating_mul(i as Weight))
             .saturating_add(DbWeight::get().reads(5 as Weight))
             .saturating_add(DbWeight::get().reads((1 as Weight).saturating_mul(i as Weight)))
             .saturating_add(DbWeight::get().writes(3 as Weight))
             .saturating_add(DbWeight::get().writes((2 as Weight).saturating_mul(i as Weight)))
     }
     fn update_role_account() -> Weight {
-        (366_128_000 as Weight)
+        (405_699_000 as Weight)
             .saturating_add(DbWeight::get().reads(2 as Weight))
             .saturating_add(DbWeight::get().writes(1 as Weight))
     }
     fn cancel_opening() -> Weight {
-        (267_071_000 as Weight)
+        (284_090_000 as Weight)
             .saturating_add(DbWeight::get().reads(3 as Weight))
             .saturating_add(DbWeight::get().writes(1 as Weight))
     }
     fn withdraw_application() -> Weight {
-        (372_243_000 as Weight)
+        (412_772_000 as Weight)
             .saturating_add(DbWeight::get().reads(3 as Weight))
             .saturating_add(DbWeight::get().writes(3 as Weight))
     }
     fn slash_stake(i: u32) -> Weight {
-        (751_074_000 as Weight)
-            .saturating_add((1_000 as Weight).saturating_mul(i as Weight))
+        (827_597_000 as Weight)
+            .saturating_add((4_000 as Weight).saturating_mul(i as Weight))
             .saturating_add(DbWeight::get().reads(5 as Weight))
             .saturating_add(DbWeight::get().writes(2 as Weight))
     }
     fn terminate_role_worker(i: u32) -> Weight {
-        (1_208_516_000 as Weight)
-            .saturating_add((1_000 as Weight).saturating_mul(i as Weight))
+        (1_268_966_000 as Weight)
+            .saturating_add((14_000 as Weight).saturating_mul(i as Weight))
             .saturating_add(DbWeight::get().reads(7 as Weight))
             .saturating_add(DbWeight::get().writes(5 as Weight))
     }
-    // WARNING! Some components were not used: ["i"]
-    fn terminate_role_lead() -> Weight {
-        (1_158_631_000 as Weight)
+    fn terminate_role_lead(i: u32) -> Weight {
+        (1_266_771_000 as Weight)
+            .saturating_add((5_000 as Weight).saturating_mul(i as Weight))
             .saturating_add(DbWeight::get().reads(6 as Weight))
             .saturating_add(DbWeight::get().writes(6 as Weight))
     }
     fn increase_stake() -> Weight {
-        (712_005_000 as Weight)
+        (783_675_000 as Weight)
             .saturating_add(DbWeight::get().reads(3 as Weight))
             .saturating_add(DbWeight::get().writes(2 as Weight))
     }
     fn decrease_stake() -> Weight {
-        (800_137_000 as Weight)
+        (895_623_000 as Weight)
             .saturating_add(DbWeight::get().reads(5 as Weight))
             .saturating_add(DbWeight::get().writes(2 as Weight))
     }
     fn spend_from_budget() -> Weight {
-        (285_147_000 as Weight)
+        (307_455_000 as Weight)
             .saturating_add(DbWeight::get().reads(4 as Weight))
             .saturating_add(DbWeight::get().writes(1 as Weight))
     }
     fn update_reward_amount() -> Weight {
-        (390_432_000 as Weight)
+        (420_916_000 as Weight)
             .saturating_add(DbWeight::get().reads(3 as Weight))
             .saturating_add(DbWeight::get().writes(1 as Weight))
     }
     fn set_status_text(i: u32) -> Weight {
-        (222_153_000 as Weight)
-            .saturating_add((60_000 as Weight).saturating_mul(i as Weight))
+        (238_830_000 as Weight)
+            .saturating_add((68_000 as Weight).saturating_mul(i as Weight))
             .saturating_add(DbWeight::get().reads(2 as Weight))
             .saturating_add(DbWeight::get().writes(1 as Weight))
     }
     fn update_reward_account() -> Weight {
-        (282_438_000 as Weight)
+        (313_123_000 as Weight)
             .saturating_add(DbWeight::get().reads(1 as Weight))
             .saturating_add(DbWeight::get().writes(1 as Weight))
     }
     fn set_budget() -> Weight {
-        (74_429_000 as Weight).saturating_add(DbWeight::get().writes(1 as Weight))
+        (81_417_000 as Weight).saturating_add(DbWeight::get().writes(1 as Weight))
     }
     fn add_opening(i: u32) -> Weight {
-        (263_062_000 as Weight)
+        (290_743_000 as Weight)
             .saturating_add((2_000 as Weight).saturating_mul(i as Weight))
             .saturating_add(DbWeight::get().reads(3 as Weight))
             .saturating_add(DbWeight::get().writes(2 as Weight))
     }
     fn leave_role_immediatly() -> Weight {
-        (483_595_000 as Weight)
+        (544_861_000 as Weight)
             .saturating_add(DbWeight::get().reads(5 as Weight))
             .saturating_add(DbWeight::get().writes(4 as Weight))
     }
     fn leave_role_later() -> Weight {
-        (315_015_000 as Weight)
+        (341_012_000 as Weight)
             .saturating_add(DbWeight::get().reads(2 as Weight))
             .saturating_add(DbWeight::get().writes(1 as Weight))
     }