Made some strings static

Author: jclapis

crates/common/src/utils.rs

@@ -46,9 +46,9 @@ use crate::{
     types::{BlsPublicKey, Chain, Jwt, JwtClaims, ModuleId},
 };
 
-const APPLICATION_JSON: &str = "application/json";
-const APPLICATION_OCTET_STREAM: &str = "application/octet-stream";
-const WILDCARD: &str = "*/*";
+pub const APPLICATION_JSON: &str = "application/json";
+pub const APPLICATION_OCTET_STREAM: &str = "application/octet-stream";
+pub const WILDCARD: &str = "*/*";
 
 const MILLIS_PER_SECOND: u64 = 1_000;
 pub const CONSENSUS_VERSION_HEADER: &str = "Eth-Consensus-Version";
@@ -498,21 +498,28 @@ pub enum EncodingType {
     Ssz,
 }
 
-impl std::fmt::Display for EncodingType {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+impl EncodingType {
+    /// Get the content type string for the encoding type
+    pub fn content_type(&self) -> &str {
         match self {
-            EncodingType::Json => write!(f, "application/json"),
-            EncodingType::Ssz => write!(f, "application/octet-stream"),
+            EncodingType::Json => APPLICATION_JSON,
+            EncodingType::Ssz => APPLICATION_OCTET_STREAM,
         }
     }
 }
 
+impl std::fmt::Display for EncodingType {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.content_type())
+    }
+}
+
 impl FromStr for EncodingType {
     type Err = String;
     fn from_str(value: &str) -> Result<Self, Self::Err> {
         match value.to_ascii_lowercase().as_str() {
-            "application/json" | "" => Ok(EncodingType::Json),
-            "application/octet-stream" => Ok(EncodingType::Ssz),
+            APPLICATION_JSON | "" => Ok(EncodingType::Json),
+            APPLICATION_OCTET_STREAM => Ok(EncodingType::Ssz),
             _ => Err(format!("unsupported encoding type: {value}")),
         }
     }

crates/pbs/src/mev_boost/get_header.rs

@@ -412,7 +412,7 @@ async fn send_one_get_header(
         // Also resets the start request timer
         original_headers.remove(ACCEPT);
         original_headers
-            .insert(ACCEPT, HeaderValue::from_str(&EncodingType::Json.to_string()).unwrap());
+            .insert(ACCEPT, HeaderValue::from_str(EncodingType::Json.content_type()).unwrap());
         let config = RequestContext {
             url: req_config.url.clone(),
             timeout_ms: req_config.timeout_ms - elapsed,

crates/pbs/src/routes/get_header.rs

@@ -73,7 +73,7 @@ pub async fn handle_get_header<S: BuilderApiState, A: BuilderApi<S>>(
 
                     // This won't actually fail since the string is a const
                     let content_type_header =
-                        HeaderValue::from_str(&EncodingType::Ssz.to_string()).unwrap();
+                        HeaderValue::from_str(EncodingType::Ssz.content_type()).unwrap();
 
                     res.headers_mut().insert(CONSENSUS_VERSION_HEADER, consensus_version_header);
                     res.headers_mut().insert(CONTENT_TYPE, content_type_header);

crates/pbs/src/routes/submit_block.rs

@@ -110,7 +110,7 @@ async fn handle_submit_block_impl<S: BuilderApiState, A: BuilderApi<S>>(
 
                     // This won't actually fail since the string is a const
                     let content_type_header =
-                        HeaderValue::from_str(&EncodingType::Ssz.to_string()).unwrap();
+                        HeaderValue::from_str(EncodingType::Ssz.content_type()).unwrap();
 
                     response
                         .headers_mut()