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

Simplify blob_sidecar query and remove override for Head and Slot

Browse Source
This commit is contained in:
Jimmy Chen 2023-01-04 01:57:15 +11:00
parent 11736b68d3
commit 355cab8704
1 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
beacon_node/http_api/src/block_id.rs
View File

@ -217,32 +217,7 @@ impl BlockId {
&self,
chain: &BeaconChain<T>,
) -> Result<(Arc<BlobsSidecar<T::EthSpec>>), warp::Rejection> {
let root = match &self.0 {
CoreBlockId::Head => {
let (cached_head, _execution_status) = chain
.canonical_head
.head_and_execution_status()
.map_err(warp_utils::reject::beacon_chain_error)?;
cached_head.head_block_root()
}
CoreBlockId::Slot(slot) => {
let maybe_block_root = chain
.block_root_at_slot(*slot, WhenSlotSkipped::None)
.ok()
.flatten();
match maybe_block_root {
Some(block_root) => block_root,
None => {
return Err(warp_utils::reject::custom_not_found(format!(
"Block root for slot {} not found",
slot
)))
}
}
}
_ => self.root(chain)?.0,
};
let root = self.root(chain)?.0;
match chain.store.get_blobs(&root) {
Ok(Some(blob)) => Ok((Arc::new(blob))),
Ok(None) => Err(warp_utils::reject::custom_not_found(format!(