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

Cleaned up get_attestation_state

Browse Source
This commit is contained in:
Grant Wuerker 2019-07-20 12:47:59 +02:00
parent 7cdfa3cc27
commit bef7ca6bfb
No known key found for this signature in database
GPG Key ID: F7EA56FDDA6C464F
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
beacon_node/beacon_chain/src/beacon_chain.rs
View File

@ -523,15 +523,24 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
result result
} }
/// Retrieves the `BeaconState` used to create the attestation.
fn get_attestation_state(&self, attestation: &Attestation) -> Option<BeaconState<T::EthSpec>> { fn get_attestation_state(&self, attestation: &Attestation) -> Option<BeaconState<T::EthSpec>> {
// Current state is used if the attestation targets a historic block and a slot within an
// equal or adjacent epoch.
let slots_per_epoch = T::EthSpec::slots_per_epoch();
let min_slot = (self.state.read().slot.epoch(slots_per_epoch) - 1).start_slot(slots_per_epoch);
let blocks = BestBlockRootsIterator::owned(self.store.clone(), self.state.read().clone(), self.state.read().slot.clone()); let blocks = BestBlockRootsIterator::owned(self.store.clone(), self.state.read().clone(), self.state.read().slot.clone());
for (root, slot) in blocks { for (root, slot) in blocks {
if root == attestation.data.target_root if root == attestation.data.target_root {
&& self.slot_epochs_equal_or_adjacent(slot, self.state.read().slot) {
return Some(self.state.read().clone()); return Some(self.state.read().clone());
} }
if slot == min_slot {
break;
}
}; };
// A different state is retrieved from the database.
match self.store.get::<BeaconBlock>(&attestation.data.target_root) { match self.store.get::<BeaconBlock>(&attestation.data.target_root) {
Ok(Some(block)) => match self.store.get::<BeaconState<T::EthSpec>>(&block.state_root) { Ok(Some(block)) => match self.store.get::<BeaconState<T::EthSpec>>(&block.state_root) {
Ok(state) => state, Ok(state) => state,
@ -541,16 +550,6 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
} }
} }
fn slot_epochs_equal_or_adjacent(&self, slot_a: Slot, slot_b: Slot) -> bool {
let slots_per_epoch = T::EthSpec::slots_per_epoch();
let epoch_a = slot_a.epoch(slots_per_epoch);
let epoch_b = slot_b.epoch(slots_per_epoch);
epoch_a == epoch_b
|| epoch_a + 1 == epoch_b
|| epoch_b + 1 == epoch_a
}
/// Accept some deposit and queue it for inclusion in an appropriate block. /// Accept some deposit and queue it for inclusion in an appropriate block.
pub fn process_deposit( pub fn process_deposit(
&self, &self,