refactor: deserialize only once

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

Author: gusinacio

common/src/indexer_service/http/indexer_service.rs

@@ -66,15 +66,14 @@ pub enum AttestationOutput {
 #[async_trait]
 pub trait IndexerServiceImpl {
     type Error: std::error::Error;
-    type Request: DeserializeOwned + Send + Debug + Serialize;
     type Response: IndexerServiceResponse + Sized;
     type State: Send + Sync;
 
-    async fn process_request(
+    async fn process_request<Request: DeserializeOwned + Send + Debug + Serialize>(
         &self,
         manifest_id: DeploymentId,
-        request: Self::Request,
-    ) -> Result<(Self::Request, Self::Response), Self::Error>;
+        request: Request,
+    ) -> Result<(Request, Self::Response), Self::Error>;
 }
 
 #[derive(Debug, Error)]

common/src/indexer_service/http/request_handler.rs

@@ -80,7 +80,13 @@ where
 {
     trace!("Handling request for deployment `{manifest_id}`");
 
-    let request =
+    #[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()))?;
 
     let Some(receipt) = receipt.into_signed_receipt() else {
@@ -113,23 +119,15 @@ where
 
     let allocation_id = receipt.message.allocation_id;
 
-    #[derive(Debug, serde::Deserialize)]
-    pub struct QueryBody {
-        pub query: String,
-        pub variables: Option<Box<RawValue>>,
-    }
-
-    let query_body: QueryBody =
-        serde_json::from_slice(&body).map_err(|e| IndexerServiceError::InvalidRequest(e.into()))?;
-    let variables = query_body
+    let variables = request
         .variables
         .as_ref()
         .map(ToString::to_string)
         .unwrap_or_default();
     let mut ctx = Context::new();
     ctx.insert(AgoraQuery {
         deployment_id: manifest_id,
-        query: query_body.query.clone(),
+        query: request.query.clone(),
         variables,
     });
 

service/src/service.rs

@@ -12,6 +12,7 @@ use indexer_common::indexer_service::http::{
 };
 use indexer_config::Config as MainConfig;
 use reqwest::Url;
+use serde::{de::DeserializeOwned, Serialize};
 use serde_json::{json, Value};
 use sqlx::PgPool;
 use thegraph_core::DeploymentId;
@@ -82,15 +83,14 @@ impl SubgraphService {
 #[async_trait]
 impl IndexerServiceImpl for SubgraphService {
     type Error = SubgraphServiceError;
-    type Request = serde_json::Value;
     type Response = SubgraphServiceResponse;
     type State = SubgraphServiceState;
 
-    async fn process_request(
+    async fn process_request<Request: DeserializeOwned + Send + std::fmt::Debug + Serialize>(
         &self,
         deployment: DeploymentId,
-        request: Self::Request,
-    ) -> Result<(Self::Request, Self::Response), Self::Error> {
+        request: Request,
+    ) -> Result<(Request, Self::Response), Self::Error> {
         let deployment_url = Url::parse(&self.state.graph_node_query_base_url)
             .expect("Invalid `graph_node.query_url` in config")
             .join(&format!("subgraphs/id/{deployment}"))