Skip to content

Commit

Permalink
update benchmarks
Browse files Browse the repository at this point in the history
  • Loading branch information
@JesseAbram
JesseAbram committed Aug 27, 2024
1 parent 8af8e2e commit 4c8e089
Show file tree
Hide file tree
Showing 3 changed files with 68 additions and 50 deletions.
35 changes: 18 additions & 17 deletions pallets/staking/src/benchmarking.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ use frame_support::{
};
use frame_system::{EventRecord, RawOrigin};
use pallet_parameters::{SignersInfo, SignersSize};
use pallet_staking::{Pallet as FrameStaking, RewardDestination, ValidatorPrefs};
use pallet_staking::{
Event as FrameStakingEvent, Pallet as FrameStaking, RewardDestination, ValidatorPrefs,
};
use sp_std::{vec, vec::Vec};

use super::*;
Expand All @@ -42,6 +44,16 @@ fn assert_last_event<T: Config>(generic_event: <T as Config>::RuntimeEvent) {
assert_eq!(event, &system_event);
}

fn assert_last_event_frame_staking<T: Config>(
generic_event: <T as pallet_staking::Config>::RuntimeEvent,
) {
let events = frame_system::Pallet::<T>::events();
let system_event: <T as frame_system::Config>::RuntimeEvent = generic_event.into();
// compare to the last event record
let EventRecord { event, .. } = &events[events.len() - 1];
assert_eq!(event, &system_event);
}

pub fn create_validators<T: Config>(
count: u32,
seed: u32,
Expand Down Expand Up @@ -140,21 +152,12 @@ benchmarks! {
});

prep_bond_and_validate::<T>(true, caller.clone(), bonder.clone(), threshold, NULL_ARR);
let bond = <T as pallet_staking::Config>::Currency::minimum_balance() * 10u32.into();

// assume fully unbonded as slightly more weight, but not enough to handle partial unbond
assert_ok!(<FrameStaking<T>>::unbond(
RawOrigin::Signed(bonder.clone()).into(),
bond,
));


}: _(RawOrigin::Signed(bonder.clone()), 0u32.into())
}: _(RawOrigin::Signed(bonder.clone()), 10u32.into())
verify {
// TODO: JA fix, pretty much benching this pathway requiers moving the session forward
// This is diffcult, from the test we were able to mock it but benchamrks use runtime configs
// It is fine for now but should come back to it
// assert_last_event::<T>(Event::NodeInfoRemoved(caller).into());
assert_last_event_frame_staking::<T>(FrameStakingEvent::Unbonded{ stash: bonder, amount: 10u32.into() }.into() );

}

chill {
Expand Down Expand Up @@ -184,10 +187,8 @@ benchmarks! {

}: _(RawOrigin::Signed(bonder.clone()))
verify {
// TODO: JA fix, pretty much benching this pathway requiers moving the session forward
// This is diffcult, from the test we were able to mock it but benchamrks use runtime configs
// It is fine for now but should come back to it
// assert_last_event::<T>(Event::NodeInfoRemoved(caller).into());
assert_last_event_frame_staking::<T>(FrameStakingEvent::Chilled{ stash: bonder }.into() );

}


Expand Down
2 changes: 1 addition & 1 deletion pallets/staking/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ pub mod pallet {

let validator_id = <T as pallet_session::Config>::ValidatorId::try_from(ledger.stash)
.or(Err(Error::<T>::InvalidValidatorId))?;

let signers = Self::signers();
ensure!(!signers.contains(&validator_id), Error::<T>::NoUnbodingWhenSigner);

Expand Down
81 changes: 49 additions & 32 deletions runtime/src/weights/pallet_staking_extension.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ impl<T: frame_system::Config> pallet_staking_extension::WeightInfo for WeightInf
// Measured: `1309`
// Estimated: `4774`
// Minimum execution time: 25_000_000 picoseconds.
Weight::from_parts(30_000_000, 0)
Weight::from_parts(25_000_000, 0)
.saturating_add(Weight::from_parts(0, 4774))
.saturating_add(T::DbWeight::get().reads(3))
.saturating_add(T::DbWeight::get().writes(1))
Expand All @@ -73,31 +73,46 @@ impl<T: frame_system::Config> pallet_staking_extension::WeightInfo for WeightInf
// Proof Size summary in bytes:
// Measured: `1430`
// Estimated: `4895`
// Minimum execution time: 29_000_000 picoseconds.
Weight::from_parts(29_000_000, 0)
// Minimum execution time: 28_000_000 picoseconds.
Weight::from_parts(28_000_000, 0)
.saturating_add(Weight::from_parts(0, 4895))
.saturating_add(T::DbWeight::get().reads(4))
.saturating_add(T::DbWeight::get().writes(2))
}
/// Storage: `Staking::Ledger` (r:1 w:0)
/// Storage: `Staking::Ledger` (r:1 w:1)
/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
/// Storage: `Staking::Bonded` (r:1 w:0)
/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
/// Storage: `StakingExtension::Signers` (r:1 w:0)
/// Proof: `StakingExtension::Signers` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
/// Storage: `StakingExtension::NextSigners` (r:1 w:0)
/// Proof: `StakingExtension::NextSigners` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
/// Storage: `Staking::Nominators` (r:1 w:0)
/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
/// Storage: `Staking::Validators` (r:1 w:0)
/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
/// Storage: `Staking::MinValidatorBond` (r:1 w:0)
/// Proof: `Staking::MinValidatorBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
/// Storage: `Staking::CurrentEra` (r:1 w:0)
/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
/// Storage: `Balances::Locks` (r:1 w:1)
/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
/// Storage: `Balances::Freezes` (r:1 w:0)
/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(193), added: 2668, mode: `MaxEncodedLen`)
/// Storage: `System::Account` (r:1 w:1)
/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
/// Storage: `BagsList::ListNodes` (r:1 w:1)
/// Proof: `BagsList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
/// The range of component `c` is `[0, 15]`.
fn unbond(c: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `1153 + c * (64 ±0)`
// Estimated: `4556 + c * (64 ±0)`
// Minimum execution time: 30_000_000 picoseconds.
Weight::from_parts(31_919_889, 0)
.saturating_add(Weight::from_parts(0, 4556))
// Standard Error: 69_754
.saturating_add(Weight::from_parts(122_237, 0).saturating_mul(c.into()))
.saturating_add(T::DbWeight::get().reads(4))
// Measured: `2196 + c * (64 ±0)`
// Estimated: `4764 + c * (64 ±0)`
// Minimum execution time: 72_000_000 picoseconds.
Weight::from_parts(80_654_696, 0)
.saturating_add(Weight::from_parts(0, 4764))
.saturating_add(T::DbWeight::get().reads(12))
.saturating_add(T::DbWeight::get().writes(4))
.saturating_add(Weight::from_parts(0, 64).saturating_mul(c.into()))
}
/// Storage: `Staking::Ledger` (r:1 w:0)
Expand Down Expand Up @@ -125,9 +140,11 @@ impl<T: frame_system::Config> pallet_staking_extension::WeightInfo for WeightInf
// Proof Size summary in bytes:
// Measured: `2093 + c * (64 ±0)`
// Estimated: `6248 + c * (64 ±0)`
// Minimum execution time: 56_000_000 picoseconds.
Weight::from_parts(60_113_259, 0)
// Minimum execution time: 57_000_000 picoseconds.
Weight::from_parts(57_323_204, 0)
.saturating_add(Weight::from_parts(0, 6248))
// Standard Error: 46_647
.saturating_add(Weight::from_parts(80_110, 0).saturating_mul(c.into()))
.saturating_add(T::DbWeight::get().reads(11))
.saturating_add(T::DbWeight::get().writes(6))
.saturating_add(Weight::from_parts(0, 64).saturating_mul(c.into()))
Expand All @@ -153,11 +170,11 @@ impl<T: frame_system::Config> pallet_staking_extension::WeightInfo for WeightInf
// Proof Size summary in bytes:
// Measured: `1460 + c * (64 ±0)`
// Estimated: `4764 + c * (64 ±0)`
// Minimum execution time: 46_000_000 picoseconds.
Weight::from_parts(46_132_596, 0)
// Minimum execution time: 45_000_000 picoseconds.
Weight::from_parts(47_837_016, 0)
.saturating_add(Weight::from_parts(0, 4764))
// Standard Error: 47_282
.saturating_add(Weight::from_parts(64_917, 0).saturating_mul(c.into()))
// Standard Error: 246_578
.saturating_add(Weight::from_parts(50_414, 0).saturating_mul(c.into()))
.saturating_add(T::DbWeight::get().reads(8))
.saturating_add(T::DbWeight::get().writes(3))
.saturating_add(Weight::from_parts(0, 64).saturating_mul(c.into()))
Expand Down Expand Up @@ -192,8 +209,8 @@ impl<T: frame_system::Config> pallet_staking_extension::WeightInfo for WeightInf
// Proof Size summary in bytes:
// Measured: `1918`
// Estimated: `6248`
// Minimum execution time: 65_000_000 picoseconds.
Weight::from_parts(69_000_000, 0)
// Minimum execution time: 64_000_000 picoseconds.
Weight::from_parts(78_000_000, 0)
.saturating_add(Weight::from_parts(0, 6248))
.saturating_add(T::DbWeight::get().reads(13))
.saturating_add(T::DbWeight::get().writes(8))
Expand All @@ -206,8 +223,8 @@ impl<T: frame_system::Config> pallet_staking_extension::WeightInfo for WeightInf
// Proof Size summary in bytes:
// Measured: `320`
// Estimated: `3785`
// Minimum execution time: 10_000_000 picoseconds.
Weight::from_parts(14_000_000, 0)
// Minimum execution time: 9_000_000 picoseconds.
Weight::from_parts(9_000_000, 0)
.saturating_add(Weight::from_parts(0, 3785))
.saturating_add(T::DbWeight::get().reads(1))
.saturating_add(T::DbWeight::get().writes(1))
Expand All @@ -221,8 +238,8 @@ impl<T: frame_system::Config> pallet_staking_extension::WeightInfo for WeightInf
// Proof Size summary in bytes:
// Measured: `797 + c * (32 ±0)`
// Estimated: `4298 + c * (29 ±1)`
// Minimum execution time: 11_000_000 picoseconds.
Weight::from_parts(12_383_977, 0)
// Minimum execution time: 10_000_000 picoseconds.
Weight::from_parts(11_129_834, 0)
.saturating_add(Weight::from_parts(0, 4298))
.saturating_add(T::DbWeight::get().reads(2))
.saturating_add(T::DbWeight::get().writes(1))
Expand All @@ -239,7 +256,7 @@ impl<T: frame_system::Config> pallet_staking_extension::WeightInfo for WeightInf
// Measured: `1309`
// Estimated: `4774`
// Minimum execution time: 12_000_000 picoseconds.
Weight::from_parts(18_000_000, 0)
Weight::from_parts(14_000_000, 0)
.saturating_add(Weight::from_parts(0, 4774))
.saturating_add(T::DbWeight::get().reads(2))
.saturating_add(T::DbWeight::get().writes(2))
Expand All @@ -253,9 +270,11 @@ impl<T: frame_system::Config> pallet_staking_extension::WeightInfo for WeightInf
// Proof Size summary in bytes:
// Measured: `254 + s * (32 ±0)`
// Estimated: `1739 + s * (32 ±0)`
// Minimum execution time: 6_000_000 picoseconds.
Weight::from_parts(6_523_346, 0)
// Minimum execution time: 5_000_000 picoseconds.
Weight::from_parts(5_305_447, 0)
.saturating_add(Weight::from_parts(0, 1739))
// Standard Error: 22_761
.saturating_add(Weight::from_parts(60_311, 0).saturating_mul(s.into()))
.saturating_add(T::DbWeight::get().reads(2))
.saturating_add(Weight::from_parts(0, 32).saturating_mul(s.into()))
}
Expand All @@ -280,12 +299,10 @@ impl<T: frame_system::Config> pallet_staking_extension::WeightInfo for WeightInf
// Measured: `482 + c * (32 ±0)`
// Estimated: `1966 + c * (32 ±0)`
// Minimum execution time: 13_000_000 picoseconds.
Weight::from_parts(13_804_739, 0)
Weight::from_parts(15_615_913, 0)
.saturating_add(Weight::from_parts(0, 1966))
// Standard Error: 35_656
.saturating_add(Weight::from_parts(15_438, 0).saturating_mul(c.into()))
// Standard Error: 30_550
.saturating_add(Weight::from_parts(8_718, 0).saturating_mul(l.into()))
// Standard Error: 81_788
.saturating_add(Weight::from_parts(23_388, 0).saturating_mul(l.into()))
.saturating_add(T::DbWeight::get().reads(5))
.saturating_add(T::DbWeight::get().writes(3))
.saturating_add(Weight::from_parts(0, 32).saturating_mul(c.into()))
Expand Down

0 comments on commit 4c8e089

Please sign in to comment.