gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-10 04:01:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix per_epoch_processing so it compiles again

Browse Source
This commit is contained in:
Paul Hauner
2019-03-06 18:57:41 +11:00
parent 17210faf3a
commit 8a25fd48cf
5 changed files with 592 additions and 593 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
eth2/state_processing/src/per_epoch_processing/winning_root.rs
View File

@@ -1,15 +1,16 @@
use super::WinningRootError;
use super::errors::WinningRootError;
use std::collections::HashMap;
use types::*;
#[derive(Clone)]
pub struct WinningRoot {
pub shard_block_root: Hash256,
pub crosslink_data_root: Hash256,
pub attesting_validator_indices: Vec<usize>,
pub total_balance: u64,
pub total_attesting_balance: u64,
}
fn winning_root(
pub fn winning_root(
state: &BeaconState,
shard: u64,
current_epoch_attestations: &[&PendingAttestation],
@@ -28,16 +29,16 @@ fn winning_root(
continue;
}
let shard_block_root = &a.data.shard_block_root;
let crosslink_data_root = &a.data.crosslink_data_root;
if candidates.contains_key(shard_block_root) {
if candidates.contains_key(crosslink_data_root) {
continue;
}
let attesting_validator_indices = attestations
.iter()
.try_fold::<_, _, Result<_, BeaconStateError>>(vec![], |mut acc, a| {
if (a.data.shard == shard) && (a.data.shard_block_root == *shard_block_root) {
if (a.data.shard == shard) && (a.data.crosslink_data_root == *crosslink_data_root) {
acc.append(&mut state.get_attestation_participants(
&a.data,
&a.aggregation_bitfield,
@@ -60,13 +61,13 @@ fn winning_root(
}
let candidate_root = WinningRoot {
shard_block_root: *shard_block_root,
crosslink_data_root: *crosslink_data_root,
attesting_validator_indices,
total_attesting_balance,
total_balance,
};
candidates.insert(*shard_block_root, candidate_root);
candidates.insert(*crosslink_data_root, candidate_root);
}
Ok(candidates
@@ -78,7 +79,7 @@ fn winning_root(
None
}
})
.min_by_key(|candidate| candidate.shard_block_root)
.min_by_key(|candidate| candidate.crosslink_data_root)
.ok_or_else(|| WinningRootError::NoWinningRoot)?
// TODO: avoid clone.
.clone())