Clean up some logs and error handling

michaelsproul · michaelsproul · commit 239160e494a3 · 2025-09-03T10:59:27.000+10:00
diff --git a/validator_client/validator_services/src/duties_service.rs b/validator_client/validator_services/src/duties_service.rs
@@ -117,13 +117,16 @@ pub struct SubscriptionSlots {
 #[derive(Copy, Clone, Debug)]
 pub struct SelectionProofConfig {
     pub lookahead_slot: u64,
-    pub computation_offset: Duration, // The seconds to compute the selection proof before a slot
-    pub selections_endpoint: bool, // whether to call the selections endpoint, true for DVT with middleware
-    pub parallel_sign: bool, // whether to sign the selection proof in parallel, true in distributed mode
+    /// The seconds to compute the selection proof before a slot.
+    pub computation_offset: Duration,
+    /// Whether to call the selections endpoint, true for DVT with middleware.
+    pub selections_endpoint: bool,
+    /// Whether to sign the selection proof in parallel, true in distributed mode.
+    pub parallel_sign: bool,
 }
 
-impl SelectionProofConfig {
-    // Create a default associated function to be passed in DutiesServiceBuilder::new()
+/// The default config for selection proofs covers the non-DVT case.
+impl Default for SelectionProofConfig {
     fn default() -> Self {
         Self {
             lookahead_slot: 0,
@@ -175,11 +178,18 @@ async fn make_selection_proof<S: ValidatorStore + 'static, T: SlotClock>(
             })
             .await;
 
-        let response_data = &middleware_response
+        let response_data = middleware_response
             .map_err(|e| {
                 Error::FailedToProduceSelectionProof(ValidatorStoreError::Middleware(e.to_string()))
             })?
-            .data[0];
+            .data
+            .pop()
+            .ok_or_else(|| {
+                Error::FailedToProduceSelectionProof(ValidatorStoreError::Middleware(format!(
+                    "attestation selection proof - empty response for validator {}",
+                    duty.validator_index
+                )))
+            })?;
 
         debug!(
             "validator_index" = response_data.validator_index,
@@ -188,7 +198,7 @@ async fn make_selection_proof<S: ValidatorStore + 'static, T: SlotClock>(
             "full selection proof" = ?response_data.selection_proof,
             "Received selection from middleware"
         );
-        SelectionProof::from(response_data.selection_proof.clone())
+        SelectionProof::from(response_data.selection_proof)
     } else {
         validator_store
             .produce_selection_proof(duty.pubkey, duty.slot)
diff --git a/validator_client/validator_services/src/sync.rs b/validator_client/validator_services/src/sync.rs
@@ -1,5 +1,5 @@
 use crate::duties_service::{DutiesService, Error, SelectionProofConfig};
-use eth2::types::{Signature, SyncCommitteeSelection};
+use eth2::types::SyncCommitteeSelection;
 use futures::future::join_all;
 use futures::stream::{FuturesUnordered, StreamExt};
 use logging::crit;
@@ -530,7 +530,7 @@ pub async fn make_sync_selection_proof<S: ValidatorStore, T: SlotClock>(
             "slot" = %proof_slot,
             "subcommittee_index" = *subnet_id,
             // This is partial selection proof
-            "partial selection proof" = ?Signature::from(selection_proof.clone()),
+            "partial selection proof" = ?selection_proof,
             "Sending sync selection to middleware"
         );
 
@@ -557,8 +557,15 @@ pub async fn make_sync_selection_proof<S: ValidatorStore, T: SlotClock>(
             .await;
 
         match middleware_response {
-            Ok(response) => {
-                let response_data = &response.data[0];
+            Ok(mut response) => {
+                let Some(response_data) = response.data.pop() else {
+                    error!(
+                        validator_index = duty.validator_index,
+                        slot = %proof_slot,
+                        "Empty response from sync selection middleware",
+                    );
+                    return None;
+                };
                 debug!(
                     "validator_index" = response_data.validator_index,
                     "slot" = %response_data.slot,
@@ -570,7 +577,7 @@ pub async fn make_sync_selection_proof<S: ValidatorStore, T: SlotClock>(
 
                 // Convert the response to a SyncSelectionProof
                 let full_selection_proof =
-                    SyncSelectionProof::from(response_data.selection_proof.clone());
+                    SyncSelectionProof::from(response_data.selection_proof);
                 Some(full_selection_proof)
             }
             Err(e) => {
