gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-19 21:04:41 +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:33:17 +01:00
parent 994990063a
commit d292a3a6a8
19 changed files with 492 additions and 501 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
testing/ef_tests/src/cases/fork_choice.rs
View File

@@ -6,7 +6,7 @@ use beacon_chain::{
attestation_verification::{
obtain_indexed_attestation_and_committees_per_slot, VerifiedAttestation,
},
test_utils::{BeaconChainHarness, EphemeralHarnessType},
test_utils::{BeaconChainHarness, EphemeralTestingSlotClockHarnessType},
BeaconChainTypes, CachedHead, CountUnrealized, NotifyExecutionLayer,
};
use execution_layer::{json_structures::JsonPayloadStatusV1Status, PayloadStatusV1};
@@ -286,7 +286,7 @@ impl<E: EthSpec> Case for ForkChoiceTest<E> {
/// A testing rig used to execute a test case.
struct Tester<E: EthSpec> {
harness: BeaconChainHarness<EphemeralHarnessType<E>>,
harness: BeaconChainHarness<EphemeralTestingSlotClockHarnessType<E>>,
spec: ChainSpec,
}
@@ -306,14 +306,15 @@ impl<E: EthSpec> Tester<E> {
));
}
let harness = BeaconChainHarness::builder(E::default())
.spec(spec.clone())
.keypairs(vec![])
.genesis_state_ephemeral_store(case.anchor_state.clone())
.mock_execution_layer()
.recalculate_fork_times_with_genesis(0)
.mock_execution_layer_all_payloads_valid()
.build();
let harness =
BeaconChainHarness::<EphemeralTestingSlotClockHarnessType<E>>::builder(E::default())
.spec(spec.clone())
.keypairs(vec![])
.genesis_state_ephemeral_store(case.anchor_state.clone())
.mock_execution_layer()
.recalculate_fork_times_with_genesis(0)
.mock_execution_layer_all_payloads_valid()
.build();
if harness.chain.genesis_block_root != case.anchor_block.canonical_root() {
// This check will need to be removed if/when the fork-choice tests use a non-genesis
@@ -469,11 +470,12 @@ impl<E: EthSpec> Tester<E> {
.map_err(|e| {
Error::InternalError(format!("attestation indexing failed with {:?}", e))
})?;
let verified_attestation: ManuallyVerifiedAttestation<EphemeralHarnessType<E>> =
ManuallyVerifiedAttestation {
attestation,
indexed_attestation,
};
let verified_attestation: ManuallyVerifiedAttestation<
EphemeralTestingSlotClockHarnessType<E>,
> = ManuallyVerifiedAttestation {
attestation,
indexed_attestation,
};
self.harness
.chain