gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-04-21 06:48:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflicts rebasing eip4844

Browse Source
This commit is contained in:
Emilia Hane
2023-02-06 14:34:28 +01:00
parent d292a3a6a8
commit e9e198a2b6
17 changed files with 93 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
beacon_node/beacon_chain/tests/block_verification.rs
View File

@@ -1,7 +1,7 @@
#![cfg(not(debug_assertions))]
use beacon_chain::test_utils::{
AttestationStrategy, BeaconChainHarness, BlockStrategy, EphemeralHarnessType,
AttestationStrategy, BeaconChainHarness, BlockStrategy, EphemeralTestingSlotClockHarnessType,
};
use beacon_chain::{BeaconSnapshot, BlockError, ChainSegmentResult, NotifyExecutionLayer};
use fork_choice::CountUnrealized;
@@ -65,7 +65,9 @@ async fn get_chain_segment() -> Vec<BeaconSnapshot<E>> {
segment
}
fn get_harness(validator_count: usize) -> BeaconChainHarness<EphemeralHarnessType<E>> {
fn get_harness(
validator_count: usize,
) -> BeaconChainHarness<EphemeralTestingSlotClockHarnessType<E>> {
let harness = BeaconChainHarness::builder(MainnetEthSpec)
.default_spec()
.keypairs(KEYPAIRS[0..validator_count].to_vec())
@@ -99,7 +101,7 @@ fn junk_aggregate_signature() -> AggregateSignature {
fn update_proposal_signatures(
snapshots: &mut [BeaconSnapshot<E>],
harness: &BeaconChainHarness<EphemeralHarnessType<E>>,
harness: &BeaconChainHarness<EphemeralTestingSlotClockHarnessType<E>>,
) {
for snapshot in snapshots {
let spec = &harness.chain.spec;
@@ -329,7 +331,7 @@ async fn chain_segment_non_linear_slots() {
async fn assert_invalid_signature(
chain_segment: &[BeaconSnapshot<E>],
harness: &BeaconChainHarness<EphemeralHarnessType<E>>,
harness: &BeaconChainHarness<EphemeralTestingSlotClockHarnessType<E>>,
block_index: usize,
snapshots: &[BeaconSnapshot<E>],
item: &str,
@@ -400,7 +402,7 @@ async fn assert_invalid_signature(
async fn get_invalid_sigs_harness(
chain_segment: &[BeaconSnapshot<E>],
) -> BeaconChainHarness<EphemeralHarnessType<E>> {
) -> BeaconChainHarness<EphemeralTestingSlotClockHarnessType<E>> {
let harness = get_harness(VALIDATOR_COUNT);
harness
.chain