From 2de68ed83cb91d9c66ec589f31c10a9864d0ec81 Mon Sep 17 00:00:00 2001 From: Mac L Date: Tue, 20 Aug 2024 00:35:57 +1000 Subject: [PATCH] Formatting --- validator_client/src/block_service.rs | 46 ++++++++++++-------------- validator_client/src/duties_service.rs | 21 +++++------- 2 files changed, 31 insertions(+), 36 deletions(-) diff --git a/validator_client/src/block_service.rs b/validator_client/src/block_service.rs index e421a71e4a..713c9d164d 100644 --- a/validator_client/src/block_service.rs +++ b/validator_client/src/block_service.rs @@ -480,30 +480,28 @@ impl BlockService { // Try the proposer nodes last, since it's likely that they don't have a // great view of attestations on the network. let unsigned_block = proposer_fallback - .request_proposers_last( - |beacon_node| async move { - let _get_timer = metrics::start_timer_vec( - &metrics::BLOCK_SERVICE_TIMES, - &[metrics::BEACON_BLOCK_HTTP_GET], - ); - Self::get_validator_block( - &beacon_node, - slot, - randao_reveal_ref, - graffiti, - proposer_index, - builder_boost_factor, - log, - ) - .await - .map_err(|e| { - BlockError::Recoverable(format!( - "Error from beacon node when producing block: {:?}", - e - )) - }) - }, - ) + .request_proposers_last(|beacon_node| async move { + let _get_timer = metrics::start_timer_vec( + &metrics::BLOCK_SERVICE_TIMES, + &[metrics::BEACON_BLOCK_HTTP_GET], + ); + Self::get_validator_block( + &beacon_node, + slot, + randao_reveal_ref, + graffiti, + proposer_index, + builder_boost_factor, + log, + ) + .await + .map_err(|e| { + BlockError::Recoverable(format!( + "Error from beacon node when producing block: {:?}", + e + )) + }) + }) .await?; self_ref diff --git a/validator_client/src/duties_service.rs b/validator_client/src/duties_service.rs index 10551a654e..c19eac8876 100644 --- a/validator_client/src/duties_service.rs +++ b/validator_client/src/duties_service.rs @@ -740,18 +740,15 @@ async fn poll_beacon_attesters( let subscriptions_ref = &subscriptions; let subscription_result = duties_service .beacon_nodes - .request( - ApiTopic::Subscriptions, - |beacon_node| async move { - let _timer = metrics::start_timer_vec( - &metrics::DUTIES_SERVICE_TIMES, - &[metrics::SUBSCRIPTIONS_HTTP_POST], - ); - beacon_node - .post_validator_beacon_committee_subscriptions(subscriptions_ref) - .await - }, - ) + .request(ApiTopic::Subscriptions, |beacon_node| async move { + let _timer = metrics::start_timer_vec( + &metrics::DUTIES_SERVICE_TIMES, + &[metrics::SUBSCRIPTIONS_HTTP_POST], + ); + beacon_node + .post_validator_beacon_committee_subscriptions(subscriptions_ref) + .await + }) .await; if subscription_result.as_ref().is_ok() { debug!(