FMT

beacon_node/beacon_chain/src/payload_envelope_verification/import.rs

@@ -149,7 +149,10 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
             }
             // The block failed verification.
             Err(other) => {
-                warn!(reason = other.to_string(), "Execution payload envelope rejected");
+                warn!(
+                    reason = other.to_string(),
+                    "Execution payload envelope rejected"
+                );
                 Err(other)
             }
         }

beacon_node/http_api/src/beacon/execution_payload_envelope.rs

@@ -137,7 +137,11 @@ pub async fn publish_execution_payload_envelope<T: BeaconChainTypes>(
 // GET beacon/execution_payload_envelope/{block_id}
 pub(crate) fn get_beacon_execution_payload_envelope<T: BeaconChainTypes>(
     eth_v1: EthV1Filter,
-    block_id_or_err: impl Filter<Extract = (BlockId,), Error = Rejection> + Clone + Send + Sync + 'static,
+    block_id_or_err: impl Filter<Extract = (BlockId,), Error = Rejection>
+    + Clone
+    + Send
+    + Sync
+    + 'static,
     task_spawner_filter: TaskSpawnerFilter<T>,
     chain_filter: ChainFilter<T>,
 ) -> ResponseFilter {

common/eth2/src/lib.rs

@@ -2675,8 +2675,10 @@ impl BeaconNodeHttpClient {
     pub async fn get_beacon_execution_payload_envelope<E: EthSpec>(
         &self,
         block_id: BlockId,
-    ) -> Result<Option<ExecutionOptimisticFinalizedBeaconResponse<SignedExecutionPayloadEnvelope<E>>>, Error>
+    ) -> Result<
-    {
+        Option<ExecutionOptimisticFinalizedBeaconResponse<SignedExecutionPayloadEnvelope<E>>>,
+        Error,
+    > {
         let path = self.get_beacon_execution_payload_envelope_path(block_id)?;
         self.get_opt(path)
             .await
@@ -2695,11 +2697,9 @@ impl BeaconNodeHttpClient {
             .get_bytes_opt_accept_header(path, Accept::Ssz, self.timeouts.get_beacon_blocks_ssz)
             .await?;
         match opt_response {
-            Some(bytes) => {
+            Some(bytes) => SignedExecutionPayloadEnvelope::from_ssz_bytes(&bytes)
-                SignedExecutionPayloadEnvelope::from_ssz_bytes(&bytes)
                 .map(Some)
-                    .map_err(Error::InvalidSsz)
+                .map_err(Error::InvalidSsz),
-            }
             None => Ok(None),
         }
     }

common/eth2/src/types.rs

@@ -1336,10 +1336,7 @@ impl<E: EthSpec> EventKind<E> {
             )?)),
             "execution_payload_bid" => Ok(EventKind::ExecutionPayloadBid(
                 serde_json::from_str(data).map_err(|e| {
-                    ServerError::InvalidServerSentEvent(format!(
+                    ServerError::InvalidServerSentEvent(format!("Execution Payload Bid: {:?}", e))
-                        "Execution Payload Bid: {:?}",
-                        e
-                    ))
                 })?,
             )),
             "execution_payload_available" => Ok(EventKind::ExecutionPayloadAvailable(