diff --git a/testing/ef_tests/src/handler.rs b/testing/ef_tests/src/handler.rs index e0a23673f8..acea0cbdc1 100644 --- a/testing/ef_tests/src/handler.rs +++ b/testing/ef_tests/src/handler.rs @@ -760,11 +760,6 @@ impl ForkChoiceComplianceHandler { _phantom: PhantomData, } } - - pub fn only_fork(mut self, fork: ForkName) -> Self { - self.only_fork = Some(fork); - self - } } impl Handler for ForkChoiceComplianceHandler { @@ -787,25 +782,7 @@ impl Handler for ForkChoiceComplianceHandler { } fn is_enabled_for_fork(&self, fork_name: ForkName) -> bool { - // Compliance tests are only generated for fulu and gloas (post-Electra). - if !fork_name.fulu_enabled() { - return false; - } - // Gloas anchor states currently fail to initialise the test harness with - // "Head block not found in store" after the recent payload-envelope DB - // changes (see https://github.com/sigp/lighthouse/pull/8886). Skip gloas - // here until that path is fixed; fulu compliance still runs. - if fork_name.gloas_enabled() { - return false; - } - if let Some(only) = self.only_fork - && only != fork_name - { - return false; - } - // Compliance generators emit bogus BLS signatures (`bls_setting: 2`); SSZ-decoding - // them with real BLS yields BLST_BAD_ENCODING. They must run with `fake_crypto`. - cfg!(feature = "fake_crypto") + cfg!(feature = "fake_crypto") && fork_name.fulu_enabled() } fn disabled_forks(&self) -> Vec { diff --git a/testing/ef_tests/tests/tests.rs b/testing/ef_tests/tests/tests.rs index c02a9240fd..ebce9a721e 100644 --- a/testing/ef_tests/tests/tests.rs +++ b/testing/ef_tests/tests/tests.rs @@ -1079,106 +1079,34 @@ fn fork_choice_get_parent_payload_status() { ForkChoiceHandler::::new("get_parent_payload_status").run(); } -// Compliance tests surface real consensus deltas (proposer-boost timing, viable-tree -// weights) that we want to be able to run on demand without blocking CI. They are gated -// behind `#[ignore]` and run via `scripts/compliance-fc-report.sh` (which passes -// `--include-ignored` to cargo test). To run them directly: -// cargo test --release --features "ef_tests,fake_crypto" -p ef_tests --test tests \ -// fork_choice_compliance_ -- --include-ignored #[test] -#[ignore] -fn fork_choice_compliance_attester_slashing_test_fulu() { - ForkChoiceComplianceHandler::::new("attester_slashing_test") - .only_fork(ForkName::Fulu) - .run(); +fn fork_choice_compliance_attester_slashing_test() { + ForkChoiceComplianceHandler::::new("attester_slashing_test").run(); } #[test] -#[ignore] -fn fork_choice_compliance_attester_slashing_test_gloas() { - ForkChoiceComplianceHandler::::new("attester_slashing_test") - .only_fork(ForkName::Gloas) - .run(); +fn fork_choice_compliance_block_cover_test() { + ForkChoiceComplianceHandler::::new("block_cover_test").run(); } #[test] -#[ignore] -fn fork_choice_compliance_block_cover_test_fulu() { - ForkChoiceComplianceHandler::::new("block_cover_test") - .only_fork(ForkName::Fulu) - .run(); +fn fork_choice_compliance_block_tree_test() { + ForkChoiceComplianceHandler::::new("block_tree_test").run(); } #[test] -#[ignore] -fn fork_choice_compliance_block_cover_test_gloas() { - ForkChoiceComplianceHandler::::new("block_cover_test") - .only_fork(ForkName::Gloas) - .run(); +fn fork_choice_compliance_block_weight_test() { + ForkChoiceComplianceHandler::::new("block_weight_test").run(); } #[test] -#[ignore] -fn fork_choice_compliance_block_tree_test_fulu() { - ForkChoiceComplianceHandler::::new("block_tree_test") - .only_fork(ForkName::Fulu) - .run(); +fn fork_choice_compliance_invalid_message_test() { + ForkChoiceComplianceHandler::::new("invalid_message_test").run(); } #[test] -#[ignore] -fn fork_choice_compliance_block_tree_test_gloas() { - ForkChoiceComplianceHandler::::new("block_tree_test") - .only_fork(ForkName::Gloas) - .run(); -} - -#[test] -#[ignore] -fn fork_choice_compliance_block_weight_test_fulu() { - ForkChoiceComplianceHandler::::new("block_weight_test") - .only_fork(ForkName::Fulu) - .run(); -} - -#[test] -#[ignore] -fn fork_choice_compliance_block_weight_test_gloas() { - ForkChoiceComplianceHandler::::new("block_weight_test") - .only_fork(ForkName::Gloas) - .run(); -} - -#[test] -#[ignore] -fn fork_choice_compliance_invalid_message_test_fulu() { - ForkChoiceComplianceHandler::::new("invalid_message_test") - .only_fork(ForkName::Fulu) - .run(); -} - -#[test] -#[ignore] -fn fork_choice_compliance_invalid_message_test_gloas() { - ForkChoiceComplianceHandler::::new("invalid_message_test") - .only_fork(ForkName::Gloas) - .run(); -} - -#[test] -#[ignore] -fn fork_choice_compliance_shuffling_test_fulu() { - ForkChoiceComplianceHandler::::new("shuffling_test") - .only_fork(ForkName::Fulu) - .run(); -} - -#[test] -#[ignore] -fn fork_choice_compliance_shuffling_test_gloas() { - ForkChoiceComplianceHandler::::new("shuffling_test") - .only_fork(ForkName::Gloas) - .run(); +fn fork_choice_compliance_shuffling_test() { + ForkChoiceComplianceHandler::::new("shuffling_test").run(); } #[test]