fix: use request from gateway instead of serde req (#464)

graphprotocol · Nov 6, 2024 · fdeda9f · fdeda9f
1 parent 450ee8d
commit fdeda9f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 18 deletions.
diff --git a/common/src/indexer_service/http/indexer_service.rs b/common/src/indexer_service/http/indexer_service.rs
@@ -72,7 +72,7 @@ pub trait IndexerServiceImpl {
         &self,
         manifest_id: DeploymentId,
         request: Request,
-    ) -> Result<(Request, Self::Response), Self::Error>;
+    ) -> Result<Self::Response, Self::Error>;
 }
 
 #[derive(Debug, Error)]

diff --git a/common/src/indexer_service/http/request_handler.rs b/common/src/indexer_service/http/request_handler.rs
@@ -4,7 +4,6 @@
 use std::sync::Arc;
 
 use axum::{
-    body::Bytes,
     extract::{Path, State},
     http::HeaderMap,
     response::IntoResponse,
@@ -54,7 +53,7 @@ pub async fn request_handler<I>(
     typed_header: TypedHeader<TapReceipt>,
     state: State<Arc<IndexerServiceState<I>>>,
     headers: HeaderMap,
-    body: Bytes,
+    body: String,
 ) -> Result<impl IntoResponse, IndexerServiceError<I::Error>>
 where
     I: IndexerServiceImpl + Sync + Send + 'static,
@@ -73,21 +72,15 @@ async fn _request_handler<I>(
     TypedHeader(receipt): TypedHeader<TapReceipt>,
     State(state): State<Arc<IndexerServiceState<I>>>,
     headers: HeaderMap,
-    body: Bytes,
+    req: String,
 ) -> Result<impl IntoResponse, IndexerServiceError<I::Error>>
 where
     I: IndexerServiceImpl + Sync + Send + 'static,
 {
     trace!("Handling request for deployment `{manifest_id}`");
 
-    #[derive(Debug, serde::Deserialize, serde::Serialize)]
-    pub struct QueryBody {
-        pub query: String,
-        pub variables: Option<Box<RawValue>>,
-    }
-
     let request: QueryBody =
-        serde_json::from_slice(&body).map_err(|e| IndexerServiceError::InvalidRequest(e.into()))?;
+        serde_json::from_str(&req).map_err(|e| IndexerServiceError::InvalidRequest(e.into()))?;
 
     let Some(receipt) = receipt.into_signed_receipt() else {
         // Serve free query, NO METRICS
@@ -112,7 +105,6 @@ where
             .process_request(manifest_id, request)
             .await
             .map_err(IndexerServiceError::ProcessingError)?
-            .1
             .finalize(AttestationOutput::Attestable);
         return Ok((StatusCode::OK, response));
     };
@@ -179,15 +171,12 @@ where
         .cloned()
         .ok_or_else(|| (IndexerServiceError::NoSignerForAllocation(allocation_id)))?;
 
-    let (request, response) = state
+    let response = state
         .service_impl
         .process_request(manifest_id, request)
         .await
         .map_err(IndexerServiceError::ProcessingError)?;
 
-    let req = serde_json::to_string(&request)
-        .map_err(|_| IndexerServiceError::FailedToSignAttestation)?;
-
     let res = response
         .as_str()
         .map_err(|_| IndexerServiceError::FailedToSignAttestation)?;
@@ -202,3 +191,9 @@ where
 
     Ok((StatusCode::OK, response))
 }
+
+#[derive(Debug, serde::Deserialize, serde::Serialize)]
+pub struct QueryBody {
+    pub query: String,
+    pub variables: Option<Box<RawValue>>,
+}
diff --git a/service/src/service.rs b/service/src/service.rs
@@ -90,7 +90,7 @@ impl IndexerServiceImpl for SubgraphService {
         &self,
         deployment: DeploymentId,
         request: Request,
-    ) -> Result<(Request, Self::Response), Self::Error> {
+    ) -> Result<Self::Response, Self::Error> {
         let deployment_url = self
             .state
             .graph_node_query_base_url
@@ -118,7 +118,7 @@ impl IndexerServiceImpl for SubgraphService {
             .await
             .map_err(SubgraphServiceError::QueryForwardingError)?;
 
-        Ok((request, SubgraphServiceResponse::new(body, attestable)))
+        Ok(SubgraphServiceResponse::new(body, attestable))
     }
 }