mirror of
https://github.com/sigp/lighthouse.git
synced 2026-05-09 11:25:55 +00:00
Remove TTD flags and safe-slots-to-import-* (#6489)
* Delete SAFE_SLOTS_TO_IMPORT_OPTIMISTICALLY * Update fork choice tests * Remove TTD related flags * Add deprecation warning * Remove more dead code * Delete EF on_merge_block tests * Remove even more dead code * Address Mac's review comments
This commit is contained in:
@@ -25,6 +25,8 @@ excluded_paths = [
|
||||
# Intentionally omitted, as per https://github.com/sigp/lighthouse/issues/1835
|
||||
"tests/.*/.*/ssz_static/Eth1Block/",
|
||||
"tests/.*/.*/ssz_static/PowBlock/",
|
||||
# We no longer implement merge logic.
|
||||
"tests/.*/bellatrix/fork_choice/on_merge_block",
|
||||
# light_client
|
||||
"tests/.*/.*/light_client/single_merkle_proof",
|
||||
"tests/.*/.*/light_client/sync",
|
||||
|
||||
@@ -627,8 +627,8 @@ impl<E: EthSpec + TypeName> Handler for ForkChoiceHandler<E> {
|
||||
}
|
||||
|
||||
fn is_enabled_for_fork(&self, fork_name: ForkName) -> bool {
|
||||
// Merge block tests are only enabled for Bellatrix.
|
||||
if self.handler_name == "on_merge_block" && fork_name != ForkName::Bellatrix {
|
||||
// We no longer run on_merge_block tests since removing merge support.
|
||||
if self.handler_name == "on_merge_block" {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -826,12 +826,6 @@ fn fork_choice_on_block() {
|
||||
ForkChoiceHandler::<MainnetEthSpec>::new("on_block").run();
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn fork_choice_on_merge_block() {
|
||||
ForkChoiceHandler::<MinimalEthSpec>::new("on_merge_block").run();
|
||||
ForkChoiceHandler::<MainnetEthSpec>::new("on_merge_block").run();
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn fork_choice_ex_ante() {
|
||||
ForkChoiceHandler::<MinimalEthSpec>::new("ex_ante").run();
|
||||
|
||||
Reference in New Issue
Block a user