Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Impl Ord on ForkName for ChainSpec usage #5531

Merged
merged 2 commits into from
Apr 10, 2024
Merged

Impl Ord on ForkName for ChainSpec usage #5531

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad9fe72
Impl Ord on ForkName for ChainSpec usage
dapplion Apr 5, 2024
c34b26e
add fork ord consistent test
realbigsean Apr 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 29 additions & 32 deletions consensus/types/src/chain_spec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,12 +334,12 @@ impl ChainSpec {
}

pub fn inactivity_penalty_quotient_for_fork(&self, fork_name: ForkName) -> u64 {
match fork_name {
ForkName::Base => self.inactivity_penalty_quotient,
ForkName::Altair => self.inactivity_penalty_quotient_altair,
ForkName::Merge => self.inactivity_penalty_quotient_bellatrix,
ForkName::Capella => self.inactivity_penalty_quotient_bellatrix,
ForkName::Deneb | ForkName::Electra => self.inactivity_penalty_quotient_bellatrix,
if fork_name >= ForkName::Merge {
self.inactivity_penalty_quotient_bellatrix
} else if fork_name >= ForkName::Altair {
self.inactivity_penalty_quotient_altair
} else {
self.inactivity_penalty_quotient
}
}

Expand All @@ -348,13 +348,13 @@ impl ChainSpec {
&self,
state: &BeaconState<E>,
) -> u64 {
match state {
BeaconState::Base(_) => self.proportional_slashing_multiplier,
BeaconState::Altair(_) => self.proportional_slashing_multiplier_altair,
BeaconState::Merge(_) => self.proportional_slashing_multiplier_bellatrix,
BeaconState::Capella(_) => self.proportional_slashing_multiplier_bellatrix,
BeaconState::Deneb(_) => self.proportional_slashing_multiplier_bellatrix,
BeaconState::Electra(_) => self.proportional_slashing_multiplier_bellatrix,
let fork_name = state.fork_name_unchecked();
if fork_name >= ForkName::Merge {
self.proportional_slashing_multiplier_bellatrix
} else if fork_name >= ForkName::Altair {
self.proportional_slashing_multiplier_altair
} else {
self.proportional_slashing_multiplier
}
}

Expand All @@ -363,13 +363,13 @@ impl ChainSpec {
&self,
state: &BeaconState<E>,
) -> u64 {
match state {
BeaconState::Base(_) => self.min_slashing_penalty_quotient,
BeaconState::Altair(_) => self.min_slashing_penalty_quotient_altair,
BeaconState::Merge(_) => self.min_slashing_penalty_quotient_bellatrix,
BeaconState::Capella(_) => self.min_slashing_penalty_quotient_bellatrix,
BeaconState::Deneb(_) => self.min_slashing_penalty_quotient_bellatrix,
BeaconState::Electra(_) => self.min_slashing_penalty_quotient_bellatrix,
let fork_name = state.fork_name_unchecked();
if fork_name >= ForkName::Merge {
self.min_slashing_penalty_quotient_bellatrix
} else if fork_name >= ForkName::Altair {
self.min_slashing_penalty_quotient_altair
} else {
self.min_slashing_penalty_quotient
}
}

Expand Down Expand Up @@ -531,22 +531,19 @@ impl ChainSpec {
}

pub fn max_blocks_by_root_request(&self, fork_name: ForkName) -> usize {
match fork_name {
ForkName::Base | ForkName::Altair | ForkName::Merge | ForkName::Capella => {
self.max_blocks_by_root_request
}
ForkName::Deneb | ForkName::Electra => self.max_blocks_by_root_request_deneb,
if fork_name >= ForkName::Deneb {
self.max_blocks_by_root_request_deneb
} else {
self.max_blocks_by_root_request
}
}

pub fn max_request_blocks(&self, fork_name: ForkName) -> usize {
let max_request_blocks = match fork_name {
ForkName::Base | ForkName::Altair | ForkName::Merge | ForkName::Capella => {
self.max_request_blocks
}
ForkName::Deneb | ForkName::Electra => self.max_request_blocks_deneb,
};
max_request_blocks as usize
if fork_name >= ForkName::Deneb {
self.max_request_blocks_deneb as usize
} else {
self.max_request_blocks as usize
}
}

/// Returns a `ChainSpec` compatible with the Ethereum Foundation specification.
Expand Down
4 changes: 3 additions & 1 deletion consensus/types/src/fork_name.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ use ssz_derive::{Decode, Encode};
use std::fmt::{self, Display, Formatter};
use std::str::FromStr;

#[derive(Debug, Clone, Copy, Decode, Encode, PartialEq, Eq, Hash, Serialize, Deserialize)]
#[derive(
Debug, Clone, Copy, Decode, Encode, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize,
)]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would be good to add a test that checks agreement between ForkName::list_all and Ord

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added one here c34b26e

#[serde(try_from = "String")]
#[serde(into = "String")]
#[ssz(enum_behaviour = "tag")]
Expand Down
Loading