cargo fmt + fix clippy

Author: JasonVranek

benches/pbs/src/main.rs

@@ -3,7 +3,7 @@ use std::time::{Duration, Instant};
 use alloy::{primitives::B256, rpc::types::beacon::BlsPublicKey};
 use cb_common::{
     config::RelayConfig,
-    pbs::{GetHeaderResponse, RelayClient, RelayEntry},
+    pbs::{DenebSpec, GetHeaderResponse, RelayClient, RelayEntry},
     signer::BlsSecretKey,
     types::Chain,
     utils::blst_pubkey_to_alloy,
@@ -63,7 +63,7 @@ async fn main() {
                     .expect("failed to decode response");
 
                 assert!(
-                    serde_json::from_slice::<GetHeaderResponse>(&res).is_ok(),
+                    serde_json::from_slice::<GetHeaderResponse<DenebSpec>>(&res).is_ok(),
                     "invalid header returned"
                 );
 
@@ -146,7 +146,7 @@ async fn start_mock_relay(chain: Chain, relay_config: RelayConfig) {
     let relay_port = relay_config.entry.url.port().expect("missing port");
 
     let mock_relay = MockRelayState::new(chain, signer);
-    start_mock_relay_service(mock_relay.into(), relay_port)
+    start_mock_relay_service::<DenebSpec>(mock_relay.into(), relay_port)
         .await
         .expect("failed to start mock relay");
 }

tests/src/mock_relay.rs

@@ -16,8 +16,8 @@ use axum::{
 };
 use cb_common::{
     pbs::{
-        GetHeaderParams, GetHeaderResponse, SubmitBlindedBlockResponse, BUILDER_API_PATH,
-        GET_HEADER_PATH, GET_STATUS_PATH, REGISTER_VALIDATOR_PATH, SUBMIT_BLOCK_PATH, EthSpec
+        EthSpec, GetHeaderParams, GetHeaderResponse, SubmitBlindedBlockResponse, BUILDER_API_PATH,
+        GET_HEADER_PATH, GET_STATUS_PATH, REGISTER_VALIDATOR_PATH, SUBMIT_BLOCK_PATH,
     },
     signature::sign_builder_root,
     signer::BlsSecretKey,
@@ -29,7 +29,10 @@ use tokio::net::TcpListener;
 use tracing::debug;
 use tree_hash::TreeHash;
 
-pub async fn start_mock_relay_service<T: EthSpec>(state: Arc<MockRelayState>, port: u16) -> eyre::Result<()> {
+pub async fn start_mock_relay_service<T: EthSpec>(
+    state: Arc<MockRelayState>,
+    port: u16,
+) -> eyre::Result<()> {
     let app = mock_relay_app_router::<T>(state);
 
     let socket = SocketAddr::new("0.0.0.0".parse()?, port);
@@ -136,4 +139,4 @@ async fn handle_submit_block<T: EthSpec>(State(state): State<Arc<MockRelayState>
         let response = SubmitBlindedBlockResponse::<T>::default();
         (StatusCode::OK, Json(response)).into_response()
     }
-}
+}

tests/src/mock_validator.rs

@@ -2,7 +2,7 @@ use alloy::{
     primitives::B256,
     rpc::types::beacon::{relay::ValidatorRegistration, BlsPublicKey},
 };
-use cb_common::pbs::{RelayClient, SignedBlindedBeaconBlock, EthSpec};
+use cb_common::pbs::{EthSpec, RelayClient, SignedBlindedBeaconBlock};
 use reqwest::Response;
 
 use crate::utils::generate_mock_relay;

tests/tests/payloads.rs

@@ -1,31 +1,41 @@
 use alloy::rpc::types::beacon::relay::ValidatorRegistration;
 use cb_common::{
-    pbs::{SignedBlindedBeaconBlock, SubmitBlindedBlockResponse},
-    utils::test_encode_decode, pbs::{DenebSpec, ElectraSpec}
+    pbs::{DenebSpec, ElectraSpec, SignedBlindedBeaconBlock, SubmitBlindedBlockResponse},
+    utils::test_encode_decode,
 };
-use serde_json::Value;
 use cb_tests::utils::SpecVersion;
+use serde_json::Value;
 
 // Happy path tests
 #[test]
 fn test_registrations() {
-    test_encode_decode::<Vec<ValidatorRegistration>>(include_str!("../data/deneb/registration_holesky.json"));
+    test_encode_decode::<Vec<ValidatorRegistration>>(include_str!(
+        "../data/deneb/registration_holesky.json"
+    ));
 }
 
 #[test]
 fn test_signed_blinded_block() {
     // Deneb
-    test_encode_decode::<SignedBlindedBeaconBlock<DenebSpec>>(include_str!("../data/deneb/signed_blinded_block_holesky.json"));
+    test_encode_decode::<SignedBlindedBeaconBlock<DenebSpec>>(include_str!(
+        "../data/deneb/signed_blinded_block_holesky.json"
+    ));
     // Electra
-    test_encode_decode::<SignedBlindedBeaconBlock<ElectraSpec>>(include_str!("../data/electra/signed_blinded_block_holesky.json"));
+    test_encode_decode::<SignedBlindedBeaconBlock<ElectraSpec>>(include_str!(
+        "../data/electra/signed_blinded_block_holesky.json"
+    ));
 }
 
 #[test]
 fn test_submit_block_response() {
     // Deneb
-    test_encode_decode::<SubmitBlindedBlockResponse<DenebSpec>>(include_str!("../data/deneb/submit_block_response_holesky.json"));
+    test_encode_decode::<SubmitBlindedBlockResponse<DenebSpec>>(include_str!(
+        "../data/deneb/submit_block_response_holesky.json"
+    ));
     // Electra
-    test_encode_decode::<SubmitBlindedBlockResponse<ElectraSpec>>(include_str!("../data/electra/submit_block_response_holesky.json"));
+    test_encode_decode::<SubmitBlindedBlockResponse<ElectraSpec>>(include_str!(
+        "../data/electra/submit_block_response_holesky.json"
+    ));
 }
 
 // Unhappy path tests
@@ -62,9 +72,9 @@ fn test_registration_missing_fields() {
             let error = test_missing_registration_field(version, field);
             assert!(
                 error.contains(&format!("missing field `{}`", field)),
-            "Expected error about missing {}, got: {}",
-            field,
-            error
+                "Expected error about missing {}, got: {}",
+                field,
+                error
             );
         }
     }
@@ -158,4 +168,4 @@ fn test_submit_block_response_missing_fields() {
             );
         }
     }
-}
+}

tests/tests/pbs_get_header.rs

@@ -2,14 +2,13 @@ use std::{sync::Arc, time::Duration};
 
 use alloy::primitives::{B256, U256};
 use cb_common::{
-    pbs::GetHeaderResponse,
+    pbs::{DenebSpec, ElectraSpec, GetHeaderResponse},
     signature::sign_builder_root,
     signer::{random_secret, BlsPublicKey},
     types::Chain,
     utils::{blst_pubkey_to_alloy, timestamp_of_slot_start_sec},
 };
 use cb_pbs::{DefaultBuilderApi, PbsService, PbsState};
-use cb_common::pbs::{DenebSpec, ElectraSpec};
 use cb_tests::{
     mock_relay::{start_mock_relay_service, MockRelayState},
     mock_validator::MockValidator,

tests/tests/pbs_get_status.rs

@@ -1,9 +1,9 @@
 use std::{sync::Arc, time::Duration};
 
 use cb_common::{
+    pbs::{DenebSpec, ElectraSpec},
     signer::{random_secret, BlsPublicKey},
     types::Chain,
-    pbs::{DenebSpec, ElectraSpec},
     utils::blst_pubkey_to_alloy,
 };
 use cb_pbs::{DefaultBuilderApi, PbsService, PbsState};
@@ -152,4 +152,4 @@ async fn test_get_status_returns_502_if_relay_down_electra() -> Result<()> {
     // Expect no statuses since relay is down
     assert_eq!(mock_state.received_get_status(), 0);
     Ok(())
-}
+}

tests/tests/pbs_post_blinded_blocks.rs

@@ -40,13 +40,19 @@ async fn test_submit_block_deneb() -> Result<()> {
 
     let mock_validator = MockValidator::new(pbs_port)?;
     info!("Sending submit block");
-    let res = mock_validator.do_submit_block::<DenebSpec>(Some(SignedBlindedBeaconBlock::default())).await?;
+    let res = mock_validator
+        .do_submit_block::<DenebSpec>(Some(SignedBlindedBeaconBlock::default()))
+        .await?;
 
     assert_eq!(res.status(), StatusCode::OK);
     assert_eq!(mock_state.received_submit_block(), 1);
 
-    let response_body = serde_json::from_slice::<SubmitBlindedBlockResponse<DenebSpec>>(&res.bytes().await?)?;
-    assert_eq!(response_body.block_hash(), SubmitBlindedBlockResponse::<DenebSpec>::default().block_hash());
+    let response_body =
+        serde_json::from_slice::<SubmitBlindedBlockResponse<DenebSpec>>(&res.bytes().await?)?;
+    assert_eq!(
+        response_body.block_hash(),
+        SubmitBlindedBlockResponse::<DenebSpec>::default().block_hash()
+    );
     Ok(())
 }
 
@@ -74,13 +80,19 @@ async fn test_submit_block_electra() -> Result<()> {
 
     let mock_validator = MockValidator::new(pbs_port)?;
     info!("Sending submit block");
-    let res = mock_validator.do_submit_block::<ElectraSpec>(Some(SignedBlindedBeaconBlock::default())).await?;
+    let res = mock_validator
+        .do_submit_block::<ElectraSpec>(Some(SignedBlindedBeaconBlock::default()))
+        .await?;
 
     assert_eq!(res.status(), StatusCode::OK);
     assert_eq!(mock_state.received_submit_block(), 1);
 
-    let response_body = serde_json::from_slice::<SubmitBlindedBlockResponse<ElectraSpec>>(&res.bytes().await?)?;
-    assert_eq!(response_body.block_hash(), SubmitBlindedBlockResponse::<ElectraSpec>::default().block_hash());
+    let response_body =
+        serde_json::from_slice::<SubmitBlindedBlockResponse<ElectraSpec>>(&res.bytes().await?)?;
+    assert_eq!(
+        response_body.block_hash(),
+        SubmitBlindedBlockResponse::<ElectraSpec>::default().block_hash()
+    );
     Ok(())
 }
 
@@ -114,7 +126,6 @@ async fn test_submit_block_too_large_deneb() -> Result<()> {
     Ok(())
 }
 
-
 #[tokio::test]
 async fn test_submit_block_too_large_electra() -> Result<()> {
     setup_test_env();

tests/tests/pbs_post_validators.rs

@@ -2,8 +2,8 @@ use std::{sync::Arc, time::Duration};
 
 use alloy::rpc::types::beacon::relay::ValidatorRegistration;
 use cb_common::{
+    pbs::{DenebSpec, ElectraSpec},
     signer::{random_secret, BlsPublicKey},
-    pbs::{ElectraSpec, DenebSpec},
     types::Chain,
     utils::blst_pubkey_to_alloy,
 };
@@ -109,7 +109,6 @@ async fn test_register_validators_electra() -> Result<()> {
     Ok(())
 }
 
-
 #[tokio::test]
 async fn test_register_validators_returns_422_if_request_is_malformed_deneb() -> Result<()> {
     setup_test_env();