chore: cargo fmt + fix clippy warnings

This commit is contained in:
Devnet Bot
2026-05-06 16:08:52 +00:00
parent 39b6f58bc2
commit 2356bdd256
8 changed files with 58 additions and 56 deletions

View File

@@ -7,9 +7,6 @@ pub mod beacon_node_health;
pub mod payload_envelope_monitor;
use beacon_head_monitor::{BeaconHeadCache, HeadEvent, poll_head_event_from_beacon_nodes};
use payload_envelope_monitor::{
PayloadEnvelopeEvent, poll_payload_envelope_event_from_beacon_nodes,
};
use beacon_node_health::{
BeaconNodeHealth, BeaconNodeSyncDistanceTiers, ExecutionEngineHealth, IsOptimistic,
SyncDistanceTier, check_node_health,
@@ -17,6 +14,9 @@ use beacon_node_health::{
use clap::ValueEnum;
use eth2::{BeaconNodeHttpClient, Timeouts};
use futures::future;
use payload_envelope_monitor::{
PayloadEnvelopeEvent, poll_payload_envelope_event_from_beacon_nodes,
};
use sensitive_url::SensitiveUrl;
use serde::{Deserialize, Serialize, Serializer, ser::SerializeStruct};
use slot_clock::SlotClock;
@@ -109,15 +109,10 @@ pub fn start_fallback_updater_service<T: SlotClock + 'static, E: EthSpec>(
let payload_envelope_future = async move {
loop {
if let Err(error) =
poll_payload_envelope_event_from_beacon_nodes::<E, T>(
beacon_nodes_ref2.clone(),
)
.await
poll_payload_envelope_event_from_beacon_nodes::<E, T>(beacon_nodes_ref2.clone())
.await
{
warn!(
error,
"Payload envelope service failed, retrying next slot"
);
warn!(error, "Payload envelope service failed, retrying next slot");
let sleep_time = beacon_nodes_ref2
.slot_clock

View File

@@ -84,7 +84,8 @@ pub async fn poll_payload_envelope_event_from_beacon_nodes<E: EthSpec, T: SlotCl
Ok(event) => {
warn!(
event_kind = event.topic_name(),
candidate_index, "Received unexpected event from BN in payload envelope monitor"
candidate_index,
"Received unexpected event from BN in payload envelope monitor"
);
continue;
}

View File

@@ -174,19 +174,12 @@ impl<S: ValidatorStore + 'static, T: SlotClock + 'static> InclusionListService<S
let il_offset = slot_duration * il_due_fraction / 10000;
// Compute the target slot (the slot we'll be in after waiting)
let target_slot = self
.slot_clock
.now()
.map(|s| s + 1)
.unwrap_or_default();
let target_slot = self.slot_clock.now().map(|s| s + 1).unwrap_or_default();
// Race: wait for either the IL deadline or a payload envelope event
// for the target slot.
self.wait_for_il_trigger(
duration_to_next_slot + il_offset,
target_slot,
)
.await;
self.wait_for_il_trigger(duration_to_next_slot + il_offset, target_slot)
.await;
if let Err(e) = self.spawn_inclusion_list_task(slot_duration, &chain_spec) {
crit!(