From c276fe6a1daa8908a88312653fb0bd7d23b12ab9 Mon Sep 17 00:00:00 2001 From: Jimmy Chen Date: Tue, 20 Jan 2026 18:01:15 +1100 Subject: [PATCH] format and lint fixes --- .../state_processing/src/envelope_processing.rs | 4 ++-- .../state_processing/src/per_block_processing.rs | 15 +++++++++++---- .../src/per_epoch_processing/single_pass.rs | 4 ++-- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/consensus/state_processing/src/envelope_processing.rs b/consensus/state_processing/src/envelope_processing.rs index 1421e57098..d0f5d5a999 100644 --- a/consensus/state_processing/src/envelope_processing.rs +++ b/consensus/state_processing/src/envelope_processing.rs @@ -227,7 +227,7 @@ pub fn envelope_processing( let payment_index = E::slots_per_epoch() .safe_add(state.slot().as_u64().safe_rem(E::slots_per_epoch())?)? as usize; - let mut payment = state + let payment = state .builder_pending_payments()? .get(payment_index) .ok_or(EnvelopeProcessingError::BuilderPaymentIndexOutOfBounds( @@ -236,7 +236,7 @@ pub fn envelope_processing( .clone(); let amount = payment.withdrawal.amount; if amount > 0 { - let exit_queue_epoch = state.compute_exit_epoch_and_update_churn(amount, spec)?; + let _exit_queue_epoch = state.compute_exit_epoch_and_update_churn(amount, spec)?; state .builder_pending_withdrawals_mut()? .push(payment.withdrawal) diff --git a/consensus/state_processing/src/per_block_processing.rs b/consensus/state_processing/src/per_block_processing.rs index ae7e4bb0a5..8aeb383ef7 100644 --- a/consensus/state_processing/src/per_block_processing.rs +++ b/consensus/state_processing/src/per_block_processing.rs @@ -714,9 +714,7 @@ pub fn get_builders_sweep_withdrawals( withdrawal_index.safe_add_assign(1)?; } - builder_index = builder_index - .safe_add(1)? - .safe_rem(builders.len() as u64)?; + builder_index = builder_index.safe_add(1)?.safe_rem(builders.len() as u64)?; processed_count.safe_add_assign(1)?; } @@ -801,7 +799,16 @@ pub fn get_validators_sweep_withdrawals( pub fn get_expected_withdrawals( state: &BeaconState, spec: &ChainSpec, -) -> Result<(Withdrawals, Option, Option, Option, u64), BlockProcessingError> { +) -> Result< + ( + Withdrawals, + Option, + Option, + Option, + u64, + ), + BlockProcessingError, +> { let mut withdrawal_index = state.next_withdrawal_index()?; let mut withdrawals = Vec::::with_capacity(E::max_withdrawals_per_payload()); diff --git a/consensus/state_processing/src/per_epoch_processing/single_pass.rs b/consensus/state_processing/src/per_epoch_processing/single_pass.rs index c661d6b210..b648f23226 100644 --- a/consensus/state_processing/src/per_epoch_processing/single_pass.rs +++ b/consensus/state_processing/src/per_epoch_processing/single_pass.rs @@ -551,10 +551,10 @@ fn process_builder_pending_payments( .try_for_each(|payment| -> Result<(), Error> { let exit_queue_epoch = state.compute_exit_epoch_and_update_churn(payment.withdrawal.amount, spec)?; - let withdrawable_epoch = + let _withdrawable_epoch = exit_queue_epoch.safe_add(spec.min_validator_withdrawability_delay)?; - let mut withdrawal = payment.withdrawal.clone(); + let withdrawal = payment.withdrawal.clone(); state.builder_pending_withdrawals_mut()?.push(withdrawal)?; Ok(()) })?;