Swapped to LH's ForkName enum

Author: jclapis

crates/common/src/utils.rs

@@ -15,6 +15,7 @@ use axum::{
 };
 use bytes::Bytes;
 use futures::StreamExt;
+pub use lh_types::ForkName;
 use lh_types::test_utils::{SeedableRng, TestRandom, XorShiftRng};
 use mediatype::{MediaType, MediaTypeList, names};
 use rand::{Rng, distr::Alphanumeric};
@@ -450,29 +451,6 @@ pub fn get_consensus_version_header(req_headers: &HeaderMap) -> Option<ForkName>
     .ok()
 }
 
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub enum ForkName {
-    Electra,
-}
-
-impl std::fmt::Display for ForkName {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            ForkName::Electra => write!(f, "electra"),
-        }
-    }
-}
-
-impl FromStr for ForkName {
-    type Err = String;
-    fn from_str(value: &str) -> Result<Self, Self::Err> {
-        match value {
-            "electra" => Ok(ForkName::Electra),
-            _ => Err(format!("Invalid fork name {value}")),
-        }
-    }
-}
-
 #[derive(Debug, Clone, Copy, PartialEq)]
 pub enum ContentType {
     Json,

tests/src/mock_relay.rs

@@ -148,6 +148,13 @@ async fn handle_get_header(
                 Accept::Ssz => response.as_ssz_bytes(),
             }
         }
+        _ => {
+            return (
+                StatusCode::BAD_REQUEST,
+                format!("Unsupported fork {consensus_version_header}"),
+            )
+                .into_response();
+        }
     };
 
     let mut response = (StatusCode::OK, data).into_response();
@@ -209,6 +216,13 @@ async fn handle_submit_block_v1(
             Accept::Ssz => match consensus_version_header {
                 // Response isn't versioned for SSZ
                 ForkName::Electra => response.as_ssz_bytes(),
+                _ => {
+                    return (
+                        StatusCode::BAD_REQUEST,
+                        format!("Unsupported fork {consensus_version_header}"),
+                    )
+                        .into_response();
+                }
             },
         }
     };