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

Allow HTTP API to return SSZ blocks (#2209)

Browse Source 
## Issue Addressed

Implements https://github.com/ethereum/eth2.0-APIs/pull/125

## Proposed Changes

Optionally return SSZ bytes from the `beacon/blocks` endpoint.
This commit is contained in:
Michael Sproul
2021-02-24 04:15:14 +00:00
parent 5bc93869c8
commit 2f077b11fe
3 changed files with 56 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -872,11 +872,35 @@ pub fn serve<T: BeaconChainTypes>(
.and(chain_filter.clone());
// GET beacon/blocks/{block_id}
let get_beacon_block = beacon_blocks_path.clone().and(warp::path::end()).and_then(
|block_id: BlockId, chain: Arc<BeaconChain<T>>| {
blocking_json_task(move || block_id.block(&chain).map(api_types::GenericResponse::from))
},
);
let get_beacon_block = beacon_blocks_path
.clone()
.and(warp::path::end())
.and(warp::header::optional::<api_types::Accept>("accept"))
.and_then(
|block_id: BlockId,
chain: Arc<BeaconChain<T>>,
accept_header: Option<api_types::Accept>| {
blocking_task(move || {
let block = block_id.block(&chain)?;
match accept_header {
Some(api_types::Accept::Ssz) => Response::builder()
.status(200)
.header("Content-Type", "application/octet-stream")
.body(block.as_ssz_bytes().into())
.map_err(|e| {
warp_utils::reject::custom_server_error(format!(
"failed to create response: {}",
e
))
}),
_ => Ok(
warp::reply::json(&api_types::GenericResponseRef::from(&block))
.into_response(),
),
}
})
},
);
// GET beacon/blocks/{block_id}/root
let get_beacon_block_root = beacon_blocks_path

10
beacon_node/http_api/tests/tests.rs
View File

@@ -955,16 +955,18 @@ impl ApiTester {
pub async fn test_beacon_blocks(self) -> Self {
for block_id in self.interesting_block_ids() {
let result = self
let expected = self.get_block(block_id);
let json_result = self
.client
.get_beacon_blocks(block_id)
.await
.unwrap()
.map(|res| res.data);
assert_eq!(json_result, expected, "{:?}", block_id);
let expected = self.get_block(block_id);
assert_eq!(result, expected, "{:?}", block_id);
let ssz_result = self.client.get_beacon_blocks_ssz(block_id).await.unwrap();
assert_eq!(ssz_result, expected, "{:?}", block_id);
}
self