mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-06-18 08:21:03 +00:00
Decouple Staking and Election - Part 2.1: Unleash Multi Phase (#8113)
* Base features and traits. * pallet and unsigned phase * Undo bad formattings. * some formatting cleanup. * Small self-cleanup. * Make it all build * self-review * Some doc tests. * Some changes from other PR * Fix session test * Update Cargo.lock * Update frame/election-provider-multi-phase/src/lib.rs Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com> * Some review comments * Rename + make encode/decode * Do an assert as well, just in case. * Fix build * Update frame/election-provider-multi-phase/src/unsigned.rs Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com> * Las comment * fix staking fuzzer. * cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_election_provider_multi_phase --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/election-provider-multi-phase/src/weights.rs --template=./.maintain/frame-weight-template.hbs * Add one last layer of feasibility check as well. * Last fixes to benchmarks * Some more docs. * cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_election_provider_multi_phase --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/election-provider-multi-phase/src/weights.rs --template=./.maintain/frame-weight-template.hbs * cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_election_provider_multi_phase --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/election-provider-multi-phase/src/weights.rs --template=./.maintain/frame-weight-template.hbs * Some nits * It all works * Some self cleanup * Update frame/staking/src/lib.rs Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com> * remove most todos. * Round of self-review. * Fix migration * clean macro * Revert wrong merge * remove fuzzer stuff. * Self review * Update frame/staking/src/lib.rs Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com> * review comments * add logs * Add tests to demonstrate the capacity of the snapshot. * Replace upgrade * Last touches * Fix benchmakrs * cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_staking --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/staking/src/weights.rs --template=./.maintain/frame-weight-template.hbs * cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_election_provider_multi_phase --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/election-provider-multi-phase/src/weights.rs --template=./.maintain/frame-weight-template.hbs * remove unused stuff * Fix tests. Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com> Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com> Co-authored-by: Parity Benchmarking Bot <admin@parity.io> Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
This commit is contained in:
Kian Paimani
@@ -21,7 +21,6 @@ use super::*;
|
||||
use crate::Module as Staking;
|
||||
use testing_utils::*;
|
||||
|
||||
use sp_npos_elections::CompactSolution;
|
||||
use sp_runtime::traits::One;
|
||||
use frame_system::RawOrigin;
|
||||
pub use frame_benchmarking::{
|
||||
@@ -94,8 +93,8 @@ pub fn create_validator_with_nominators<T: Config>(
|
||||
// Start a new Era
|
||||
let new_validators = Staking::<T>::new_era(SessionIndex::one()).unwrap();
|
||||
|
||||
assert!(new_validators.len() == 1);
|
||||
assert!(new_validators[0] == v_stash, "Our validator was not selected!");
|
||||
assert_eq!(new_validators.len(), 1);
|
||||
assert_eq!(new_validators[0], v_stash, "Our validator was not selected!");
|
||||
|
||||
// Give Era Points
|
||||
let reward = EraRewardPoints::<T::AccountId> {
|
||||
@@ -541,231 +540,6 @@ benchmarks! {
|
||||
assert!(balance_before > balance_after);
|
||||
}
|
||||
|
||||
// This benchmark create `v` validators intent, `n` nominators intent, in total creating `e`
|
||||
// edges.
|
||||
#[extra]
|
||||
submit_solution_initial {
|
||||
// number of validator intention. This will be equal to `ElectionSize::validators`.
|
||||
let v in 200 .. 400;
|
||||
// number of nominator intention. This will be equal to `ElectionSize::nominators`.
|
||||
let n in 500 .. 1000;
|
||||
// number of assignments. Basically, number of active nominators. This will be equal to
|
||||
// `compact.len()`.
|
||||
let a in 200 .. 400;
|
||||
// number of winners, also ValidatorCount. This will be equal to `winner.len()`.
|
||||
let w in 16 .. 100;
|
||||
|
||||
ensure!(w as usize >= MAX_NOMINATIONS, "doesn't support lower value");
|
||||
|
||||
let winners = create_validators_with_nominators_for_era::<T>(
|
||||
v,
|
||||
n,
|
||||
MAX_NOMINATIONS,
|
||||
false,
|
||||
Some(w),
|
||||
)?;
|
||||
|
||||
// needed for the solution to be generates.
|
||||
assert!(<Staking<T>>::create_stakers_snapshot().0);
|
||||
|
||||
// set number of winners
|
||||
ValidatorCount::put(w);
|
||||
|
||||
// create a assignments in total for the w winners.
|
||||
let (winners, assignments) = create_assignments_for_offchain::<T>(a, winners)?;
|
||||
|
||||
let (
|
||||
winners,
|
||||
compact,
|
||||
score,
|
||||
size
|
||||
) = offchain_election::prepare_submission::<T>(
|
||||
assignments,
|
||||
winners,
|
||||
false,
|
||||
T::BlockWeights::get().max_block,
|
||||
).unwrap();
|
||||
|
||||
assert_eq!(
|
||||
winners.len(), compact.unique_targets().len(),
|
||||
"unique targets ({}) and winners ({}) count not same. This solution is not valid.",
|
||||
compact.unique_targets().len(),
|
||||
winners.len(),
|
||||
);
|
||||
|
||||
// needed for the solution to be accepted
|
||||
<EraElectionStatus<T>>::put(ElectionStatus::Open(T::BlockNumber::from(1u32)));
|
||||
|
||||
let era = <Staking<T>>::current_era().unwrap_or(0);
|
||||
let caller: T::AccountId = account("caller", n, SEED);
|
||||
whitelist_account!(caller);
|
||||
}: {
|
||||
let result = <Staking<T>>::submit_election_solution(
|
||||
RawOrigin::Signed(caller.clone()).into(),
|
||||
winners,
|
||||
compact,
|
||||
score.clone(),
|
||||
era,
|
||||
size,
|
||||
);
|
||||
assert!(result.is_ok());
|
||||
}
|
||||
verify {
|
||||
// new solution has been accepted.
|
||||
assert_eq!(<Staking<T>>::queued_score().unwrap(), score);
|
||||
}
|
||||
|
||||
// same as submit_solution_initial but we place a very weak solution on chian first.
|
||||
submit_solution_better {
|
||||
// number of validator intention.
|
||||
let v in 200 .. 400;
|
||||
// number of nominator intention.
|
||||
let n in 500 .. 1000;
|
||||
// number of assignments. Basically, number of active nominators.
|
||||
let a in 200 .. 400;
|
||||
// number of winners, also ValidatorCount.
|
||||
let w in 16 .. 100;
|
||||
|
||||
ensure!(w as usize >= MAX_NOMINATIONS, "doesn't support lower value");
|
||||
|
||||
let winners = create_validators_with_nominators_for_era::<T>(
|
||||
v,
|
||||
n,
|
||||
MAX_NOMINATIONS,
|
||||
false,
|
||||
Some(w),
|
||||
)?;
|
||||
|
||||
// needed for the solution to be generates.
|
||||
assert!(<Staking<T>>::create_stakers_snapshot().0);
|
||||
|
||||
// set number of winners
|
||||
ValidatorCount::put(w);
|
||||
|
||||
// create a assignments in total for the w winners.
|
||||
let (winners, assignments) = create_assignments_for_offchain::<T>(a, winners)?;
|
||||
|
||||
let single_winner = winners[0].0.clone();
|
||||
|
||||
let (
|
||||
winners,
|
||||
compact,
|
||||
score,
|
||||
size
|
||||
) = offchain_election::prepare_submission::<T>(
|
||||
assignments,
|
||||
winners,
|
||||
false,
|
||||
T::BlockWeights::get().max_block,
|
||||
).unwrap();
|
||||
|
||||
assert_eq!(
|
||||
winners.len(), compact.unique_targets().len(),
|
||||
"unique targets ({}) and winners ({}) count not same. This solution is not valid.",
|
||||
compact.unique_targets().len(),
|
||||
winners.len(),
|
||||
);
|
||||
|
||||
// needed for the solution to be accepted
|
||||
<EraElectionStatus<T>>::put(ElectionStatus::Open(T::BlockNumber::from(1u32)));
|
||||
|
||||
let era = <Staking<T>>::current_era().unwrap_or(0);
|
||||
let caller: T::AccountId = account("caller", n, SEED);
|
||||
whitelist_account!(caller);
|
||||
|
||||
// submit a very bad solution on-chain
|
||||
{
|
||||
// this is needed to fool the chain to accept this solution.
|
||||
ValidatorCount::put(1);
|
||||
let (winners, compact, score, size) = get_single_winner_solution::<T>(single_winner)?;
|
||||
assert!(
|
||||
<Staking<T>>::submit_election_solution(
|
||||
RawOrigin::Signed(caller.clone()).into(),
|
||||
winners,
|
||||
compact,
|
||||
score.clone(),
|
||||
era,
|
||||
size,
|
||||
).is_ok());
|
||||
|
||||
// new solution has been accepted.
|
||||
assert_eq!(<Staking<T>>::queued_score().unwrap(), score);
|
||||
ValidatorCount::put(w);
|
||||
}
|
||||
}: {
|
||||
let result = <Staking<T>>::submit_election_solution(
|
||||
RawOrigin::Signed(caller.clone()).into(),
|
||||
winners,
|
||||
compact,
|
||||
score.clone(),
|
||||
era,
|
||||
size,
|
||||
);
|
||||
assert!(result.is_ok());
|
||||
}
|
||||
verify {
|
||||
// new solution has been accepted.
|
||||
assert_eq!(<Staking<T>>::queued_score().unwrap(), score);
|
||||
}
|
||||
|
||||
// This will be early rejected based on the score.
|
||||
#[extra]
|
||||
submit_solution_weaker {
|
||||
// number of validator intention.
|
||||
let v in 200 .. 400;
|
||||
// number of nominator intention.
|
||||
let n in 500 .. 1000;
|
||||
|
||||
create_validators_with_nominators_for_era::<T>(v, n, MAX_NOMINATIONS, false, None)?;
|
||||
|
||||
// needed for the solution to be generates.
|
||||
assert!(<Staking<T>>::create_stakers_snapshot().0);
|
||||
|
||||
// needed for the solution to be accepted
|
||||
<EraElectionStatus<T>>::put(ElectionStatus::Open(T::BlockNumber::from(1u32)));
|
||||
let era = <Staking<T>>::current_era().unwrap_or(0);
|
||||
let caller: T::AccountId = account("caller", n, SEED);
|
||||
whitelist_account!(caller);
|
||||
|
||||
// submit a seq-phragmen with all the good stuff on chain.
|
||||
{
|
||||
let (winners, compact, score, size) = get_seq_phragmen_solution::<T>(true);
|
||||
assert_eq!(
|
||||
winners.len(), compact.unique_targets().len(),
|
||||
"unique targets ({}) and winners ({}) count not same. This solution is not valid.",
|
||||
compact.unique_targets().len(),
|
||||
winners.len(),
|
||||
);
|
||||
assert!(
|
||||
<Staking<T>>::submit_election_solution(
|
||||
RawOrigin::Signed(caller.clone()).into(),
|
||||
winners,
|
||||
compact,
|
||||
score.clone(),
|
||||
era,
|
||||
size,
|
||||
).is_ok()
|
||||
);
|
||||
|
||||
// new solution has been accepted.
|
||||
assert_eq!(<Staking<T>>::queued_score().unwrap(), score);
|
||||
}
|
||||
|
||||
// prepare a bad solution. This will be very early rejected.
|
||||
let (winners, compact, score, size) = get_weak_solution::<T>(true);
|
||||
}: {
|
||||
assert!(
|
||||
<Staking<T>>::submit_election_solution(
|
||||
RawOrigin::Signed(caller.clone()).into(),
|
||||
winners,
|
||||
compact,
|
||||
score.clone(),
|
||||
era,
|
||||
size,
|
||||
).is_err()
|
||||
);
|
||||
}
|
||||
|
||||
get_npos_voters {
|
||||
// number of validator intention.
|
||||
let v in 200 .. 400;
|
||||
@@ -896,15 +670,6 @@ mod tests {
|
||||
assert_ok!(closure_to_benchmark());
|
||||
});
|
||||
}
|
||||
|
||||
#[test]
|
||||
#[ignore]
|
||||
fn test_benchmarks_offchain() {
|
||||
ExtBuilder::default().has_stakers(false).build().execute_with(|| {
|
||||
assert_ok!(test_benchmark_submit_solution_better::<Test>());
|
||||
assert_ok!(test_benchmark_submit_solution_weaker::<Test>());
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
impl_benchmark_test_suite!(
|
||||
|
||||
Reference in New Issue
Block a user