mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-15 02:42:38 +00:00
Update Rust Edition to 2024 (#7766)
* #7749 Thanks @dknopik and @michaelsproul for your help!
This commit is contained in:
@@ -1,13 +1,13 @@
|
||||
use integer_sqrt::IntegerSquareRoot;
|
||||
use smallvec::SmallVec;
|
||||
use types::{AttestationData, BeaconState, ChainSpec, EthSpec};
|
||||
use types::{
|
||||
BeaconStateError as Error,
|
||||
consts::altair::{
|
||||
NUM_FLAG_INDICES, TIMELY_HEAD_FLAG_INDEX, TIMELY_SOURCE_FLAG_INDEX,
|
||||
TIMELY_TARGET_FLAG_INDEX,
|
||||
},
|
||||
BeaconStateError as Error,
|
||||
};
|
||||
use types::{AttestationData, BeaconState, ChainSpec, EthSpec};
|
||||
|
||||
/// Get the participation flags for a valid attestation.
|
||||
///
|
||||
|
||||
@@ -118,10 +118,10 @@ pub mod attesting_indices_electra {
|
||||
.iter()
|
||||
.enumerate()
|
||||
.filter_map(|(i, &index)| {
|
||||
if let Ok(aggregation_bit_index) = committee_offset.safe_add(i) {
|
||||
if aggregation_bits.get(aggregation_bit_index).unwrap_or(false) {
|
||||
return Some(index as u64);
|
||||
}
|
||||
if let Ok(aggregation_bit_index) = committee_offset.safe_add(i)
|
||||
&& aggregation_bits.get(aggregation_bit_index).unwrap_or(false)
|
||||
{
|
||||
return Some(index as u64);
|
||||
}
|
||||
None
|
||||
})
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
use crate::common::update_progressive_balances_cache::update_progressive_balances_on_slashing;
|
||||
use crate::{
|
||||
ConsensusContext,
|
||||
common::{decrease_balance, increase_balance, initiate_validator_exit},
|
||||
per_block_processing::errors::BlockProcessingError,
|
||||
ConsensusContext,
|
||||
};
|
||||
use safe_arith::SafeArith;
|
||||
use std::cmp;
|
||||
|
||||
@@ -7,8 +7,8 @@ use crate::{BlockProcessingError, EpochProcessingError};
|
||||
use metrics::set_gauge;
|
||||
use tracing::instrument;
|
||||
use types::{
|
||||
is_progressive_balances_enabled, BeaconState, BeaconStateError, ChainSpec, Epoch,
|
||||
EpochTotalBalances, EthSpec, ParticipationFlags, ProgressiveBalancesCache, Validator,
|
||||
BeaconState, BeaconStateError, ChainSpec, Epoch, EpochTotalBalances, EthSpec,
|
||||
ParticipationFlags, ProgressiveBalancesCache, Validator, is_progressive_balances_enabled,
|
||||
};
|
||||
|
||||
/// Initializes the `ProgressiveBalancesCache` if it is unbuilt.
|
||||
|
||||
Reference in New Issue
Block a user