make "accepts_ssz" and "accepts_json" inside handle_submit_block_impl

body to dedup (match pattern in get_header.rs) + some clippy warnings

Author: JasonVranek

bin/tests/binary.rs

@@ -133,7 +133,7 @@ fn test_init_compose_file_pbs_service_structure() {
     // Config file must be mounted inside the container.
     let volumes = pbs["volumes"].as_sequence().expect("volumes is a list");
     assert!(
-        volumes.iter().any(|v| v.as_str().map_or(false, |s| s.ends_with(":/cb-config.toml:ro"))),
+        volumes.iter().any(|v| v.as_str().is_some_and(|s| s.ends_with(":/cb-config.toml:ro"))),
         "config must be mounted at /cb-config.toml"
     );
 
@@ -145,7 +145,7 @@ fn test_init_compose_file_pbs_service_structure() {
     // Port 18550 must be exposed.
     let ports = pbs["ports"].as_sequence().expect("ports is a list");
     assert!(
-        ports.iter().any(|p| p.as_str().map_or(false, |s| s.contains("18550"))),
+        ports.iter().any(|p| p.as_str().is_some_and(|s| s.contains("18550"))),
         "port 18550 must be exposed"
     );
 

crates/pbs/src/routes/submit_block.rs

@@ -70,8 +70,6 @@ async fn handle_submit_block_impl<S: BuilderApiState, A: BuilderApi<S>>(
     // Honor caller q-value preference: pick the highest-priority encoding that
     // we can actually produce. Server preference for tiebreaks is SSZ first.
     let response_encoding = accept_types.preferred(&[EncodingType::Ssz, EncodingType::Json]);
-    let accepts_ssz = response_encoding == Some(EncodingType::Ssz);
-    let accepts_json = response_encoding == Some(EncodingType::Json);
 
     info!(ua, ms_into_slot = now.saturating_sub(slot_start_ms), "new request");
 
@@ -126,28 +124,29 @@ async fn handle_submit_block_impl<S: BuilderApiState, A: BuilderApi<S>>(
                     .with_label_values(&["200", SUBMIT_BLINDED_BLOCK_ENDPOINT_TAG])
                     .inc();
 
-                // Try SSZ
-                if accepts_ssz {
-                    let mut response = payload_and_blobs.data.as_ssz_bytes().into_response();
-
-                    let content_type_header = EncodingType::Ssz.content_type_header().clone();
-                    response.headers_mut().insert(CONTENT_TYPE, content_type_header);
-                    response.headers_mut().insert(
-                        CONSENSUS_VERSION_HEADER,
-                        HeaderValue::from_str(&payload_and_blobs.version.to_string()).unwrap(),
-                    );
-                    info!("sending response as SSZ");
-                    return Ok(response);
-                }
-
-                // Handle JSON
-                if accepts_json {
-                    Ok((StatusCode::OK, axum::Json(payload_and_blobs)).into_response())
-                } else {
-                    // This shouldn't ever happen but the compiler needs it
-                    Err(PbsClientError::DecodeError(
+                // Three arms: no viable encoding (unreachable in practice —
+                // `get_accept_types` errors earlier if the caller offers
+                // nothing we support), SSZ, or JSON.
+                match response_encoding {
+                    None => Err(PbsClientError::DecodeError(
                         "no viable accept types in request".to_string(),
-                    ))
+                    )),
+                    Some(EncodingType::Ssz) => {
+                        let mut response = payload_and_blobs.data.as_ssz_bytes().into_response();
+
+                        let content_type_header = EncodingType::Ssz.content_type_header().clone();
+                        response.headers_mut().insert(CONTENT_TYPE, content_type_header);
+                        response.headers_mut().insert(
+                            CONSENSUS_VERSION_HEADER,
+                            HeaderValue::from_str(&payload_and_blobs.version.to_string()).unwrap(),
+                        );
+                        info!("sending response as SSZ");
+                        Ok(response)
+                    }
+                    Some(EncodingType::Json) => {
+                        info!("sending response as JSON");
+                        Ok((StatusCode::OK, axum::Json(payload_and_blobs)).into_response())
+                    }
                 }
             }
         },

tests/tests/pbs_get_header.rs

@@ -213,6 +213,7 @@ async fn test_get_header_multitype_json_light() -> Result<()> {
 /// requires a non-None rpc_url to start in that mode. A non-existent address is
 /// fine; if the parent block fetch fails the relay response is still returned
 /// (extra validation is skipped with a warning).
+#[allow(clippy::too_many_arguments)]
 async fn test_get_header_impl(
     accept_types: Vec<EncodingType>,
     relay_types: HashSet<EncodingType>,