cerc-io/lighthouse
10
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Tidy attestation_participants function.

Browse Source 
It was using a map where it could use a find.
This commit is contained in:
Paul Hauner 2019-01-31 16:41:54 +11:00
parent 5da955e3ce
commit a1cdc0402d
No known key found for this signature in database
GPG Key ID: D362883A9218FCC6
1 changed files with 6 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
eth2/types/src/beacon_state/attestation_participants.rs
View File

@ -38,54 +38,21 @@ impl BeaconState {
let crosslink_committees = let crosslink_committees =
self.get_crosslink_committees_at_slot(attestation_data.slot, spec)?; self.get_crosslink_committees_at_slot(attestation_data.slot, spec)?;
/* let committee_index: usize = crosslink_committees
let mut shard_present = false;
for (_committee, shard) in &crosslink_committees {
println!("want shard: {}, got shard: {}", shard, attestation_data.shard);
if *shard == attestation_data.shard {
shard_present = true;
}
}
if !shard_present {
return Err(Error::NoCommitteeForShard);
}
*/
let crosslink_committee: Vec<usize> = crosslink_committees
.iter() .iter()
.filter_map(|(committee, shard)| { .position(|(_committee, shard)| *shard == attestation_data.shard)
if *shard == attestation_data.shard { .ok_or_else(|| Error::NoCommitteeForShard)?;
Some(committee.clone()) let (crosslink_committee, _shard) = &crosslink_committees[committee_index];
} else {
None
}
})
.collect::<Vec<Vec<usize>>>()
.first()
.ok_or_else(|| Error::NoCommitteeForShard)?
.clone();
/* /*
* TODO: check for this condition. * TODO: that bitfield length is valid.
* *
if aggregation_bitfield.len() != (crosslink_committee.len() + 7) / 8 { */
return Err(Error::BadBitfieldLength);
}
*/
let mut participants = vec![]; let mut participants = vec![];
for (i, validator_index) in crosslink_committee.iter().enumerate() { for (i, validator_index) in crosslink_committee.iter().enumerate() {
if aggregation_bitfield.get(i).unwrap() { if aggregation_bitfield.get(i).unwrap() {
debug!(
"committee index {} found in attestation on slot {}",
i, attestation_data.slot
);
participants.push(*validator_index); participants.push(*validator_index);
} else {
debug!(
"committee index {} not found in attestation on slot {}",
i, attestation_data.slot
);
} }
} }
Ok(participants) Ok(participants)