cleanup as_str

Author: ltitanb

crates/common/src/pbs/types/blinded_block_body.rs

@@ -10,7 +10,6 @@ use super::{
     execution_payload::ExecutionPayloadHeader, execution_requests::ExecutionRequests,
     kzg::KzgCommitments, spec::EthSpec, utils::*,
 };
-use crate::utils::as_str;
 
 #[derive(Debug, Default, Clone, Serialize, Deserialize, Encode, Decode)]
 #[serde(deny_unknown_fields)]
@@ -76,7 +75,7 @@ pub struct SignedBeaconBlockHeader {
 
 #[derive(Debug, Default, Clone, Serialize, Deserialize, Encode, Decode)]
 pub struct BlsToExecutionChange {
-    #[serde(with = "as_str")]
+    #[serde(with = "serde_utils::quoted_u64")]
     pub validator_index: u64,
     pub from_bls_pubkey: BlsPublicKey,
     pub to_execution_address: Address,

crates/common/src/pbs/types/execution_payload.rs

@@ -5,7 +5,6 @@ use ssz_types::{FixedVector, VariableList};
 use tree_hash_derive::TreeHash;
 
 use super::spec::EthSpec;
-use crate::utils::as_str;
 
 pub const EMPTY_TX_ROOT_HASH: B256 =
     b256!("7ffe241ea60187fdb0187bfa22de35d1f9bed7ab061d9401fd47e34a54fbede1");
@@ -29,7 +28,7 @@ pub struct ExecutionPayload<T: EthSpec> {
     pub timestamp: u64,
     #[serde(with = "ssz_types::serde_utils::hex_var_list")]
     pub extra_data: VariableList<u8, T::MaxExtraDataBytes>,
-    #[serde(with = "as_str")]
+    #[serde(with = "serde_utils::quoted_u256")]
     pub base_fee_per_gas: U256,
     pub block_hash: B256,
     #[serde(with = "ssz_types::serde_utils::list_of_hex_var_list")]

crates/common/src/utils.rs

@@ -88,29 +88,6 @@ pub fn test_encode_decode_ssz<T: Encode + Decode>(d: &[u8]) -> T {
     decoded
 }
 
-pub mod as_str {
-    use std::{fmt::Display, str::FromStr};
-
-    use serde::Deserialize;
-
-    pub fn serialize<S, T: Display>(data: T, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        serializer.collect_str(&data.to_string())
-    }
-
-    pub fn deserialize<'de, D, T, E>(deserializer: D) -> Result<T, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-        T: FromStr<Err = E>,
-        E: Display,
-    {
-        let s = String::deserialize(deserializer)?;
-        T::from_str(&s).map_err(serde::de::Error::custom)
-    }
-}
-
 pub mod as_eth_str {
     use alloy::primitives::{
         utils::{format_ether, parse_ether},