lint

sigp · Jan 29, 2024 · 29226b8 · 29226b8
1 parent 350d7b3
commit 29226b8
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 83 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/common/eth2/src/lib.rs b/common/eth2/src/lib.rs
@@ -397,25 +397,6 @@ impl BeaconNodeHttpClient {
         ok_or_error(response).await
     }
 
-    /// Generic POST function supporting arbitrary responses and timeouts.
-    async fn post_generic_with_ssz_body<T: Into<Body>, U: IntoUrl>(
-        &self,
-        url: U,
-        body: T,
-        timeout: Option<Duration>,
-    ) -> Result<Response, Error> {
-        let mut builder = self.client.post(url);
-        if let Some(timeout) = timeout {
-            builder = builder.timeout(timeout);
-        }
-        let response = builder
-            .header("Content-Type", "application/octet-stream")
-            .body(body)
-            .send()
-            .await?;
-        ok_or_error(response).await
-    }
-
     /// Generic POST function supporting arbitrary responses and timeouts.
     async fn post_generic_with_consensus_version<T: Serialize, U: IntoUrl>(
         &self,

diff --git a/common/warp_utils/src/reject.rs b/common/warp_utils/src/reject.rs
@@ -85,7 +85,7 @@ pub fn custom_bad_request(msg: String) -> warp::reject::Rejection {
 #[derive(Debug)]
 pub struct CustomDeserializeError(pub String);
 
-impl Reject for CustomBadRequest {}
+impl Reject for CustomDeserializeError {}
 
 pub fn custom_deserialize_error(msg: String) -> warp::reject::Rejection {
     warp::reject::custom(CustomDeserializeError(msg))
@@ -171,7 +171,7 @@ pub async fn handle_rejection(err: warp::Rejection) -> Result<impl warp::Reply,
         code = StatusCode::NOT_FOUND;
         message = "NOT_FOUND".to_string();
     } else if let Some(e) = err.find::<crate::reject::CustomDeserializeError>() {
-        message = format!("BAD_REQUEST: body deserialize error: {}", e);
+        message = format!("BAD_REQUEST: body deserialize error: {}", e.0);
         code = StatusCode::BAD_REQUEST;
     } else if let Some(e) = err.find::<warp::filters::body::BodyDeserializeError>() {
         message = format!("BAD_REQUEST: body deserialize error: {}", e);