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

Merge branch 'api-alignment' into validator-post-fns

Browse Source
This commit is contained in:
Luke Anderson
2019-09-13 19:06:32 +10:00
parent cd8f40b4b7 0b2f3bbf00
commit 09e11dd081
5 changed files with 20 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
beacon_node/rest_api/src/beacon.rs
View File

@@ -128,13 +128,7 @@ pub fn get_block_root<T: BeaconChainTypes + 'static>(req: Request<Body>) -> ApiR
/// HTTP handler to return the `Fork` of the current head.
pub fn get_fork<T: BeaconChainTypes + 'static>(req: Request<Body>) -> ApiResult {
let beacon_chain = get_beacon_chain_from_request::<T>(&req)?;
let head_state = get_head_state(beacon_chain)?;
let json: String = serde_json::to_string(&head_state.fork).map_err(|e| {
ApiError::ServerError(format!("Unable to serialize BeaconState::Fork: {:?}", e))
})?;
Ok(success_response_old(Body::from(json)))
ResponseBuilder::new(&req).body(&beacon_chain.head().beacon_state)
}
/// HTTP handler to return the set of validators for an `Epoch`
@@ -185,7 +179,7 @@ pub struct StateResponse<T: EthSpec> {
/// the current head by skipping slots.
pub fn get_state<T: BeaconChainTypes + 'static>(req: Request<Body>) -> ApiResult {
let beacon_chain = get_beacon_chain_from_request::<T>(&req)?;
let head_state = get_head_state(beacon_chain.clone())?;
let head_state = beacon_chain.head().beacon_state;
let (key, value) = match UrlQuery::from_request(&req) {
Ok(query) => {
@@ -248,7 +242,7 @@ pub fn get_current_finalized_checkpoint<T: BeaconChainTypes + 'static>(
req: Request<Body>,
) -> ApiResult {
let beacon_chain = get_beacon_chain_from_request::<T>(&req)?;
let head_state = get_head_state(beacon_chain)?;
let head_state = beacon_chain.head().beacon_state;
let checkpoint = head_state.finalized_checkpoint.clone();