Adding benchmarking for new pallet pallet_election_provider_support_onchain

Cargo.toml

@@ -88,6 +88,7 @@ members = [
 	"frame/election-provider-support",
 	"frame/election-provider-support/solution-type",
 	"frame/election-provider-support/solution-type/fuzzer",
+	"frame/election-provider-support/onchain",
 	"frame/examples/basic",
 	"frame/examples/offchain-worker",
 	"frame/examples/parallel",

bin/node/runtime/Cargo.toml

@@ -65,6 +65,7 @@ pallet-contracts-rpc-runtime-api = { version = "4.0.0-dev", default-features = f
 pallet-conviction-voting = { version = "4.0.0-dev", default-features = false, path = "../../../frame/conviction-voting" }
 pallet-democracy = { version = "4.0.0-dev", default-features = false, path = "../../../frame/democracy" }
 pallet-election-provider-multi-phase = { version = "4.0.0-dev", default-features = false, path = "../../../frame/election-provider-multi-phase" }
+pallet-election-provider-support-onchain = { version = "4.0.0-dev", default-features = false, path = "../../../frame/election-provider-support/onchain" }
 pallet-elections-phragmen = { version = "5.0.0-dev", default-features = false, path = "../../../frame/elections-phragmen" }
 pallet-gilt = { version = "4.0.0-dev", default-features = false, path = "../../../frame/gilt" }
 pallet-grandpa = { version = "4.0.0-dev", default-features = false, path = "../../../frame/grandpa" }
@@ -161,6 +162,7 @@ std = [
 	"frame-system-rpc-runtime-api/std",
 	"frame-system/std",
 	"pallet-election-provider-multi-phase/std",
+	"pallet-election-provider-support-onchain/std",
 	"pallet-timestamp/std",
 	"pallet-tips/std",
 	"pallet-transaction-payment-rpc-runtime-api/std",
@@ -195,6 +197,7 @@ runtime-benchmarks = [
 	"pallet-contracts/runtime-benchmarks",
 	"pallet-conviction-voting/runtime-benchmarks",
 	"pallet-democracy/runtime-benchmarks",
+	"pallet-election-provider-support-onchain/runtime-benchmarks",
 	"pallet-election-provider-multi-phase/runtime-benchmarks",
 	"pallet-elections-phragmen/runtime-benchmarks",
 	"pallet-gilt/runtime-benchmarks",

bin/node/runtime/src/lib.rs

@@ -23,7 +23,7 @@
 #![recursion_limit = "256"]
 
 use codec::{Decode, Encode, MaxEncodedLen};
-use frame_election_provider_support::{onchain, ExtendedBalance, SequentialPhragmen, VoteWeight};
+use frame_election_provider_support::{ExtendedBalance, SequentialPhragmen, VoteWeight};
 use frame_support::{
 	construct_runtime,
 	pallet_prelude::Get,
@@ -47,6 +47,7 @@ pub use node_primitives::{AccountId, Signature};
 use node_primitives::{AccountIndex, Balance, BlockNumber, Hash, Index, Moment};
 use pallet_contracts::weights::WeightInfo;
 use pallet_election_provider_multi_phase::SolutionAccuracyOf;
+use pallet_election_provider_support_onchain::BoundedExecution;
 use pallet_grandpa::{
 	fg_primitives, AuthorityId as GrandpaId, AuthorityList as GrandpaAuthorityList,
 };
@@ -557,7 +558,8 @@ impl pallet_staking::Config for Runtime {
 	type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
 	type OffendingValidatorsThreshold = OffendingValidatorsThreshold;
 	type ElectionProvider = ElectionProviderMultiPhase;
-	type GenesisElectionProvider = onchain::UnboundedExecution<OnChainSeqPhragmen>;
+	type GenesisElectionProvider =
+		BoundedExecution<Self, SequentialPhragmen<AccountId, SolutionAccuracyOf<Runtime>>>;
 	type VoterList = BagsList;
 	type MaxUnlockingChunks = ConstU32<32>;
 	type WeightInfo = pallet_staking::weights::SubstrateWeight<Runtime>;
@@ -618,6 +620,14 @@ impl pallet_election_provider_multi_phase::BenchmarkingConfig for ElectionProvid
 	const MAXIMUM_TARGETS: u32 = 300;
 }
 
+impl pallet_election_provider_support_onchain::BenchmarkingConfig
+	for ElectionProviderBenchmarkConfig
+{
+	const VOTERS: [u32; 2] = [1000, 2000];
+	const TARGETS: [u32; 2] = [500, 1000];
+	const VOTES_PER_VOTER: [u32; 2] = [5, 16];
+}
+
 /// Maximum number of iterations for balancing that will be executed in the embedded OCW
 /// miner of election provider multi phase.
 pub const MINER_MAX_ITERATIONS: u32 = 10;
@@ -642,19 +652,12 @@ impl Get<Option<(usize, ExtendedBalance)>> for OffchainRandomBalancing {
 	}
 }
 
-pub struct OnChainSeqPhragmen;
-impl onchain::ExecutionConfig for OnChainSeqPhragmen {
-	type System = Runtime;
-	type Solver = SequentialPhragmen<
-		AccountId,
-		pallet_election_provider_multi_phase::SolutionAccuracyOf<Runtime>,
-	>;
+impl pallet_election_provider_support_onchain::Config for Runtime {
 	type DataProvider = <Runtime as pallet_election_provider_multi_phase::Config>::DataProvider;
-}
-
-impl onchain::BoundedExecutionConfig for OnChainSeqPhragmen {
-	type VotersBound = ConstU32<20_000>;
-	type TargetsBound = ConstU32<2_000>;
+	type MaxVoters = MaxElectingVoters;
+	type MaxTargets = ConstU32<1_000>;
+	type BenchmarkingConfig = ElectionProviderBenchmarkConfig;
+	type WeightInfo = pallet_election_provider_support_onchain::weights::SubstrateWeight<Self>;
 }
 
 impl pallet_election_provider_multi_phase::Config for Runtime {
@@ -678,8 +681,10 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
 	type RewardHandler = (); // nothing to do upon rewards
 	type DataProvider = Staking;
 	type Solution = NposSolution16;
-	type Fallback = onchain::BoundedExecution<OnChainSeqPhragmen>;
-	type GovernanceFallback = onchain::BoundedExecution<OnChainSeqPhragmen>;
+	type Fallback =
+		BoundedExecution<Self, SequentialPhragmen<AccountId, SolutionAccuracyOf<Runtime>>>;
+	type GovernanceFallback =
+		BoundedExecution<Self, SequentialPhragmen<AccountId, SolutionAccuracyOf<Runtime>>>;
 	type Solver = SequentialPhragmen<AccountId, SolutionAccuracyOf<Self>, OffchainRandomBalancing>;
 	type ForceOrigin = EnsureRootOrHalfCouncil;
 	type MaxElectableTargets = ConstU16<{ u16::MAX }>;
@@ -1420,6 +1425,7 @@ construct_runtime!(
 		TransactionPayment: pallet_transaction_payment,
 		AssetTxPayment: pallet_asset_tx_payment,
 		ElectionProviderMultiPhase: pallet_election_provider_multi_phase,
+		ElectionProviderSupportOnchain: pallet_election_provider_support_onchain,
 		Staking: pallet_staking,
 		Session: pallet_session,
 		Democracy: pallet_democracy,
@@ -1531,6 +1537,7 @@ mod benches {
 		[pallet_contracts, Contracts]
 		[pallet_democracy, Democracy]
 		[pallet_election_provider_multi_phase, ElectionProviderMultiPhase]
+		[pallet_election_provider_support_onchain, ElectionProviderSupportOnchain]
 		[pallet_elections_phragmen, Elections]
 		[pallet_gilt, Gilt]
 		[pallet_grandpa, Grandpa]

frame/babe/Cargo.toml

@@ -37,7 +37,7 @@ pallet-offences = { version = "4.0.0-dev", path = "../offences" }
 pallet-staking = { version = "4.0.0-dev", path = "../staking" }
 pallet-staking-reward-curve = { version = "4.0.0-dev", path = "../staking/reward-curve" }
 sp-core = { version = "6.0.0", path = "../../primitives/core" }
-frame-election-provider-support = { version = "4.0.0-dev", path = "../election-provider-support" }
+pallet-election-provider-support-onchain = { version = "4.0.0-dev", path = "../election-provider-support/onchain" }
 
 [features]
 default = ["std"]

frame/babe/src/mock.rs

@@ -19,11 +19,11 @@
 
 use crate::{self as pallet_babe, Config, CurrentSlot};
 use codec::Encode;
-use frame_election_provider_support::{onchain, SequentialPhragmen};
 use frame_support::{
 	parameter_types,
 	traits::{ConstU128, ConstU32, ConstU64, GenesisBuild, KeyOwnerProofSystem, OnInitialize},
 };
+use pallet_election_provider_support_onchain::OnChainPhragmen;
 use pallet_session::historical as pallet_session_historical;
 use sp_consensus_babe::{AuthorityId, AuthorityPair, Slot};
 use sp_consensus_vrf::schnorrkel::{VRFOutput, VRFProof};
@@ -172,11 +172,12 @@ parameter_types! {
 	pub const OffendingValidatorsThreshold: Perbill = Perbill::from_percent(16);
 }
 
-pub struct OnChainSeqPhragmen;
-impl onchain::ExecutionConfig for OnChainSeqPhragmen {
-	type System = Test;
-	type Solver = SequentialPhragmen<DummyValidatorId, Perbill>;
+impl pallet_election_provider_support_onchain::Config for Test {
 	type DataProvider = Staking;
+	type MaxVoters = ConstU32<600>;
+	type MaxTargets = ConstU32<400>;
+	type BenchmarkingConfig = ();
+	type WeightInfo = ();
 }
 
 impl pallet_staking::Config for Test {
@@ -197,7 +198,7 @@ impl pallet_staking::Config for Test {
 	type MaxNominatorRewardedPerValidator = ConstU32<64>;
 	type OffendingValidatorsThreshold = OffendingValidatorsThreshold;
 	type NextNewSession = Session;
-	type ElectionProvider = onchain::UnboundedExecution<OnChainSeqPhragmen>;
+	type ElectionProvider = OnChainPhragmen<Self, sp_runtime::Perbill>;
 	type GenesisElectionProvider = Self::ElectionProvider;
 	type VoterList = pallet_staking::UseNominatorsAndValidatorsMap<Self>;
 	type MaxUnlockingChunks = ConstU32<32>;

frame/election-provider-multi-phase/Cargo.toml

@@ -38,6 +38,7 @@ rand = { version = "0.7.3", default-features = false, optional = true, features
 	"small_rng",
 ] }
 strum = { optional = true, default-features = false, version = "0.23.0", features = ["derive"] }
+pallet-election-provider-support-onchain = { version = "4.0.0-dev", optional = true, default-features = false, path = "../election-provider-support/onchain" }
 
 [dev-dependencies]
 parking_lot = "0.12.0"
@@ -70,12 +71,14 @@ std = [
 	"log/std",
 
 	"frame-benchmarking/std",
+	"pallet-election-provider-support-onchain/std",
 	"rand/std",
 	"strum/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-election-provider-support/runtime-benchmarks",
+	"pallet-election-provider-support-onchain/runtime-benchmarks",
 	"rand",
 	"strum",
 ]

frame/election-provider-multi-phase/src/benchmarking.rs

@@ -26,11 +26,19 @@ use frame_support::{
 	BoundedVec,
 };
 use frame_system::RawOrigin;
+use pallet_election_provider_support_onchain::SEED;
 use rand::{prelude::SliceRandom, rngs::SmallRng, SeedableRng};
 use sp_arithmetic::{per_things::Percent, traits::One};
 use sp_runtime::InnerOf;
 
-const SEED: u32 = 999;
+fn set_up_data_provider<T: Config>(voters_len: u32, targets_len: u32) {
+	pallet_election_provider_support_onchain::set_up_data_provider::<T, T::DataProvider>(
+		voters_len,
+		targets_len,
+		<T::DataProvider as ElectionDataProvider>::MaxVotesPerVoter::get(),
+		T::Currency::minimum_balance().saturated_into::<u64>() * 1000,
+	);
+}
 
 /// Creates a **valid** solution with exactly the given size.
 ///
@@ -154,38 +162,6 @@ fn solution_with_size<T: Config>(
 	Ok(RawSolution { solution, score, round })
 }
 
-fn set_up_data_provider<T: Config>(v: u32, t: u32) {
-	T::DataProvider::clear();
-	log!(
-		info,
-		"setting up with voters = {} [degree = {}], targets = {}",
-		v,
-		<T::DataProvider as ElectionDataProvider>::MaxVotesPerVoter::get(),
-		t
-	);
-
-	// fill targets.
-	let mut targets = (0..t)
-		.map(|i| {
-			let target = frame_benchmarking::account::<T::AccountId>("Target", i, SEED);
-			T::DataProvider::add_target(target.clone());
-			target
-		})
-		.collect::<Vec<_>>();
-	// we should always have enough voters to fill.
-	assert!(
-		targets.len() > <T::DataProvider as ElectionDataProvider>::MaxVotesPerVoter::get() as usize
-	);
-	targets.truncate(<T::DataProvider as ElectionDataProvider>::MaxVotesPerVoter::get() as usize);
-
-	// fill voters.
-	(0..v).for_each(|i| {
-		let voter = frame_benchmarking::account::<T::AccountId>("Voter", i, SEED);
-		let weight = T::Currency::minimum_balance().saturated_into::<u64>() * 1000;
-		T::DataProvider::add_voter(voter, weight, targets.clone().try_into().unwrap());
-	});
-}
-
 frame_benchmarking::benchmarks! {
 	on_initialize_nothing {
 		assert!(<MultiPhase<T>>::current_phase().is_off());