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

Minor bug fixes and formatting changes.

Browse Source
This commit is contained in:
Paul Hauner 2019-01-31 10:04:40 +11:00
parent 2fc6dbb02a
commit 5ec9d82e40
No known key found for this signature in database
GPG Key ID: 303E4494BB28068C
3 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,6 +75,8 @@ impl BeaconState {
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() {
participants.push(*validator_index); participants.push(*validator_index);
} else {
debug!("get_attestation_participants: validator missing.");
} }
} }
Ok(participants) Ok(participants)

6
eth2/types/src/beacon_state/committees.rs
View File

@ -23,6 +23,10 @@ impl BeaconState {
self.slot / spec.epoch_length self.slot / spec.epoch_length
} }
pub fn previous_epoch(&self, spec: &ChainSpec) -> u64 {
self.current_epoch(spec).saturating_sub(1)
}
/// Returns the number of committees per slot. /// Returns the number of committees per slot.
/// ///
/// Note: this is _not_ the committee size. /// Note: this is _not_ the committee size.
@ -142,7 +146,9 @@ impl BeaconState {
} }
} }
/*
/// Utility function pending this functionality being stabilized on the `Range` type. /// Utility function pending this functionality being stabilized on the `Range` type.
fn range_contains<T: PartialOrd>(range: &Range<T>, target: T) -> bool { fn range_contains<T: PartialOrd>(range: &Range<T>, target: T) -> bool {
range.start <= target && target < range.end range.start <= target && target < range.end
} }
*/

29
eth2/types/src/beacon_state/epoch_processing.rs
View File

@ -54,14 +54,6 @@ impl BeaconState {
total_balance total_balance
); );
debug!(
"latest_attestations = {:?}",
self.latest_attestations
.iter()
.map(|a| a.data.slot)
.collect::<Vec<u64>>()
);
let current_epoch_attestations: Vec<&PendingAttestation> = self let current_epoch_attestations: Vec<&PendingAttestation> = self
.latest_attestations .latest_attestations
.iter() .iter()
@ -111,10 +103,12 @@ impl BeaconState {
.iter() .iter()
.filter(|a| { .filter(|a| {
//TODO: ensure these saturating subs are correct. //TODO: ensure these saturating subs are correct.
a.data.slot / spec.epoch_length == self.current_epoch(spec).saturating_sub(1) a.data.slot / spec.epoch_length == self.previous_epoch(spec)
}) })
.collect(); .collect();
debug!("previous epoch attestations: {}", previous_epoch_attestations.len());
let previous_epoch_attester_indices = let previous_epoch_attester_indices =
self.get_attestation_participants_union(&previous_epoch_attestations[..], spec)?; self.get_attestation_participants_union(&previous_epoch_attestations[..], spec)?;
@ -320,6 +314,8 @@ impl BeaconState {
let previous_epoch_attester_indices_hashset: HashSet<usize> = let previous_epoch_attester_indices_hashset: HashSet<usize> =
HashSet::from_iter(previous_epoch_attester_indices.iter().map(|i| *i)); HashSet::from_iter(previous_epoch_attester_indices.iter().map(|i| *i));
debug!("previous epoch justified attesters: {}, previous epoch boundary attesters: {}, previous epoch head attesters: {}, previous epoch attesters: {}", previous_epoch_justified_attester_indices.len(), previous_epoch_boundary_attester_indices.len(), previous_epoch_head_attestations.len(), previous_epoch_attester_indices.len());
debug!("{} epochs since finality.", epochs_since_finality); debug!("{} epochs since finality.", epochs_since_finality);
if epochs_since_finality <= 4 { if epochs_since_finality <= 4 {
@ -356,7 +352,8 @@ impl BeaconState {
for index in previous_epoch_attester_indices { for index in previous_epoch_attester_indices {
let base_reward = self.base_reward(index, base_reward_quotient, spec); let base_reward = self.base_reward(index, base_reward_quotient, spec);
let inclusion_distance = self.inclusion_distance(&previous_epoch_attestations, index, spec)?; let inclusion_distance =
self.inclusion_distance(&previous_epoch_attestations, index, spec)?;
safe_add_assign!( safe_add_assign!(
self.validator_balances[index], self.validator_balances[index],
@ -387,7 +384,8 @@ impl BeaconState {
for index in previous_epoch_attester_indices { for index in previous_epoch_attester_indices {
let base_reward = self.base_reward(index, base_reward_quotient, spec); let base_reward = self.base_reward(index, base_reward_quotient, spec);
let inclusion_distance = self.inclusion_distance(&previous_epoch_attestations, index, spec)?; let inclusion_distance =
self.inclusion_distance(&previous_epoch_attestations, index, spec)?;
safe_sub_assign!( safe_sub_assign!(
self.validator_balances[index], self.validator_balances[index],
@ -403,7 +401,8 @@ impl BeaconState {
* Attestation inclusion * Attestation inclusion
*/ */
for index in previous_epoch_attester_indices_hashset { for index in previous_epoch_attester_indices_hashset {
let inclusion_slot = self.inclusion_slot(&previous_epoch_attestations[..], index, spec)?; let inclusion_slot =
self.inclusion_slot(&previous_epoch_attestations[..], index, spec)?;
let proposer_index = self let proposer_index = self
.get_beacon_proposer_index(inclusion_slot, spec) .get_beacon_proposer_index(inclusion_slot, spec)
.map_err(|_| Error::UnableToDetermineProducer)?; .map_err(|_| Error::UnableToDetermineProducer)?;
@ -675,7 +674,8 @@ impl BeaconState {
validator_index: usize, validator_index: usize,
spec: &ChainSpec, spec: &ChainSpec,
) -> Result<u64, InclusionError> { ) -> Result<u64, InclusionError> {
let attestation = self.earliest_included_attestation(attestations, validator_index, spec)?; let attestation =
self.earliest_included_attestation(attestations, validator_index, spec)?;
Ok(attestation Ok(attestation
.slot_included .slot_included
.saturating_sub(attestation.data.slot)) .saturating_sub(attestation.data.slot))
@ -687,7 +687,8 @@ impl BeaconState {
validator_index: usize, validator_index: usize,
spec: &ChainSpec, spec: &ChainSpec,
) -> Result<u64, InclusionError> { ) -> Result<u64, InclusionError> {
let attestation = self.earliest_included_attestation(attestations, validator_index, spec)?; let attestation =
self.earliest_included_attestation(attestations, validator_index, spec)?;
Ok(attestation.slot_included) Ok(attestation.slot_included)
} }