mirror of
https://github.com/sigp/lighthouse.git
synced 2026-04-18 21:38:31 +00:00
Merge remote-tracking branch 'origin/unstable' into gloas-envelope-processing
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
use super::*;
|
||||
use serde::Deserialize;
|
||||
use std::marker::PhantomData;
|
||||
use types::data_column_custody_group::{CustodyIndex, compute_columns_for_custody_group};
|
||||
use types::data::{CustodyIndex, compute_columns_for_custody_group};
|
||||
|
||||
#[derive(Debug, Clone, Deserialize)]
|
||||
#[serde(bound = "E: EthSpec", deny_unknown_fields)]
|
||||
|
||||
@@ -2,7 +2,7 @@ use super::*;
|
||||
use alloy_primitives::U256;
|
||||
use serde::Deserialize;
|
||||
use std::marker::PhantomData;
|
||||
use types::data_column_custody_group::get_custody_groups;
|
||||
use types::data::get_custody_groups;
|
||||
|
||||
#[derive(Debug, Clone, Deserialize)]
|
||||
#[serde(bound = "E: EthSpec", deny_unknown_fields)]
|
||||
|
||||
@@ -6,7 +6,7 @@ use tree_hash::Hash256;
|
||||
use typenum::Unsigned;
|
||||
use types::{
|
||||
BeaconBlockBody, BeaconBlockBodyCapella, BeaconBlockBodyDeneb, BeaconBlockBodyElectra,
|
||||
BeaconBlockBodyFulu, BeaconBlockBodyGloas, BeaconState, FullPayload, light_client_update,
|
||||
BeaconBlockBodyFulu, BeaconBlockBodyGloas, BeaconState, FullPayload, light_client,
|
||||
};
|
||||
|
||||
#[derive(Debug, Clone, Deserialize)]
|
||||
@@ -97,16 +97,16 @@ impl<E: EthSpec> Case for BeaconStateMerkleProofValidity<E> {
|
||||
state.update_tree_hash_cache().unwrap();
|
||||
|
||||
let proof = match self.merkle_proof.leaf_index {
|
||||
light_client_update::CURRENT_SYNC_COMMITTEE_INDEX_ELECTRA
|
||||
| light_client_update::CURRENT_SYNC_COMMITTEE_INDEX => {
|
||||
light_client::consts::CURRENT_SYNC_COMMITTEE_INDEX_ELECTRA
|
||||
| light_client::consts::CURRENT_SYNC_COMMITTEE_INDEX => {
|
||||
state.compute_current_sync_committee_proof()
|
||||
}
|
||||
light_client_update::NEXT_SYNC_COMMITTEE_INDEX_ELECTRA
|
||||
| light_client_update::NEXT_SYNC_COMMITTEE_INDEX => {
|
||||
light_client::consts::NEXT_SYNC_COMMITTEE_INDEX_ELECTRA
|
||||
| light_client::consts::NEXT_SYNC_COMMITTEE_INDEX => {
|
||||
state.compute_next_sync_committee_proof()
|
||||
}
|
||||
light_client_update::FINALIZED_ROOT_INDEX_ELECTRA
|
||||
| light_client_update::FINALIZED_ROOT_INDEX => state.compute_finalized_root_proof(),
|
||||
light_client::consts::FINALIZED_ROOT_INDEX_ELECTRA
|
||||
| light_client::consts::FINALIZED_ROOT_INDEX => state.compute_finalized_root_proof(),
|
||||
_ => {
|
||||
return Err(Error::FailedToParseTest(
|
||||
"Could not retrieve merkle proof, invalid index".to_string(),
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
//! Mapping from types to canonical string identifiers used in testing.
|
||||
use types::historical_summary::HistoricalSummary;
|
||||
use types::state::HistoricalSummary;
|
||||
use types::*;
|
||||
|
||||
pub trait TypeName {
|
||||
|
||||
Reference in New Issue
Block a user