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

Convert RpcBlock to an enum that indicates availability (#8424)

Browse Source 
Co-Authored-By: Eitan Seri-Levi <eserilev@ucsc.edu>

Co-Authored-By: Mark Mackey <mark@sigmaprime.io>

Co-Authored-By: Eitan Seri-Levi <eserilev@gmail.com>

Co-Authored-By: Jimmy Chen <jchen.tc@gmail.com>
This commit is contained in:
Eitan Seri-Levi
2026-01-27 21:59:32 -08:00
committed by GitHub
parent c4409cdf28
commit f7b5c7ee3f
23 changed files with 1368 additions and 579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
testing/ef_tests/src/cases/fork_choice.rs
View File

@@ -532,6 +532,7 @@ impl<E: EthSpec> Tester<E> {
valid: bool,
) -> Result<(), Error> {
let block_root = block.canonical_root();
let mut data_column_success = true;
if let Some(columns) = columns.clone() {
@@ -560,13 +561,21 @@ impl<E: EthSpec> Tester<E> {
let block = Arc::new(block);
let result: Result<Result<Hash256, ()>, _> = self
.block_on_dangerous(self.harness.chain.process_block(
block_root,
RpcBlock::new_without_blobs(Some(block_root), block.clone()),
NotifyExecutionLayer::Yes,
BlockImportSource::Lookup,
|| Ok(()),
))?
.block_on_dangerous(
self.harness.chain.process_block(
block_root,
RpcBlock::new(
block.clone(),
None,
&self.harness.chain.data_availability_checker,
self.harness.chain.spec.clone(),
)
.map_err(|e| Error::InternalError(format!("{:?}", e)))?,
NotifyExecutionLayer::Yes,
BlockImportSource::Lookup,
|| Ok(()),
),
)?
.map(|avail: AvailabilityProcessingStatus| avail.try_into());
let success = data_column_success && result.as_ref().is_ok_and(|inner| inner.is_ok());
if success != valid {
@@ -650,13 +659,21 @@ impl<E: EthSpec> Tester<E> {
let block = Arc::new(block);
let result: Result<Result<Hash256, ()>, _> = self
.block_on_dangerous(self.harness.chain.process_block(
block_root,
RpcBlock::new_without_blobs(Some(block_root), block.clone()),
NotifyExecutionLayer::Yes,
BlockImportSource::Lookup,
|| Ok(()),
))?
.block_on_dangerous(
self.harness.chain.process_block(
block_root,
RpcBlock::new(
block.clone(),
None,
&self.harness.chain.data_availability_checker,
self.harness.chain.spec.clone(),
)
.map_err(|e| Error::InternalError(format!("{:?}", e)))?,
NotifyExecutionLayer::Yes,
BlockImportSource::Lookup,
|| Ok(()),
),
)?
.map(|avail: AvailabilityProcessingStatus| avail.try_into());
let success = blob_success && result.as_ref().is_ok_and(|inner| inner.is_ok());
if success != valid {