Fix builder preference retries and HTTP status handling

common/eth2/src/lib.rs

@@ -2234,47 +2234,55 @@ impl BeaconNodeHttpClient {
     /// Ask the beacon node to submit builder preferences ahead of the bid request (beacon-APIs #630).
     /// The body is a flat list of entries, each naming its own `proposer_pubkey`, so one request may
     /// cover several proposers. `fork_name` is sent as the required `Eth-Consensus-Version` header.
+    /// Returns the HTTP response, including error responses, so callers can distinguish its status
+    /// from an application-specific error code in the body.
     pub async fn post_validator_builder_preferences(
         &self,
         entries: &SubmittedBuilderPreferences,
         fork_name: ForkName,
-    ) -> Result<(), Error> {
+    ) -> Result<Response, Error> {
         let mut path = self.eth_path(V1)?;
 
         path.path_segments_mut()
             .map_err(|()| Error::InvalidUrl(self.server.clone()))?
             .push("validator")
             .push("builder_preferences");
 
-        self.post_with_timeout_and_consensus_header(
-            path,
-            &entries,
-            self.timeouts.default,
-            fork_name,
-        )
-        .await?;
-
-        Ok(())
+        self.client
+            .post(path)
+            .timeout(self.timeouts.default)
+            .header(CONSENSUS_VERSION_HEADER, fork_name.to_string())
+            .json(entries)
+            .send()
+            .await
+            .map_err(Into::into)
     }
 
     /// `POST validator/builder_preferences` (SSZ)
+    ///
+    /// Returns the HTTP response, including error responses, as in
+    /// [`Self::post_validator_builder_preferences`].
     pub async fn post_validator_builder_preferences_ssz(
         &self,
         entries: &SubmittedBuilderPreferences,
         fork_name: ForkName,
-    ) -> Result<(), Error> {
+    ) -> Result<Response, Error> {
         let mut path = self.eth_path(V1)?;
 
         path.path_segments_mut()
             .map_err(|()| Error::InvalidUrl(self.server.clone()))?
             .push("validator")
             .push("builder_preferences");
 
-        let ssz_body = entries.as_ssz_bytes();
-        self.post_generic_with_consensus_version_and_ssz_body(path, ssz_body, None, fork_name)
-            .await?;
-
-        Ok(())
+        self.client
+            .post(path)
+            .timeout(self.timeouts.default)
+            .header(CONSENSUS_VERSION_HEADER, fork_name.to_string())
+            .header(CONTENT_TYPE_HEADER, SSZ_CONTENT_TYPE_HEADER)
+            .body(entries.as_ssz_bytes())
+            .send()
+            .await
+            .map_err(Into::into)
     }
 
     /// `GET config/fork_schedule`

testing/validator_test_rig/src/mock_beacon_node.rs

@@ -356,23 +356,80 @@ impl<E: EthSpec> MockBeaconNode<E> {
             .create()
     }
 
-    /// Mocks `POST /eth/v1/validator/builder_preferences` (SSZ), matching only submissions whose
-    /// `Eth-Consensus-Version` header names `fork_name`.
-    pub fn mock_post_validator_builder_preferences_ssz(&mut self, fork_name: ForkName) -> Mock {
-        let received = Arc::clone(&self.builder_preferences);
+    /// Mocks `POST /eth/v1/validator/builder_preferences` (SSZ).
+    pub fn mock_post_validator_builder_preferences_ssz(
+        &mut self,
+        fork_name: ForkName,
+        status: u16,
+        response_body: &str,
+    ) -> Mock {
+        self.mock_post_validator_builder_preferences_ssz_with_hook(
+            fork_name,
+            status,
+            response_body,
+            || {},
+        )
+    }
+
+    /// Mocks `POST /eth/v1/validator/builder_preferences` (SSZ) and runs `hook` after receipt.
+    pub fn mock_post_validator_builder_preferences_ssz_with_hook<F>(
+        &mut self,
+        fork_name: ForkName,
+        status: u16,
+        response_body: &str,
+        hook: F,
+    ) -> Mock
+    where
+        F: Fn() + Send + Sync + 'static,
+    {
+        let builder_preferences = Arc::clone(&self.builder_preferences);
+        let response_body = response_body.as_bytes().to_vec();
+
         self.server
-            .mock(
-                "POST",
-                Matcher::Regex(r"^/eth/v1/validator/builder_preferences$".to_string()),
+            .mock("POST", "/eth/v1/validator/builder_preferences")
+            .match_header("content-type", "application/octet-stream")
+            .match_header(
+                CONSENSUS_VERSION_HEADER,
+                Matcher::Exact(fork_name.to_string()),
             )
-            .match_header("Eth-Consensus-Version", fork_name.to_string().as_str())
-            .with_status(200)
+            .with_status(status as usize)
+            .with_header("content-type", "application/json")
             .with_body_from_request(move |request| {
                 let body = request.body().expect("Failed to get request body");
-                let preferences = SubmittedBuilderPreferences::from_ssz_bytes(body)
-                    .expect("Failed to deserialize SubmittedBuilderPreferences from SSZ");
-                received.lock().unwrap().push(preferences);
-                vec![]
+                let entries = SubmittedBuilderPreferences::from_ssz_bytes(body)
+                    .expect("Failed to deserialize builder preferences as SSZ");
+                builder_preferences.lock().unwrap().push(entries);
+                hook();
+                response_body.clone()
+            })
+            .create()
+    }
+
+    /// Mocks `POST /eth/v1/validator/builder_preferences` (JSON).
+    pub fn mock_post_validator_builder_preferences_json(
+        &mut self,
+        fork_name: ForkName,
+        status: u16,
+        response_body: &str,
+    ) -> Mock {
+        let builder_preferences = Arc::clone(&self.builder_preferences);
+        let response_body = response_body.as_bytes().to_vec();
+
+        self.server
+            .mock("POST", "/eth/v1/validator/builder_preferences")
+            .match_header("content-type", "application/json")
+            .match_header(
+                CONSENSUS_VERSION_HEADER,
+                Matcher::Exact(fork_name.to_string()),
+            )
+            .with_status(status as usize)
+            .with_header("content-type", "application/json")
+            .with_body_from_request(move |request| {
+                let body = request.body().expect("Failed to get request body");
+                let entries: SubmittedBuilderPreferences = serde_json::from_slice(body)
+                    .expect("Failed to deserialize builder preferences as JSON");
+                builder_preferences.lock().unwrap().push(entries);
+                response_body.clone()
             })
             .create()
     }