gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-08 09:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tidy code in rest_api

Browse Source
This commit is contained in:
Paul Hauner
2019-11-27 13:11:52 +11:00
parent ab8b5dfc78
commit b51d2d7282
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
beacon_node/rest_api/src/validator.rs
View File

@@ -93,11 +93,9 @@ fn return_validator_duties<T: BeaconChainTypes>(
epoch: Epoch, epoch: Epoch,
validator_pubkeys: Vec<PublicKey>, validator_pubkeys: Vec<PublicKey>,
) -> Result<Vec<ValidatorDuty>, ApiError> { ) -> Result<Vec<ValidatorDuty>, ApiError> {
let head_state_slot = beacon_chain.head().beacon_state.slot; let head_epoch = beacon_chain.head().beacon_state.current_epoch();
let head_epoch = head_state_slot.current_epoch();
let relative_epoch = RelativeEpoch::from_epoch(head_epoch, epoch); let mut state = if RelativeEpoch::from_epoch(head_epoch, epoch).is_err() {
let mut state = if relative_epoch.is_err() {
beacon_chain.head().beacon_state beacon_chain.head().beacon_state
} else { } else {
beacon_chain beacon_chain
@@ -107,6 +105,9 @@ fn return_validator_duties<T: BeaconChainTypes>(
})? })?
}; };
let relative_epoch = RelativeEpoch::from_epoch(state.current_epoch(), epoch)
.map_err(|_| ApiError::ServerError(String::from("Loaded state is in the wrong epoch")))?;
state state
.build_committee_cache(relative_epoch, &beacon_chain.spec) .build_committee_cache(relative_epoch, &beacon_chain.spec)
.map_err(|e| ApiError::ServerError(format!("Unable to build committee cache: {:?}", e)))?; .map_err(|e| ApiError::ServerError(format!("Unable to build committee cache: {:?}", e)))?;