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

Remove awkward let statement

Browse Source
This commit is contained in:
Paul Hauner 2019-08-13 19:59:29 +10:00
parent 8fb9e1f648
commit 82e8aafb01
No known key found for this signature in database
GPG Key ID: 303E4494BB28068C
1 changed files with 82 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -558,11 +558,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
// Attempt to process the attestation using the `self.head()` state. // Attempt to process the attestation using the `self.head()` state.
// //
// This is purely an effort to avoid loading a `BeaconState` unnecessarily from the DB. // This is purely an effort to avoid loading a `BeaconState` unnecessarily from the DB.
let optional_outcome: Option<Result<AttestationProcessingOutcome, Error>> = {
// Take a read lock on the head beacon state. // Take a read lock on the head beacon state.
//
// The purpose of this whole `let processed ...` block is to ensure that the read
// lock is dropped if we don't end up using the head beacon state.
let state = &self.head().beacon_state; let state = &self.head().beacon_state;
// If it turns out that the attestation was made using the head state, then there // If it turns out that the attestation was made using the head state, then there
@ -585,20 +581,19 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
{ {
// The head state is able to be used to validate this attestation. No need to load // The head state is able to be used to validate this attestation. No need to load
// anything from the database. // anything from the database.
Some(self.process_attestation_for_state_and_block( return self.process_attestation_for_state_and_block(
attestation.clone(), attestation.clone(),
state, state,
&attestation_head_block, &attestation_head_block,
)) );
} else {
None
} }
};
if let Some(outcome) = optional_outcome { // Ensure the read-lock from `self.head()` is dropped.
// Verification was already completed with an in-memory state. Return that result. //
outcome // This is likely unnecessary, however it remains as a reminder to ensure this lock
} else { // isn't hogged.
std::mem::drop(state);
// Use the `data.beacon_block_root` to load the state from the latest non-skipped // Use the `data.beacon_block_root` to load the state from the latest non-skipped
// slot preceding the attestation's creation. // slot preceding the attestation's creation.
// //
@ -649,7 +644,6 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
&attestation_head_block, &attestation_head_block,
) )
} }
}
} else { } else {
// Drop any attestation where we have not processed `attestation.data.beacon_block_root`. // Drop any attestation where we have not processed `attestation.data.beacon_block_root`.
// //