fix: apply reviews(remove custom rejection)

Author: syjn99

beacon_node/http_api/src/lib.rs

@@ -1139,15 +1139,6 @@ pub fn serve<T: BeaconChainTypes>(
                         .map_state_and_execution_optimistic_and_finalized(
                             &chain,
                             |state, execution_optimistic, finalized| {
-                                if !state.fork_name_unchecked().electra_enabled() {
-                                    return Err(warp_utils::reject::pre_electra_not_supported(
-                                        format!(
-                                            "state at epoch {} is not activated for Electra",
-                                            state.current_epoch()
-                                        ),
-                                    ));
-                                }
-
                                 let Ok(deposits) = state.pending_deposits() else {
                                     return Err(warp_utils::reject::custom_bad_request(
                                         "Pending deposits not found".to_string(),
@@ -1185,15 +1176,6 @@ pub fn serve<T: BeaconChainTypes>(
                         .map_state_and_execution_optimistic_and_finalized(
                             &chain,
                             |state, execution_optimistic, finalized| {
-                                if !state.fork_name_unchecked().electra_enabled() {
-                                    return Err(warp_utils::reject::pre_electra_not_supported(
-                                        format!(
-                                            "state at epoch {} is not activated for Electra",
-                                            state.current_epoch()
-                                        ),
-                                    ));
-                                }
-
                                 let Ok(withdrawals) = state.pending_partial_withdrawals() else {
                                     return Err(warp_utils::reject::custom_bad_request(
                                         "Pending withdrawals not found".to_string(),

common/warp_utils/src/reject.rs

@@ -140,15 +140,6 @@ pub fn indexed_bad_request(message: String, failures: Vec<Failure>) -> warp::rej
     warp::reject::custom(IndexedBadRequestErrors { message, failures })
 }
 
-#[derive(Debug)]
-pub struct PreElectraNotSupported(pub String);
-
-impl Reject for PreElectraNotSupported {}
-
-pub fn pre_electra_not_supported(msg: String) -> warp::reject::Rejection {
-    warp::reject::custom(PreElectraNotSupported(msg))
-}
-
 /// This function receives a `Rejection` and tries to return a custom
 /// value, otherwise simply passes the rejection along.
 pub async fn handle_rejection(err: warp::Rejection) -> Result<impl warp::Reply, Infallible> {
@@ -211,9 +202,6 @@ pub async fn handle_rejection(err: warp::Rejection) -> Result<impl warp::Reply,
     } else if let Some(e) = err.find::<crate::reject::InvalidAuthorization>() {
         code = StatusCode::FORBIDDEN;
         message = format!("FORBIDDEN: Invalid auth token: {}", e.0);
-    } else if let Some(e) = err.find::<crate::reject::PreElectraNotSupported>() {
-        code = StatusCode::BAD_REQUEST;
-        message = format!("BAD_REQUEST: Pre-Electra not supported: {}", e.0);
     } else if let Some(e) = err.find::<warp::reject::MissingHeader>() {
         if e.name().eq("Authorization") {
             code = StatusCode::UNAUTHORIZED;