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

Resolve merge conflicts

Browse Source
This commit is contained in:
Eitan Seri-Levi
2026-05-17 11:55:52 +03:00
parent 6a9b013a26 1b921a64e6
commit ac7fc2206a
160 changed files with 1979 additions and 1314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
beacon_node/beacon_chain/tests/events.rs
View File

@@ -1,3 +1,4 @@
use arbitrary::Arbitrary;
use beacon_chain::blob_verification::GossipVerifiedBlob;
use beacon_chain::data_column_verification::GossipVerifiedDataColumn;
use beacon_chain::test_utils::{
@@ -8,7 +9,6 @@ use rand::SeedableRng;
use rand::rngs::StdRng;
use std::sync::Arc;
use types::data::FixedBlobSidecarList;
use types::test_utils::TestRandom;
use types::{
BlobSidecar, DataColumnSidecar, DataColumnSidecarFulu, DataColumnSidecarGloas, Domain, EthSpec,
MinimalEthSpec, PayloadAttestationData, PayloadAttestationMessage, SignedRoot, Slot,
@@ -74,19 +74,19 @@ async fn data_column_sidecar_event_on_process_gossip_data_column() {
let mut data_column_event_receiver = event_handler.subscribe_data_column_sidecar();
// build and process a gossip verified data column
let mut rng = StdRng::seed_from_u64(0xDEADBEEF0BAD5EEDu64);
let mut u = types::test_utils::test_unstructured();
let sidecar = {
let slot = Slot::new(10);
let fork_name = harness.spec.fork_name_at_slot::<E>(slot);
// DA checker only accepts sampling columns, so we need to create one with a sampling index.
if fork_name.gloas_enabled() {
let mut random_sidecar = DataColumnSidecarGloas::random_for_test(&mut rng);
let mut random_sidecar = DataColumnSidecarGloas::arbitrary(&mut u).unwrap();
let epoch = slot.epoch(E::slots_per_epoch());
random_sidecar.slot = slot;
random_sidecar.index = harness.chain.sampling_columns_for_epoch(epoch)[0];
DataColumnSidecar::Gloas(random_sidecar)
} else {
let mut random_sidecar = DataColumnSidecarFulu::random_for_test(&mut rng);
let mut random_sidecar = DataColumnSidecarFulu::arbitrary(&mut u).unwrap();
let epoch = slot.epoch(E::slots_per_epoch());
random_sidecar.signed_block_header.message.slot = slot;
random_sidecar.index = harness.chain.sampling_columns_for_epoch(epoch)[0];

3
beacon_node/beacon_chain/tests/store_tests.rs
View File

@@ -31,7 +31,9 @@ use fork_choice::PayloadStatus;
use logging::create_test_tracing_subscriber;
use maplit::hashset;
use rand::Rng;
use rand::SeedableRng;
use rand::rngs::StdRng;
use rand_xorshift::XorShiftRng;
use slot_clock::{SlotClock, TestingSlotClock};
use ssz_types::VariableList;
use state_processing::{BlockReplayer, state_advance::complete_state_advance};
@@ -50,7 +52,6 @@ use store::{
};
use tempfile::{TempDir, tempdir};
use tracing::info;
use types::test_utils::{SeedableRng, XorShiftRng};
use types::*;
// Should ideally be divisible by 3.