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

Merge remote-tracking branch 'upstream/unstable'

Browse Source
This commit is contained in:
Mark Mackey
2024-05-24 13:24:37 +02:00
parent a8088f1bfa 3070cb7c39
commit 987abe07f9
103 changed files with 2154 additions and 1595 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
beacon_node/http_api/src/lib.rs
View File

@@ -2126,14 +2126,7 @@ pub fn serve<T: BeaconChainTypes>(
task_spawner: TaskSpawner<T::EthSpec>,
eth1_service: eth1::Service| {
task_spawner.blocking_response_task(Priority::P1, move || match accept_header {
Some(api_types::Accept::Json) | None => {
let snapshot = eth1_service.get_deposit_snapshot();
Ok(
warp::reply::json(&api_types::GenericResponse::from(snapshot))
.into_response(),
)
}
_ => eth1_service
Some(api_types::Accept::Ssz) => eth1_service
.get_deposit_snapshot()
.map(|snapshot| {
Response::builder()
@@ -2159,6 +2152,13 @@ pub fn serve<T: BeaconChainTypes>(
))
})
}),
_ => {
let snapshot = eth1_service.get_deposit_snapshot();
Ok(
warp::reply::json(&api_types::GenericResponse::from(snapshot))
.into_response(),
)
}
})
},
);