fix: use request from gateway instead of serde req

Signed-off-by: Gustavo Inacio <[email protected]>

Author: gusinacio

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)]

common/src/indexer_service/http/request_handler.rs

@@ -80,12 +80,6 @@ where
 {
     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()))?;
 
@@ -112,7 +106,6 @@ where
             .process_request(manifest_id, request)
             .await
             .map_err(IndexerServiceError::ProcessingError)?
-            .1
             .finalize(AttestationOutput::Attestable);
         return Ok((StatusCode::OK, response));
     };
@@ -179,14 +172,14 @@ 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 req =
+        std::str::from_utf8(&body).map_err(|_| IndexerServiceError::FailedToSignAttestation)?;
 
     let res = response
         .as_str()
@@ -195,10 +188,16 @@ where
     let attestation = AttestationOutput::Attestation(
         response
             .is_attestable()
-            .then(|| signer.create_attestation(&req, res)),
+            .then(|| signer.create_attestation(req, res)),
     );
 
     let response = response.finalize(attestation);
 
     Ok((StatusCode::OK, response))
 }
+
+#[derive(Debug, serde::Deserialize, serde::Serialize)]
+pub struct QueryBody {
+    pub query: String,
+    pub variables: Option<Box<RawValue>>,
+}

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))
     }
 }