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

[Merged by Bors] - simplify calculate_committee_fraction #4213

Closed
wants to merge 4 commits into from
Closed

[Merged by Bors] - simplify calculate_committee_fraction #4213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d84044d
simplify calculate_committee_fraction
eserilev Apr 20, 2023
02c3fb5
divide by slots_per_epoch
eserilev Apr 20, 2023
231c62a
updated magic numbers to allow test to pass
eserilev Apr 20, 2023
54edc6b
Merge branch 'unstable' of https://github.com/sigp/lighthouse into si…
eserilev Apr 27, 2023
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
6 changes: 3 additions & 3 deletions consensus/proto_array/src/fork_choice_test_definition/execution_status.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -987,11 +987,11 @@ pub fn get_execution_status_test_definition_03() -> ForkChoiceTestDefinition {

ops.push(Operation::AssertWeight {
block_root: get_root(0),
weight: 33_000,
weight: 33_250,
});
ops.push(Operation::AssertWeight {
block_root: get_root(1),
weight: 33_000,
weight: 33_250,
});
ops.push(Operation::AssertWeight {
block_root: get_root(2),
Expand All @@ -1000,7 +1000,7 @@ pub fn get_execution_status_test_definition_03() -> ForkChoiceTestDefinition {
ops.push(Operation::AssertWeight {
block_root: get_root(3),
// This is a "magic number" generated from `calculate_committee_fraction`.
weight: 31_000,
weight: 31_250,
});

// Invalidate the payload of 3.
Expand Down
6 changes: 1 addition & 5 deletions consensus/proto_array/src/proto_array.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1055,13 +1055,9 @@ pub fn calculate_committee_fraction<E: EthSpec>(
justified_balances: &JustifiedBalances,
proposer_score_boost: u64,
) -> Option<u64> {
let average_balance = justified_balances
let committee_weight = justified_balances
.total_effective_balance
.checked_div(justified_balances.num_active_validators)?;
let committee_size = justified_balances
.num_active_validators
.checked_div(E::slots_per_epoch())?;
let committee_weight = committee_size.checked_mul(average_balance)?;
committee_weight
.checked_mul(proposer_score_boost)?
.checked_div(100)
Expand Down