mirror of
https://github.com/sigp/lighthouse.git
synced 2026-06-16 18:28:42 +00:00
Make proposer_score_boost non-optional in ChainSpec (#9386)
Co-Authored-By: dapplion <35266934+dapplion@users.noreply.github.com>
This commit is contained in:
@@ -144,7 +144,7 @@ impl ForkChoiceTestDefinition {
|
||||
pub fn run(self) {
|
||||
let spec = self.spec.unwrap_or_else(|| {
|
||||
let mut spec = MainnetEthSpec::default_spec();
|
||||
spec.proposer_score_boost = Some(50);
|
||||
spec.proposer_score_boost = 50;
|
||||
// Legacy test definitions target pre-Gloas behaviour unless explicitly overridden.
|
||||
spec.gloas_fork_epoch = None;
|
||||
spec
|
||||
|
||||
@@ -2,7 +2,7 @@ use super::*;
|
||||
|
||||
fn gloas_spec() -> ChainSpec {
|
||||
let mut spec = MainnetEthSpec::default_spec();
|
||||
spec.proposer_score_boost = Some(50);
|
||||
spec.proposer_score_boost = 50;
|
||||
spec.gloas_fork_epoch = Some(Epoch::new(0));
|
||||
spec
|
||||
}
|
||||
@@ -977,7 +977,7 @@ mod tests {
|
||||
|
||||
fn gloas_fork_boundary_spec() -> ChainSpec {
|
||||
let mut spec = MainnetEthSpec::default_spec();
|
||||
spec.proposer_score_boost = Some(50);
|
||||
spec.proposer_score_boost = 50;
|
||||
spec.gloas_fork_epoch = Some(Epoch::new(1));
|
||||
spec
|
||||
}
|
||||
|
||||
@@ -1861,10 +1861,7 @@ fn get_proposer_score<E: EthSpec>(
|
||||
justified_balances: &JustifiedBalances,
|
||||
spec: &ChainSpec,
|
||||
) -> Result<u64, Error> {
|
||||
let Some(proposer_score_boost) = spec.proposer_score_boost else {
|
||||
return Ok(0);
|
||||
};
|
||||
calculate_committee_fraction::<E>(justified_balances, proposer_score_boost)
|
||||
calculate_committee_fraction::<E>(justified_balances, spec.proposer_score_boost)
|
||||
.ok_or(Error::ProposerBoostOverflow(0))
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user