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

Test only execute for glosa

Browse Source
This commit is contained in:
Eitan Seri- Levi
2026-01-29 13:40:41 -08:00
parent d122561444
commit 4e00426c4b
4 changed files with 51 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
beacon_node/beacon_chain/src/data_availability_checker_v2.rs
View File

@@ -612,8 +612,6 @@ impl<E: EthSpec> AvailablePayload<E> {
/// Returns `AvailabilityCheckError` if:
/// - `column_data` contains data not required by the block
/// - Required `column_data` is missing
/// - Blob count doesn't match expected
/// - Custody columns are incomplete
pub fn new<T>(
payload: Arc<SignedExecutionPayloadEnvelope<T::EthSpec>>,
block: Arc<SignedBeaconBlock<E>>,

62
beacon_node/beacon_chain/src/data_availability_checker_v2/overflow_lru_cache.rs
View File

@@ -776,6 +776,7 @@ mod test {
}
#[tokio::test]
#[ignore] // TODO(gloas): Implement availability_pending_payload
async fn overflow_cache_test_insert_components() {
type E = MinimalEthSpec;
type T = DiskHarnessType<E>;
@@ -899,6 +900,7 @@ mod test {
}
#[tokio::test]
#[ignore] // TODO(gloas): Implement availability_pending_payload
// ensure the state cache keeps memory usage low and that it can properly recover states
// THIS TEST CAN BE DELETED ONCE TREE STATES IS MERGED AND WE RIP OUT THE STATE CACHE
async fn overflow_cache_test_state_cache() {
@@ -1024,14 +1026,14 @@ mod pending_components_tests {
use super::*;
use crate::PayloadVerificationOutcome;
use crate::data_column_verification::KzgVerifiedDataColumn;
use crate::test_utils::{NumBlobs, generate_data_column_sidecars_from_payload, test_spec};
use crate::test_utils::{NumBlobs, generate_rand_payload_and_columns, test_spec};
use fork_choice::PayloadVerificationStatus;
use kzg::KzgCommitment;
use rand::SeedableRng;
use rand::rngs::StdRng;
use rand::{Rng, SeedableRng};
use ssz_types::VariableList;
use types::test_utils::TestRandom;
use types::{ForkName, MainnetEthSpec, SignedExecutionPayloadEnvelope};
use types::{ForkName, MainnetEthSpec, SignedExecutionPayloadEnvelope, Slot};
type E = MainnetEthSpec;
@@ -1041,28 +1043,27 @@ mod pending_components_tests {
DataColumnSidecarList<E>,
);
/// Returns true if gloas is enabled for testing. Tests should skip if this returns false.
fn is_gloas_enabled() -> bool {
let spec = test_spec::<E>();
spec.fork_name_at_slot::<E>(Slot::new(0)).gloas_enabled()
}
fn pre_setup() -> Setup {
let mut rng = StdRng::seed_from_u64(0xDEADBEEF0BAD5EEDu64);
let spec = test_spec::<E>();
// Ensure spec supports gloas so build_data_column_sidecars_gloas succeeds
let spec = ForkName::Gloas.make_genesis_spec(spec);
let mut payload = SignedExecutionPayloadEnvelope::<E>::random_for_test(&mut rng);
// Generate blob transactions to populate blob_kzg_commitments
let num_blobs = match NumBlobs::Random {
NumBlobs::Random => rng.random_range(1..=6usize),
NumBlobs::Number(n) => n,
NumBlobs::None => 0,
};
let (bundle, transactions) =
execution_layer::test_utils::generate_blobs::<E>(num_blobs, ForkName::Gloas).unwrap();
payload.message.payload.transactions = <_>::default();
for tx in Vec::from(transactions) {
payload.message.payload.transactions.push(tx).unwrap();
}
payload.message.blob_kzg_commitments = bundle.commitments.clone();
assert!(
spec.fork_name_at_slot::<E>(Slot::new(0)).gloas_enabled(),
"pre_setup() only works after gloas"
);
let columns = generate_data_column_sidecars_from_payload(&payload, &spec);
let (payload, columns) = generate_rand_payload_and_columns::<E>(
ForkName::Gloas,
NumBlobs::Random,
&mut rng,
&spec,
);
// Create invalid columns by mutating kzg_commitments
let invalid_columns: DataColumnSidecarList<E> = columns
@@ -1163,6 +1164,9 @@ mod pending_components_tests {
#[test]
fn payload_invalid_columns_valid_columns() {
if !is_gloas_enabled() {
return;
}
let (payload, columns, invalid_columns) = pre_setup();
let (diet_payload, columns, invalid_columns) =
setup_pending_components(payload, columns, invalid_columns);
@@ -1183,6 +1187,9 @@ mod pending_components_tests {
#[test]
fn invalid_columns_payload_valid_columns() {
if !is_gloas_enabled() {
return;
}
let (payload, columns, invalid_columns) = pre_setup();
let (diet_payload, columns, invalid_columns) =
setup_pending_components(payload, columns, invalid_columns);
@@ -1202,6 +1209,9 @@ mod pending_components_tests {
#[test]
fn invalid_columns_valid_columns_payload() {
if !is_gloas_enabled() {
return;
}
let (payload, columns, invalid_columns) = pre_setup();
let (diet_payload, columns, invalid_columns) =
setup_pending_components(payload, columns, invalid_columns);
@@ -1222,6 +1232,9 @@ mod pending_components_tests {
#[test]
fn payload_valid_columns_invalid_columns() {
if !is_gloas_enabled() {
return;
}
let (payload, columns, invalid_columns) = pre_setup();
let (diet_payload, columns, invalid_columns) =
setup_pending_components(payload, columns, invalid_columns);
@@ -1242,6 +1255,9 @@ mod pending_components_tests {
#[test]
fn valid_columns_payload_invalid_columns() {
if !is_gloas_enabled() {
return;
}
let (payload, columns, invalid_columns) = pre_setup();
let (diet_payload, columns, invalid_columns) =
setup_pending_components(payload, columns, invalid_columns);
@@ -1262,6 +1278,9 @@ mod pending_components_tests {
#[test]
fn valid_columns_invalid_columns_payload() {
if !is_gloas_enabled() {
return;
}
let (payload, columns, invalid_columns) = pre_setup();
let (diet_payload, columns, invalid_columns) =
setup_pending_components(payload, columns, invalid_columns);
@@ -1282,6 +1301,9 @@ mod pending_components_tests {
#[test]
fn should_not_insert_pre_execution_payload_if_executed_payload_exists() {
if !is_gloas_enabled() {
return;
}
let (payload, _columns, _invalid_columns) = pre_setup();
let (diet_payload, _columns, _invalid_columns) =
setup_pending_components(payload.clone(), _columns, _invalid_columns);

10
beacon_node/beacon_chain/src/test_utils.rs
View File

@@ -3436,7 +3436,7 @@ macro_rules! add_blob_transactions_gloas {
}};
}
pub fn generate_rand_payloads_and_columns<E: EthSpec>(
pub fn generate_rand_payload_and_columns<E: EthSpec>(
fork_name: ForkName,
num_blobs: NumBlobs,
rng: &mut impl Rng,
@@ -3616,8 +3616,10 @@ pub fn generate_data_column_sidecars_from_payload<E: EthSpec>(
return vec![];
}
// load the precomputed column sidecar to avoid computing them for every block in the tests.
let template_data_columns = RuntimeVariableList::<DataColumnSidecarGloas<E>>::from_ssz_bytes(
// Load the precomputed column sidecar to avoid computing them for every block in the tests.
// TODO(gloas): The fixture is currently in Fulu format. We should generate a Gloas-specific
// fixture once the format is finalized, or compute columns dynamically for Gloas tests.
let template_data_columns = RuntimeVariableList::<DataColumnSidecarFulu<E>>::from_ssz_bytes(
TEST_DATA_COLUMN_SIDECARS_SSZ,
E::number_of_columns(),
)
@@ -3626,7 +3628,7 @@ pub fn generate_data_column_sidecars_from_payload<E: EthSpec>(
let (cells, proofs) = template_data_columns
.into_iter()
.map(|sidecar| {
let DataColumnSidecarGloas {
let DataColumnSidecarFulu {
column, kzg_proofs, ..
} = sidecar;
// There's only one cell per column for a single blob