Skip to content

Commit 22f018a

Browse files
committed
Merge branch 'consensus-types-gloas' of github.com:jimmygchen/lighthouse into consensus-types-gloas
2 parents 8adb5cb + e6954f1 commit 22f018a

File tree

3 files changed

+14
-0
lines changed

3 files changed

+14
-0
lines changed

testing/ef_tests/check_all_files_accessed.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@
6464
# Ignore KZG tests that target internal kzg library functions
6565
"tests/.*/compute_verify_cell_kzg_proof_batch_challenge/.*",
6666
"tests/.*/compute_challenge/.*",
67+
# We don't need these manifest files at the moment.
68+
"tests/.*/manifest.yaml"
6769
]
6870

6971

testing/ef_tests/src/cases/fork_choice.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,15 @@ impl<E: EthSpec> Case for ForkChoiceTest<E> {
297297
}
298298

299299
fn result(&self, _case_index: usize, fork_name: ForkName) -> Result<(), Error> {
300+
// TODO(gloas): We have not implemented this change to fork choice/proposer boost yet.
301+
// https://github.com/sigp/lighthouse/issues/8689
302+
if self.description == "voting_source_beyond_two_epoch"
303+
|| self.description == "justified_update_not_realized_finality"
304+
|| self.description == "justified_update_always_if_better"
305+
{
306+
return Err(Error::SkippedKnownFailure);
307+
}
308+
300309
let tester = Tester::new(self, testing_spec::<E>(fork_name))?;
301310

302311
for step in &self.steps {

testing/ef_tests/src/handler.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,10 @@ where
393393
}
394394

395395
fn is_enabled_for_fork(&self, fork_name: ForkName) -> bool {
396+
// TODO(gloas): DataColumnSidecar tests are disabled until we update the DataColumnSidecar
397+
// type.
396398
self.supported_forks.contains(&fork_name)
399+
&& !(fork_name == ForkName::Gloas && T::name() == "DataColumnSidecar")
397400
}
398401
}
399402

0 commit comments

Comments
 (0)