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

merge conflicts

Browse Source
This commit is contained in:
Eitan Seri-Levi
2025-05-27 14:56:02 -07:00
parent c464a54ba2 e21b578073
commit 30f28784ee
358 changed files with 11552 additions and 6768 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,6 +3,7 @@ use crate::decode::{ssz_decode_file, ssz_decode_file_with, ssz_decode_state, yam
use ::fork_choice::{PayloadVerificationStatus, ProposerHeadError};
use beacon_chain::beacon_proposer_cache::compute_proposer_duties_from_head;
use beacon_chain::blob_verification::GossipBlobError;
use beacon_chain::block_verification_types::RpcBlock;
use beacon_chain::chain_config::{
DisallowedReOrgOffsets, DEFAULT_RE_ORG_HEAD_THRESHOLD,
DEFAULT_RE_ORG_MAX_EPOCHS_SINCE_FINALIZATION, DEFAULT_RE_ORG_PARENT_THRESHOLD,
@@ -519,7 +520,7 @@ impl<E: EthSpec> Tester<E> {
let result: Result<Result<Hash256, ()>, _> = self
.block_on_dangerous(self.harness.chain.process_block(
block_root,
block.clone(),
RpcBlock::new_without_blobs(Some(block_root), block.clone(), 0),
NotifyExecutionLayer::Yes,
BlockImportSource::Lookup,
|| Ok(()),

3
testing/ef_tests/src/cases/light_client_verify_is_better_update.rs
View File

@@ -3,8 +3,7 @@ use decode::ssz_decode_light_client_update;
use serde::Deserialize;
use types::{LightClientUpdate, Slot};
#[derive(Debug, Clone, Deserialize)]
#[serde(deny_unknown_fields)]
#[derive(Debug, Clone)]
pub struct LightClientVerifyIsBetterUpdate<E: EthSpec> {
light_client_updates: Vec<LightClientUpdate<E>>,
}

3
testing/ef_tests/src/cases/merkle_proof_validity.rs
View File

@@ -23,7 +23,7 @@ pub struct MerkleProof {
#[derive(Debug)]
pub enum GenericMerkleProofValidity<E: EthSpec> {
BeaconState(BeaconStateMerkleProofValidity<E>),
BeaconState(Box<BeaconStateMerkleProofValidity<E>>),
BeaconBlockBody(Box<BeaconBlockBodyMerkleProofValidity<E>>),
}
@@ -48,6 +48,7 @@ impl<E: EthSpec> LoadCase for GenericMerkleProofValidity<E> {
if suite_name == "BeaconState" {
BeaconStateMerkleProofValidity::load_from_dir(path, fork_name)
.map(Box::new)
.map(GenericMerkleProofValidity::BeaconState)
} else if suite_name == "BeaconBlockBody" {
BeaconBlockBodyMerkleProofValidity::load_from_dir(path, fork_name)

2
testing/ef_tests/src/type_name.rs
View File

@@ -58,7 +58,7 @@ type_name_generic!(BeaconBlockBodyFulu, "BeaconBlockBody");
type_name!(BeaconBlockHeader);
type_name_generic!(BeaconState);
type_name!(BlobIdentifier);
type_name!(DataColumnIdentifier);
type_name!(DataColumnsByRootIdentifier);
type_name_generic!(BlobSidecar);
type_name_generic!(DataColumnSidecar);
type_name!(Checkpoint);

12
testing/ef_tests/tests/tests.rs
View File

@@ -667,11 +667,13 @@ mod ssz_static {
}
#[test]
fn data_column_identifier() {
SszStaticHandler::<DataColumnIdentifier, MinimalEthSpec>::default()
.run_for_feature(FeatureName::Fulu);
SszStaticHandler::<DataColumnIdentifier, MainnetEthSpec>::default()
.run_for_feature(FeatureName::Fulu);
#[ignore]
// TODO(das): enable once EF tests are updated to latest release.
fn data_column_by_root_identifier() {
// SszStaticHandler::<DataColumnsByRootIdentifier, MinimalEthSpec>::default()
// .run_for_feature(FeatureName::Fulu);
// SszStaticHandler::<DataColumnsByRootIdentifier, MainnetEthSpec>::default()
// .run_for_feature(FeatureName::Fulu);
}
#[test]