refactor: remove service impl trait (#500)

Author: gusinacio

crates/service/src/routes/cost.rs

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use std::str::FromStr;
-use std::sync::Arc;
 
 use crate::database::cost_model::{self, CostModel};
 use async_graphql::{Context, EmptyMutation, EmptySubscription, Object, Schema, SimpleObject};
@@ -127,7 +126,7 @@ impl Query {
         ctx: &Context<'_>,
         deployment_ids: Vec<DeploymentId>,
     ) -> Result<Vec<GraphQlCostModel>, anyhow::Error> {
-        let pool = &ctx.data_unchecked::<Arc<SubgraphServiceState>>().database;
+        let pool = &ctx.data_unchecked::<SubgraphServiceState>().database;
         let cost_models = cost_model::cost_models(pool, &deployment_ids).await?;
         Ok(cost_models.into_iter().map(|m| m.into()).collect())
     }
@@ -137,7 +136,7 @@ impl Query {
         ctx: &Context<'_>,
         deployment_id: DeploymentId,
     ) -> Result<Option<GraphQlCostModel>, anyhow::Error> {
-        let pool = &ctx.data_unchecked::<Arc<SubgraphServiceState>>().database;
+        let pool = &ctx.data_unchecked::<SubgraphServiceState>().database;
         cost_model::cost_model(pool, &deployment_id)
             .await
             .map(|model_opt| model_opt.map(GraphQlCostModel::from))
@@ -151,7 +150,7 @@ pub async fn build_schema() -> CostSchema {
 }
 
 pub async fn cost(
-    State(state): State<Arc<SubgraphServiceState>>,
+    State(state): State<SubgraphServiceState>,
     req: GraphQLRequest,
 ) -> GraphQLResponse {
     state

crates/service/src/routes/request_handler.rs

@@ -19,8 +19,7 @@ use thegraph_core::DeploymentId;
 use tracing::trace;
 
 use crate::service::{
-    AttestationOutput, IndexerServiceError, IndexerServiceImpl, IndexerServiceResponse,
-    IndexerServiceState, TapReceipt,
+    AttestationOutput, IndexerServiceError, IndexerServiceResponse, IndexerServiceState, TapReceipt,
 };
 
 lazy_static! {
@@ -45,16 +44,13 @@ lazy_static! {
 
 }
 
-pub async fn request_handler<I>(
+pub async fn request_handler(
     Path(manifest_id): Path<DeploymentId>,
     typed_header: TypedHeader<TapReceipt>,
-    state: State<Arc<IndexerServiceState<I>>>,
+    state: State<Arc<IndexerServiceState>>,
     headers: HeaderMap,
     body: String,
-) -> Result<impl IntoResponse, IndexerServiceError<I::Error>>
-where
-    I: IndexerServiceImpl + Sync + Send + 'static,
-{
+) -> Result<impl IntoResponse, IndexerServiceError> {
     _request_handler(manifest_id, typed_header, state, headers, body)
         .await
         .inspect_err(|_| {
@@ -64,16 +60,13 @@ where
         })
 }
 
-async fn _request_handler<I>(
+async fn _request_handler(
     manifest_id: DeploymentId,
     TypedHeader(receipt): TypedHeader<TapReceipt>,
-    State(state): State<Arc<IndexerServiceState<I>>>,
+    State(state): State<Arc<IndexerServiceState>>,
     headers: HeaderMap,
     req: String,
-) -> Result<impl IntoResponse, IndexerServiceError<I::Error>>
-where
-    I: IndexerServiceImpl + Sync + Send + 'static,
-{
+) -> Result<impl IntoResponse, IndexerServiceError> {
     trace!("Handling request for deployment `{manifest_id}`");
 
     let request: QueryBody =

crates/service/src/routes/status.rs

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use std::collections::HashSet;
-use std::sync::Arc;
 
 use async_graphql_axum::GraphQLRequest;
 use axum::{extract::State, response::IntoResponse, Json};
@@ -58,7 +57,7 @@ impl IntoRequestParameters for WrappedGraphQLRequest {
 
 // Custom middleware function to process the request before reaching the main handler
 pub async fn status(
-    State(state): State<Arc<SubgraphServiceState>>,
+    State(state): State<SubgraphServiceState>,
     request: GraphQLRequest,
 ) -> Result<impl IntoResponse, SubgraphServiceError> {
     let request = request.into_inner();

crates/service/src/service.rs

@@ -9,7 +9,6 @@ use anyhow::anyhow;
 use async_graphql::{EmptySubscription, Schema};
 use async_graphql_axum::GraphQL;
 use axum::{
-    async_trait,
     routing::{post, post_service},
     Json, Router,
 };
@@ -28,7 +27,7 @@ use crate::{
         dips::{AgreementStore, InMemoryAgreementStore},
     },
     routes::dips::Price,
-    service::indexer_service::{IndexerService, IndexerServiceOptions, IndexerServiceRelease},
+    service::indexer_service::{IndexerServiceOptions, IndexerServiceRelease},
 };
 use clap::Parser;
 use tracing::error;
@@ -37,13 +36,12 @@ mod indexer_service;
 mod tap_receipt_header;
 
 pub use indexer_service::{
-    AttestationOutput, IndexerServiceError, IndexerServiceImpl, IndexerServiceResponse,
-    IndexerServiceState,
+    AttestationOutput, IndexerServiceError, IndexerServiceResponse, IndexerServiceState,
 };
 pub use tap_receipt_header::TapReceipt;
 
 #[derive(Debug)]
-struct SubgraphServiceResponse {
+pub struct SubgraphServiceResponse {
     inner: String,
     attestable: bool,
 }
@@ -78,6 +76,7 @@ impl IndexerServiceResponse for SubgraphServiceResponse {
     }
 }
 
+#[derive(Clone)]
 pub struct SubgraphServiceState {
     pub config: &'static Config,
     pub database: PgPool,
@@ -87,27 +86,22 @@ pub struct SubgraphServiceState {
     pub graph_node_query_base_url: &'static Url,
 }
 
-struct SubgraphService {
-    state: Arc<SubgraphServiceState>,
+pub struct SubgraphService {
+    state: SubgraphServiceState,
 }
 
 impl SubgraphService {
-    fn new(state: Arc<SubgraphServiceState>) -> Self {
+    fn new(state: SubgraphServiceState) -> Self {
         Self { state }
     }
 }
 
-#[async_trait]
-impl IndexerServiceImpl for SubgraphService {
-    type Error = SubgraphServiceError;
-    type Response = SubgraphServiceResponse;
-    type State = SubgraphServiceState;
-
-    async fn process_request<Request: DeserializeOwned + Send + std::fmt::Debug + Serialize>(
+impl SubgraphService {
+    pub async fn process_request<Request: DeserializeOwned + Send + std::fmt::Debug + Serialize>(
         &self,
         deployment: DeploymentId,
         request: Request,
-    ) -> Result<Self::Response, Self::Error> {
+    ) -> Result<SubgraphServiceResponse, SubgraphServiceError> {
         let deployment_url = self
             .state
             .graph_node_query_base_url
@@ -166,7 +160,7 @@ pub async fn run() -> anyhow::Result<()> {
     // Some of the subgraph service configuration goes into the so-called
     // "state", which will be passed to any request handler, middleware etc.
     // that is involved in serving requests
-    let state = Arc::new(SubgraphServiceState {
+    let state = SubgraphServiceState {
         config,
         database: database::connect(config.database.clone().get_formated_postgres_url().as_ref())
             .await,
@@ -178,7 +172,7 @@ pub async fn run() -> anyhow::Result<()> {
             .expect("Failed to init HTTP client for Graph Node"),
         graph_node_status_url: &config.graph_node.status_url,
         graph_node_query_base_url: &config.graph_node.query_url,
-    });
+    };
 
     let agreement_store: Arc<dyn AgreementStore> = Arc::new(InMemoryAgreementStore::default());
     let prices: Vec<Price> = vec![];
@@ -215,7 +209,7 @@ pub async fn run() -> anyhow::Result<()> {
         router = router.route("/dips", post_service(GraphQL::new(schema)));
     }
 
-    IndexerService::run(IndexerServiceOptions {
+    indexer_service::run(IndexerServiceOptions {
         release,
         config,
         url_namespace: "subgraphs",