WeightInfo for Vesting Pallet (#7103)

* WeightInfo for Vesting Pallet

* clean up weight docs

* Update lib.rs

* try to pipe max locks

* Update for new type

* add warning when locks > MaxLocks

* Update lib.rs

* fix compile

* remove aliasing, fix trait def

* Update
This commit is contained in:
Shawn Tabrizi
2020-09-16 21:48:10 +02:00
committed by GitHub
parent 0a6f7b08d7
commit 9aa8698cfc
37 changed files with 273 additions and 71 deletions
+16 -25
View File
@@ -61,8 +61,10 @@ use frame_support::traits::{
use frame_system::{ensure_signed, ensure_root};
mod benchmarking;
mod default_weights;
type BalanceOf<T> = <<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
type MaxLocksOf<T> = <<T as Trait>::Currency as LockableCurrency<<T as frame_system::Trait>::AccountId>>::MaxLocks;
pub trait WeightInfo {
fn vest_locked(l: u32, ) -> Weight;
@@ -70,14 +72,7 @@ pub trait WeightInfo {
fn vest_other_locked(l: u32, ) -> Weight;
fn vest_other_unlocked(l: u32, ) -> Weight;
fn vested_transfer(l: u32, ) -> Weight;
}
impl WeightInfo for () {
fn vest_locked(_l: u32, ) -> Weight { 1_000_000_000 }
fn vest_unlocked(_l: u32, ) -> Weight { 1_000_000_000 }
fn vest_other_locked(_l: u32, ) -> Weight { 1_000_000_000 }
fn vest_other_unlocked(_l: u32, ) -> Weight { 1_000_000_000 }
fn vested_transfer(_l: u32, ) -> Weight { 1_000_000_000 }
fn force_vested_transfer(l: u32, ) -> Weight;
}
pub trait Trait: frame_system::Trait {
@@ -171,7 +166,7 @@ decl_storage! {
decl_event!(
pub enum Event<T> where AccountId = <T as frame_system::Trait>::AccountId, Balance = BalanceOf<T> {
/// The amount vested has been updated. This could indicate more funds are available. The
/// balance given is the amount which is left unvested (and thus locked).
/// balance given is the amount which is left unvested (and thus locked).
/// \[account, unvested\]
VestingUpdated(AccountId, Balance),
/// An \[account\] has become fully vested. No further vesting can happen.
@@ -213,12 +208,10 @@ decl_module! {
/// - DbWeight: 2 Reads, 2 Writes
/// - Reads: Vesting Storage, Balances Locks, [Sender Account]
/// - Writes: Vesting Storage, Balances Locks, [Sender Account]
/// - Benchmark:
/// - Unlocked: 48.76 + .048 * l µs (min square analysis)
/// - Locked: 44.43 + .284 * l µs (min square analysis)
/// - Using 50 µs fixed. Assuming less than 50 locks on any user, else we may want factor in number of locks.
/// # </weight>
#[weight = 50_000_000 + T::DbWeight::get().reads_writes(2, 2)]
#[weight = T::WeightInfo::vest_locked(MaxLocksOf::<T>::get())
.max(T::WeightInfo::vest_unlocked(MaxLocksOf::<T>::get()))
]
fn vest(origin) -> DispatchResult {
let who = ensure_signed(origin)?;
Self::update_lock(who)
@@ -238,12 +231,10 @@ decl_module! {
/// - DbWeight: 3 Reads, 3 Writes
/// - Reads: Vesting Storage, Balances Locks, Target Account
/// - Writes: Vesting Storage, Balances Locks, Target Account
/// - Benchmark:
/// - Unlocked: 44.3 + .294 * l µs (min square analysis)
/// - Locked: 48.16 + .103 * l µs (min square analysis)
/// - Using 50 µs fixed. Assuming less than 50 locks on any user, else we may want factor in number of locks.
/// # </weight>
#[weight = 50_000_000 + T::DbWeight::get().reads_writes(3, 3)]
#[weight = T::WeightInfo::vest_other_locked(MaxLocksOf::<T>::get())
.max(T::WeightInfo::vest_other_unlocked(MaxLocksOf::<T>::get()))
]
fn vest_other(origin, target: <T::Lookup as StaticLookup>::Source) -> DispatchResult {
ensure_signed(origin)?;
Self::update_lock(T::Lookup::lookup(target)?)
@@ -264,10 +255,8 @@ decl_module! {
/// - DbWeight: 3 Reads, 3 Writes
/// - Reads: Vesting Storage, Balances Locks, Target Account, [Sender Account]
/// - Writes: Vesting Storage, Balances Locks, Target Account, [Sender Account]
/// - Benchmark: 100.3 + .365 * l µs (min square analysis)
/// - Using 100 µs fixed. Assuming less than 50 locks on any user, else we may want factor in number of locks.
/// # </weight>
#[weight = 100_000_000 + T::DbWeight::get().reads_writes(3, 3)]
#[weight = T::WeightInfo::vested_transfer(MaxLocksOf::<T>::get())]
pub fn vested_transfer(
origin,
target: <T::Lookup as StaticLookup>::Source,
@@ -303,10 +292,8 @@ decl_module! {
/// - DbWeight: 4 Reads, 4 Writes
/// - Reads: Vesting Storage, Balances Locks, Target Account, Source Account
/// - Writes: Vesting Storage, Balances Locks, Target Account, Source Account
/// - Benchmark: 100.3 + .365 * l µs (min square analysis)
/// - Using 100 µs fixed. Assuming less than 50 locks on any user, else we may want factor in number of locks.
/// # </weight>
#[weight = 100_000_000 + T::DbWeight::get().reads_writes(4, 4)]
#[weight = T::WeightInfo::force_vested_transfer(MaxLocksOf::<T>::get())]
pub fn force_vested_transfer(
origin,
source: <T::Lookup as StaticLookup>::Source,
@@ -463,12 +450,16 @@ mod tests {
type OnKilledAccount = ();
type SystemWeightInfo = ();
}
parameter_types! {
pub const MaxLocks: u32 = 10;
}
impl pallet_balances::Trait for Test {
type Balance = u64;
type DustRemoval = ();
type Event = ();
type ExistentialDeposit = ExistentialDeposit;
type AccountStore = System;
type MaxLocks = MaxLocks;
type WeightInfo = ();
}
parameter_types! {