pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-05-30 10:31:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix runners-up candidacy submission check in council (#4592)

Browse Source 
* fix is_runner()

* add a test

* Bump
This commit is contained in:
Kian Paimani
2020-01-10 15:26:12 +01:00
committed by Gavin Wood
parent 2d0c382daf
commit 90f85a52b1
2 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/elections-phragmen/src/lib.rs
+22 -3
View File
@@ -161,8 +161,8 @@ decl_storage! {
/// Locked stake of a voter.
pub StakeOf get(fn stake_of): map T::AccountId => BalanceOf<T>;
/// The present candidate list. Sorted based on account id. A current member can never enter
/// this vector and is always implicitly assumed to be a candidate.
/// The present candidate list. Sorted based on account-id. A current member or a runner can
/// never enter this vector and is always implicitly assumed to be a candidate.
pub Candidates get(fn candidates): Vec<T::AccountId>;
}
}
@@ -535,7 +535,7 @@ impl<T: Trait> Module<T> {
///
/// Limited number of runners-up. Binary search. Constant time factor. O(1)
fn is_runner(who: &T::AccountId) -> bool {
Self::runners_up().binary_search_by(|(a, _b)| a.cmp(who)).is_ok()
Self::runners_up().iter().position(|(a, _b)| a == who).is_some()
}
/// Returns number of desired members.
@@ -2080,4 +2080,23 @@ mod tests {
);
})
}
#[test]
fn behavior_with_dupe_candidate() {
ExtBuilder::default().desired_runners_up(2).build().execute_with(|| {
<Candidates<Test>>::put(vec![1, 1, 2, 3, 4]);
assert_ok!(Elections::vote(Origin::signed(5), vec![1], 50));
assert_ok!(Elections::vote(Origin::signed(4), vec![4], 40));
assert_ok!(Elections::vote(Origin::signed(3), vec![3], 30));
assert_ok!(Elections::vote(Origin::signed(2), vec![2], 20));
System::set_block_number(5);
assert_ok!(Elections::end_block(System::block_number()));
assert_eq!(Elections::members_ids(), vec![1, 1]);
assert_eq!(Elections::runners_up_ids(), vec![4, 3]);
assert_eq!(Elections::candidates(), vec![]);
})
}
}