mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-05-30 10:31:03 +00:00
Upstream Statemine v4 Changes (#649)
* bump runtime spec version * remove applied runtime migrations * bump transaction_version necessary because of extrinsic API changes to pallet-xcm https://github.com/paritytech/polkadot/pull/3693 * Fix Benchmarks for Statemine-V4 release (#639) * register validators * register_as_candidate & leave_intent fixed * new_session benchmark fixed * intent_leave_modified * clean up * clean up * benchmark script updated * update cargo.lock * done Co-authored-by: Alexander Popiak <alexander.popiak@parity.io> * Version bump (#648) * Version bump fix #646 * Revert "Version bump" This reverts commit 07517e0e76a37a1dd67176fec0524d0211666635. * Bump polkadot-collator version * Update polkadot-parachains/Cargo.toml Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * Update deps * Bump version to 4.0.0 Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * cargo toml fix * update deps and remove DisabledValidatorThreshold * cargo +nightly fmt * fix compile error * fix client tests after Polkadot update Co-authored-by: Ignacio Palacios <ignacio.palacios.santos@gmail.com> Co-authored-by: Chevdor <chevdor@users.noreply.github.com> Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
This commit is contained in:
@@ -22,11 +22,12 @@ use crate::Pallet as CollatorSelection;
|
||||
use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite, whitelisted_caller};
|
||||
use frame_support::{
|
||||
assert_ok,
|
||||
codec::Decode,
|
||||
traits::{Currency, EnsureOrigin, Get},
|
||||
};
|
||||
use frame_system::{EventRecord, RawOrigin};
|
||||
use pallet_authorship::EventHandler;
|
||||
use pallet_session::SessionManager;
|
||||
use pallet_session::{self as session, SessionManager};
|
||||
use sp_std::prelude::*;
|
||||
|
||||
pub type BalanceOf<T> =
|
||||
@@ -51,9 +52,50 @@ fn assert_last_event<T: Config>(generic_event: <T as Config>::Event) {
|
||||
assert_eq!(event, &system_event);
|
||||
}
|
||||
|
||||
fn create_funded_user<T: Config>(
|
||||
string: &'static str,
|
||||
n: u32,
|
||||
balance_factor: u32,
|
||||
) -> T::AccountId {
|
||||
let user = account(string, n, SEED);
|
||||
let balance = T::Currency::minimum_balance() * balance_factor.into();
|
||||
let _ = T::Currency::make_free_balance_be(&user, balance);
|
||||
user
|
||||
}
|
||||
|
||||
fn keys<T: Config + session::Config>(c: u32) -> <T as session::Config>::Keys {
|
||||
use rand::{RngCore, SeedableRng};
|
||||
|
||||
let keys = {
|
||||
let mut keys = [0u8; 128];
|
||||
|
||||
if c > 0 {
|
||||
let mut rng = rand::rngs::StdRng::seed_from_u64(c as u64);
|
||||
rng.fill_bytes(&mut keys);
|
||||
}
|
||||
|
||||
keys
|
||||
};
|
||||
|
||||
Decode::decode(&mut &keys[..]).unwrap()
|
||||
}
|
||||
|
||||
fn validator<T: Config + session::Config>(c: u32) -> (T::AccountId, <T as session::Config>::Keys) {
|
||||
(create_funded_user::<T>("candidate", c, 1000), keys::<T>(c))
|
||||
}
|
||||
|
||||
fn register_validators<T: Config + session::Config>(count: u32) {
|
||||
let validators = (0..count).map(|c| validator::<T>(c)).collect::<Vec<_>>();
|
||||
|
||||
for (who, keys) in validators {
|
||||
<session::Module<T>>::set_keys(RawOrigin::Signed(who).into(), keys, vec![]).unwrap();
|
||||
}
|
||||
}
|
||||
|
||||
fn register_candidates<T: Config>(count: u32) {
|
||||
let candidates = (0..count).map(|c| account("candidate", c, SEED)).collect::<Vec<_>>();
|
||||
assert!(<CandidacyBond<T>>::get() > 0u32.into(), "Bond cannot be zero!");
|
||||
|
||||
for who in candidates {
|
||||
T::Currency::make_free_balance_be(&who, <CandidacyBond<T>>::get() * 2u32.into());
|
||||
<CollatorSelection<T>>::register_as_candidate(RawOrigin::Signed(who).into()).unwrap();
|
||||
@@ -61,7 +103,7 @@ fn register_candidates<T: Config>(count: u32) {
|
||||
}
|
||||
|
||||
benchmarks! {
|
||||
where_clause { where T: pallet_authorship::Config }
|
||||
where_clause { where T: pallet_authorship::Config + session::Config }
|
||||
|
||||
set_invulnerables {
|
||||
let b in 1 .. T::MaxInvulnerables::get();
|
||||
@@ -107,12 +149,20 @@ benchmarks! {
|
||||
|
||||
<CandidacyBond<T>>::put(T::Currency::minimum_balance());
|
||||
<DesiredCandidates<T>>::put(c + 1);
|
||||
|
||||
register_validators::<T>(c);
|
||||
register_candidates::<T>(c);
|
||||
|
||||
let caller: T::AccountId = whitelisted_caller();
|
||||
let bond: BalanceOf<T> = T::Currency::minimum_balance() * 2u32.into();
|
||||
T::Currency::make_free_balance_be(&caller, bond.clone());
|
||||
|
||||
<session::Module<T>>::set_keys(
|
||||
RawOrigin::Signed(caller.clone()).into(),
|
||||
keys::<T>(c + 1),
|
||||
vec![]
|
||||
).unwrap();
|
||||
|
||||
}: _(RawOrigin::Signed(caller.clone()))
|
||||
verify {
|
||||
assert_last_event::<T>(Event::CandidateAdded(caller, bond / 2u32.into()).into());
|
||||
@@ -120,9 +170,11 @@ benchmarks! {
|
||||
|
||||
// worse case is the last candidate leaving.
|
||||
leave_intent {
|
||||
let c in 1 .. T::MaxCandidates::get();
|
||||
let c in (T::MinCandidates::get() + 1) .. T::MaxCandidates::get();
|
||||
<CandidacyBond<T>>::put(T::Currency::minimum_balance());
|
||||
<DesiredCandidates<T>>::put(c);
|
||||
|
||||
register_validators::<T>(c);
|
||||
register_candidates::<T>(c);
|
||||
|
||||
let leaving = <Candidates<T>>::get().last().unwrap().who.clone();
|
||||
@@ -160,6 +212,8 @@ benchmarks! {
|
||||
<CandidacyBond<T>>::put(T::Currency::minimum_balance());
|
||||
<DesiredCandidates<T>>::put(c);
|
||||
frame_system::Pallet::<T>::set_block_number(0u32.into());
|
||||
|
||||
register_validators::<T>(c);
|
||||
register_candidates::<T>(c);
|
||||
|
||||
let new_block: T::BlockNumber = 1800u32.into();
|
||||
@@ -171,19 +225,32 @@ benchmarks! {
|
||||
for i in 0..c {
|
||||
<LastAuthoredBlock<T>>::insert(candidates[i as usize].who.clone(), zero_block);
|
||||
}
|
||||
for i in 0..non_removals {
|
||||
<LastAuthoredBlock<T>>::insert(candidates[i as usize].who.clone(), new_block);
|
||||
|
||||
if non_removals > 0 {
|
||||
for i in 0..non_removals {
|
||||
<LastAuthoredBlock<T>>::insert(candidates[i as usize].who.clone(), new_block);
|
||||
}
|
||||
} else {
|
||||
for i in 0..c {
|
||||
<LastAuthoredBlock<T>>::insert(candidates[i as usize].who.clone(), new_block);
|
||||
}
|
||||
}
|
||||
|
||||
let pre_length = <Candidates<T>>::get().len();
|
||||
|
||||
frame_system::Pallet::<T>::set_block_number(new_block);
|
||||
|
||||
assert!(<Candidates<T>>::get().len() == c as usize);
|
||||
|
||||
}: {
|
||||
<CollatorSelection<T> as SessionManager<_>>::new_session(0)
|
||||
} verify {
|
||||
assert!(<Candidates<T>>::get().len() < pre_length);
|
||||
if c > r && non_removals >= T::MinCandidates::get() {
|
||||
assert!(<Candidates<T>>::get().len() < pre_length);
|
||||
} else if c > r && non_removals < T::MinCandidates::get() {
|
||||
assert!(<Candidates<T>>::get().len() == T::MinCandidates::get() as usize);
|
||||
} else {
|
||||
assert!(<Candidates<T>>::get().len() == pre_length);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user