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

Including runners-up in check for defunct phragmen voter. (#4349)

Browse Source
This commit is contained in:
Jake Naviasky
2019-12-11 03:42:19 -05:00
committed by Gavin Wood
parent 6500b33df3
commit ed50be1eb5
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/elections-phragmen/src/lib.rs
+8 -4
View File
@@ -536,7 +536,7 @@ impl<T: Trait> Module<T> {
if Self::is_voter(who) { if Self::is_voter(who) {
Self::votes_of(who) Self::votes_of(who)
.iter() .iter()
.all(|v| !Self::is_member(v) && !Self::is_candidate(v).is_ok()) .all(|v| !Self::is_member(v) && !Self::is_runner(v) && !Self::is_candidate(v).is_ok())
} else { } else {
false false
} }
@@ -1323,13 +1323,15 @@ mod tests {
#[test] #[test]
fn can_detect_defunct_voter() { fn can_detect_defunct_voter() {
ExtBuilder::default().build().execute_with(|| { ExtBuilder::default().desired_runners_up(2).build().execute_with(|| {
assert_ok!(Elections::submit_candidacy(Origin::signed(5)));
assert_ok!(Elections::submit_candidacy(Origin::signed(4))); assert_ok!(Elections::submit_candidacy(Origin::signed(4)));
assert_ok!(Elections::submit_candidacy(Origin::signed(5)));
assert_ok!(Elections::submit_candidacy(Origin::signed(6)));
assert_ok!(Elections::vote(Origin::signed(5), vec![5], 50)); assert_ok!(Elections::vote(Origin::signed(5), vec![5], 50));
assert_ok!(Elections::vote(Origin::signed(4), vec![4], 40)); assert_ok!(Elections::vote(Origin::signed(4), vec![4], 40));
assert_ok!(Elections::vote(Origin::signed(2), vec![4, 5], 20)); assert_ok!(Elections::vote(Origin::signed(2), vec![4, 5], 20));
assert_ok!(Elections::vote(Origin::signed(6), vec![6], 30));
// will be soon a defunct voter. // will be soon a defunct voter.
assert_ok!(Elections::vote(Origin::signed(3), vec![3], 30)); assert_ok!(Elections::vote(Origin::signed(3), vec![3], 30));
@@ -1337,12 +1339,14 @@ mod tests {
assert_ok!(Elections::end_block(System::block_number())); assert_ok!(Elections::end_block(System::block_number()));
assert_eq!(Elections::members_ids(), vec![4, 5]); assert_eq!(Elections::members_ids(), vec![4, 5]);
assert_eq!(Elections::runners_up_ids(), vec![6]);
assert_eq!(Elections::candidates(), vec![]); assert_eq!(Elections::candidates(), vec![]);
// all of them have a member that they voted for. // all of them have a member or runner-up that they voted for.
assert_eq!(Elections::is_defunct_voter(&5), false); assert_eq!(Elections::is_defunct_voter(&5), false);
assert_eq!(Elections::is_defunct_voter(&4), false); assert_eq!(Elections::is_defunct_voter(&4), false);
assert_eq!(Elections::is_defunct_voter(&2), false); assert_eq!(Elections::is_defunct_voter(&2), false);
assert_eq!(Elections::is_defunct_voter(&6), false);
// defunct // defunct
assert_eq!(Elections::is_defunct_voter(&3), true); assert_eq!(Elections::is_defunct_voter(&3), true);