gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-08 17:26:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

use enabled fork methods

Browse Source
This commit is contained in:
realbigsean
2024-07-15 15:08:57 -07:00
parent d88302a914
commit c48cd52a9d
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
testing/ef_tests/src/cases/operations.rs
View File

@@ -298,7 +298,7 @@ impl<E: EthSpec> Operation<E> for BeaconBlockBody<E, FullPayload<E>> {
} }
fn is_enabled_for_fork(fork_name: ForkName) -> bool { fn is_enabled_for_fork(fork_name: ForkName) -> bool {
fork_name >= ForkName::Bellatrix fork_name.bellatrix_enabled()
} }
fn decode(path: &Path, fork_name: ForkName, _spec: &ChainSpec) -> Result<Self, Error> { fn decode(path: &Path, fork_name: ForkName, _spec: &ChainSpec) -> Result<Self, Error> {
@@ -340,7 +340,7 @@ impl<E: EthSpec> Operation<E> for BeaconBlockBody<E, BlindedPayload<E>> {
} }
fn is_enabled_for_fork(fork_name: ForkName) -> bool { fn is_enabled_for_fork(fork_name: ForkName) -> bool {
fork_name >= ForkName::Bellatrix fork_name.bellatrix_enabled()
} }
fn decode(path: &Path, fork_name: ForkName, _spec: &ChainSpec) -> Result<Self, Error> { fn decode(path: &Path, fork_name: ForkName, _spec: &ChainSpec) -> Result<Self, Error> {
@@ -396,7 +396,7 @@ impl<E: EthSpec> Operation<E> for WithdrawalsPayload<E> {
} }
fn is_enabled_for_fork(fork_name: ForkName) -> bool { fn is_enabled_for_fork(fork_name: ForkName) -> bool {
fork_name >= ForkName::Capella fork_name.capella_enabled()
} }
fn decode(path: &Path, fork_name: ForkName, _spec: &ChainSpec) -> Result<Self, Error> { fn decode(path: &Path, fork_name: ForkName, _spec: &ChainSpec) -> Result<Self, Error> {
@@ -428,7 +428,7 @@ impl<E: EthSpec> Operation<E> for SignedBlsToExecutionChange {
} }
fn is_enabled_for_fork(fork_name: ForkName) -> bool { fn is_enabled_for_fork(fork_name: ForkName) -> bool {
fork_name >= ForkName::Capella fork_name.capella_enabled()
} }
fn decode(path: &Path, _fork_name: ForkName, _spec: &ChainSpec) -> Result<Self, Error> { fn decode(path: &Path, _fork_name: ForkName, _spec: &ChainSpec) -> Result<Self, Error> {
@@ -451,7 +451,7 @@ impl<E: EthSpec> Operation<E> for ExecutionLayerWithdrawalRequest {
} }
fn is_enabled_for_fork(fork_name: ForkName) -> bool { fn is_enabled_for_fork(fork_name: ForkName) -> bool {
fork_name >= ForkName::Electra fork_name.electra_enabled()
} }
fn decode(path: &Path, _fork_name: ForkName, _spec: &ChainSpec) -> Result<Self, Error> { fn decode(path: &Path, _fork_name: ForkName, _spec: &ChainSpec) -> Result<Self, Error> {
@@ -474,7 +474,7 @@ impl<E: EthSpec> Operation<E> for DepositRequest {
} }
fn is_enabled_for_fork(fork_name: ForkName) -> bool { fn is_enabled_for_fork(fork_name: ForkName) -> bool {
fork_name >= ForkName::Electra fork_name.electra_enabled()
} }
fn decode(path: &Path, _fork_name: ForkName, _spec: &ChainSpec) -> Result<Self, Error> { fn decode(path: &Path, _fork_name: ForkName, _spec: &ChainSpec) -> Result<Self, Error> {
@@ -497,7 +497,7 @@ impl<E: EthSpec> Operation<E> for SignedConsolidation {
} }
fn is_enabled_for_fork(fork_name: ForkName) -> bool { fn is_enabled_for_fork(fork_name: ForkName) -> bool {
fork_name >= ForkName::Electra fork_name.electra_enabled()
} }
fn decode(path: &Path, _fork_name: ForkName, _spec: &ChainSpec) -> Result<Self, Error> { fn decode(path: &Path, _fork_name: ForkName, _spec: &ChainSpec) -> Result<Self, Error> {

2
testing/ef_tests/src/handler.rs
View File

@@ -620,7 +620,7 @@ impl<E: EthSpec + TypeName> Handler for OptimisticSyncHandler<E> {
} }
fn is_enabled_for_fork(&self, fork_name: ForkName) -> bool { fn is_enabled_for_fork(&self, fork_name: ForkName) -> bool {
fork_name >= ForkName::Bellatrix && cfg!(not(feature = "fake_crypto")) fork_name.bellatrix_enabled() && cfg!(not(feature = "fake_crypto"))
} }
} }