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

Ensure council always sorted by expiry.

Browse Source
This commit is contained in:
Gav
2018-03-04 20:55:14 +01:00
parent f7af45f95b
commit f056dea47e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/demo/runtime/src/runtime/council.rs
+3 -2
View File
@@ -511,7 +511,7 @@ fn finalise_tally() {
} }
// set the new council. // set the new council.
let new_council: Vec<_> = active_council() let mut new_council: Vec<_> = active_council()
.into_iter() .into_iter()
.skip(expiring.len()) .skip(expiring.len())
.chain(leaderboard.iter() .chain(leaderboard.iter()
@@ -521,6 +521,7 @@ fn finalise_tally() {
.cloned() .cloned()
.map(|(_, a)| (a, new_expiry))) .map(|(_, a)| (a, new_expiry)))
.collect(); .collect();
new_council.sort_by_key(|&(_, expiry)| expiry);
storage::put(ACTIVE_COUNCIL, &new_council); storage::put(ACTIVE_COUNCIL, &new_council);
// clear all except runners-up from candidate list. // clear all except runners-up from candidate list.
@@ -530,7 +531,7 @@ fn finalise_tally() {
.rev() .rev()
.take_while(|&(b, _)| b != 0) .take_while(|&(b, _)| b != 0)
.skip(coming as usize) .skip(coming as usize)
.map(|(_, a)| (a, candidate_reg_info(&a).expect("runner up must b registered").1)); .map(|(_, a)| (a, candidate_reg_info(&a).expect("runner up must be registered").1));
let mut count = 0u32; let mut count = 0u32;
for (address, slot) in runners_up { for (address, slot) in runners_up {
new_candidates[slot as usize] = address; new_candidates[slot as usize] = address;