Fix elections-phragmen and proxy issue

bin/node/runtime/src/lib.rs

@@ -559,6 +559,8 @@ impl pallet_collective::Trait<CouncilCollective> for Runtime {
 
 parameter_types! {
 	pub const CandidacyBond: Balance = 10 * DOLLARS;
+	pub const VotingBondBase: Balance = 1 * DOLLARS;
+	pub const VotingBondFactor: Balance = 50 * CENTS;    // per 32 bytes on-chain
 	pub const VotingBond: Balance = 1 * DOLLARS;
 	pub const TermDuration: BlockNumber = 7 * DAYS;
 	pub const DesiredMembers: u32 = 13;
@@ -579,7 +581,8 @@ impl pallet_elections_phragmen::Trait for Runtime {
 	type InitializeMembers = Council;
 	type CurrencyToVote = U128CurrencyToVote;
 	type CandidacyBond = CandidacyBond;
-	type VotingBond = VotingBond;
+	type VotingBondBase = VotingBondBase;
+	type VotingBondFactor = VotingBondFactor;
 	type LoserCandidate = ();
 	type BadReport = ();
 	type KickedMember = ();

frame/elections-phragmen/src/benchmarking.rs

@@ -70,7 +70,7 @@ fn candidate_count<T: Trait>() -> u32 {
 
 /// Get the number of votes of a voter.
 fn vote_count_of<T: Trait>(who: &T::AccountId) -> u32 {
-	<Voting<T>>::get(who).1.len() as u32
+	<Voting<T>>::get(who).votes.len() as u32
 }
 
 /// A `DefunctVoter` struct with correct value
@@ -103,15 +103,15 @@ fn submit_candidates_with_self_vote<T: Trait>(c: u32, prefix: &'static str)
 	let candidates = submit_candidates::<T>(c, prefix)?;
 	let stake = default_stake::<T>(BALANCE_FACTOR);
 	let _ = candidates.iter().map(|c|
-		submit_voter::<T>(c.clone(), vec![c.clone()], stake)
+		submit_voter::<T>(c.clone(), vec![c.clone()], stake).map(|_| ())
 	).collect::<Result<_, _>>()?;
 	Ok(candidates)
 }
 
 
 /// Submit one voter.
 fn submit_voter<T: Trait>(caller: T::AccountId, votes: Vec<T::AccountId>, stake: BalanceOf<T>)
-	-> Result<(), sp_runtime::DispatchError>
+	-> frame_support::dispatch::DispatchResultWithPostInfo
 {
 	<Elections<T>>::vote(RawOrigin::Signed(caller).into(), votes, stake)
 }
@@ -242,13 +242,8 @@ benchmarks! {
 		let bailing_candidates = submit_candidates::<T>(v, "bailing_candidates")?;
 		let all_candidates = submit_candidates::<T>(c, "all_candidates")?;
 
-		// account 1 is the reporter and must be whitelisted, and a voter.
+		// account 1 is the reporter and must be whitelisted.
 		let account_1 = endowed_account::<T>("caller", 0);
-		submit_voter::<T>(
-			account_1.clone(),
-			all_candidates.iter().take(1).cloned().collect(),
-			stake,
-		)?;
 
 		// account 2 votes for all of the mentioned candidates.
 		let account_2 = endowed_account::<T>("caller_2", 1);
@@ -304,13 +299,8 @@ benchmarks! {
 		// create a bunch of candidates as well.
 		let all_candidates = submit_candidates::<T>(c, "candidates")?;
 
-		// account 1 is the reporter and need to be whitelisted, and a voter.
+		// account 1 is the reporter and need to be whitelisted.
 		let account_1 = endowed_account::<T>("caller", 0);
-		submit_voter::<T>(
-			account_1.clone(),
-			all_candidates.iter().take(1).cloned().collect(),
-			stake,
-		)?;
 
 		// account 2 votes for a bunch of crap, and finally a correct candidate.
 		let account_2 = endowed_account::<T>("caller_2", 1);