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

Resolve merge confklicts

Browse Source
This commit is contained in:
Eitan Seri-Levi
2026-05-18 23:12:53 +03:00
parent a67985d616 1a68631180
commit 299ed09d7e
58 changed files with 2570 additions and 922 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
consensus/state_processing/src/per_block_processing/tests.rs
View File

@@ -12,7 +12,6 @@ use crate::{
};
use beacon_chain::test_utils::{BeaconChainHarness, EphemeralHarnessType};
use bls::{AggregateSignature, Keypair, PublicKeyBytes, Signature, SignatureBytes};
use fixed_bytes::FixedBytesExtended;
use ssz_types::Bitfield;
use ssz_types::VariableList;
use std::sync::{Arc, LazyLock};
@@ -52,7 +51,6 @@ async fn get_harness<E: EthSpec>(
harness
.add_attested_blocks_at_slots(
state,
Hash256::zero(),
(1..last_slot_of_epoch.as_u64())
.map(Slot::new)
.collect::<Vec<_>>()

2
consensus/state_processing/src/per_epoch_processing/tests.rs
View File

@@ -2,7 +2,6 @@
use crate::per_epoch_processing::process_epoch;
use beacon_chain::test_utils::BeaconChainHarness;
use beacon_chain::types::{EthSpec, MinimalEthSpec};
use bls::{FixedBytesExtended, Hash256};
use types::Slot;
#[tokio::test]
@@ -22,7 +21,6 @@ async fn runs_without_error() {
harness
.add_attested_blocks_at_slots(
state,
Hash256::zero(),
(1..target_slot.as_u64())
.map(Slot::new)
.collect::<Vec<_>>()