Rename Merge to Bellatrix (#5601)

* Rename Merge to Bellatrix

* Remove tree-hash-cache which got readded from the rebase
This commit is contained in:
Mac L
2024-04-26 06:19:41 +10:00
committed by GitHub
parent 320345695d
commit 13f94ef0f3
104 changed files with 808 additions and 714 deletions

View File

@@ -217,8 +217,8 @@ impl<T, E> SszStaticHandler<T, E> {
Self::for_forks(vec![ForkName::Altair])
}
pub fn merge_only() -> Self {
Self::for_forks(vec![ForkName::Merge])
pub fn bellatrix_only() -> Self {
Self::for_forks(vec![ForkName::Bellatrix])
}
pub fn capella_only() -> Self {
@@ -558,7 +558,7 @@ 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::Merge {
if self.handler_name == "on_merge_block" && fork_name != ForkName::Bellatrix {
return false;
}
@@ -823,7 +823,7 @@ impl<E: EthSpec + TypeName> Handler for KzgInclusionMerkleProofValidityHandler<E
// Enabled in Deneb
fork_name != ForkName::Base
&& fork_name != ForkName::Altair
&& fork_name != ForkName::Merge
&& fork_name != ForkName::Bellatrix
&& fork_name != ForkName::Capella
}
}