refactor: update more fields to config crate in service

Author: shiyasmohd

common/src/indexer_service/http/indexer_service.rs

@@ -208,19 +208,12 @@ impl IndexerService {
 
         let network_subgraph: &'static SubgraphClient = Box::leak(Box::new(SubgraphClient::new(
             http_client.clone(),
-            options
-                .config
-                .graph_node
-                .as_ref()
-                .zip(options.config.subgraphs.network.config.deployment_id)
-                .map(|(graph_node, deployment)| {
-                    DeploymentDetails::for_graph_node(
-                        &graph_node.status_url,
-                        &graph_node.query_base_url,
-                        deployment,
-                    )
-                })
-                .transpose()?,
+            Some(DeploymentDetails {
+                deployment: options.config.subgraphs.network.config.deployment_id,
+                status_url: Some(options.config.graph_node.status_url.clone()),
+                query_url: options.config.graph_node.query_url.clone(),
+                query_auth_token: options.config.service.free_query_auth_token.clone(),
+            }),
             DeploymentDetails::for_query_url_with_token(
                 &options
                     .config
@@ -270,26 +263,19 @@ impl IndexerService {
         let attestation_signers = attestation_signers(
             allocations.clone(),
             options.config.indexer.operator_mnemonic.to_string(),
-            options.config.blockchain.chain_id as u64,
+            options.config.blockchain.chain_id.clone() as u64,
             dispute_manager,
         )
         .await;
 
         let escrow_subgraph: &'static SubgraphClient = Box::leak(Box::new(SubgraphClient::new(
             http_client,
-            options
-                .config
-                .graph_node
-                .as_ref()
-                .zip(options.config.subgraphs.escrow.config.deployment_id)
-                .map(|(graph_node, deployment)| {
-                    DeploymentDetails::for_graph_node(
-                        &graph_node.status_url,
-                        &graph_node.query_base_url,
-                        deployment,
-                    )
-                })
-                .transpose()?,
+            Some(DeploymentDetails {
+                deployment: options.config.subgraphs.escrow.config.deployment_id.clone(),
+                status_url: Some(options.config.graph_node.status_url.clone()),
+                query_url: options.config.graph_node.query_url.clone(),
+                query_auth_token: options.config.service.free_query_auth_token.clone(),
+            }),
             DeploymentDetails::for_query_url_with_token(
                 &options.config.subgraphs.escrow.config.query_url.to_string(),
                 options
@@ -331,13 +317,14 @@ impl IndexerService {
                 &options
                     .config
                     .database
+                    .clone()
                     .get_formated_postgres_url()
                     .to_string(),
             )
             .await?;
 
         let domain_separator = tap_eip712_domain(
-            options.config.blockchain.chain_id as u64,
+            options.config.blockchain.chain_id.clone() as u64,
             options.config.blockchain.receipts_verifier_address,
         );
         let indexer_context =

common/src/indexer_service/http/request_handler.rs

@@ -90,7 +90,7 @@ where
         {
             None => return Err(IndexerServiceError::Unauthorized),
             Some(ref token) => {
-                if Some(token) != state.config.server.free_query_auth_token.as_ref() {
+                if Some(token) != state.config.service.free_query_auth_token.as_ref() {
                     return Err(IndexerServiceError::InvalidFreeQueryAuthToken);
                 }
             }

service/src/service.rs

@@ -4,13 +4,13 @@
 use std::sync::Arc;
 use std::time::Duration;
 
-use super::{config::Config, error::SubgraphServiceError, routes};
+use super::{error::SubgraphServiceError, routes};
 use anyhow::anyhow;
 use axum::{async_trait, routing::post, Json, Router};
 use indexer_common::indexer_service::http::{
     AttestationOutput, IndexerServiceImpl, IndexerServiceResponse,
 };
-use indexer_config::Config as MainConfig;
+use indexer_config::Config;
 use reqwest::Url;
 use serde_json::{json, Value};
 use sqlx::PgPool;
@@ -129,7 +129,7 @@ pub async fn run() -> anyhow::Result<()> {
     // Load the json-rpc service configuration, which is a combination of the
     // general configuration options for any indexer service and specific
     // options added for JSON-RPC
-    let config = MainConfig::parse(indexer_config::ConfigPrefix::Service, cli.config.as_ref())
+    let config = Config::parse(indexer_config::ConfigPrefix::Service, cli.config.as_ref())
         .map_err(|e| {
             error!(
                 "Invalid configuration file `{}`: {}, if a value is missing you can also use \
@@ -151,32 +151,27 @@ pub async fn run() -> anyhow::Result<()> {
     // that is involved in serving requests
     let state = Arc::new(SubgraphServiceState {
         config: config.clone(),
-        database: database::connect(&config.0.database.postgres_url).await,
+        database: database::connect(
+            &config
+                .database
+                .clone()
+                .get_formated_postgres_url()
+                .to_string(),
+        )
+        .await,
         cost_schema: routes::cost::build_schema().await,
         graph_node_client: reqwest::ClientBuilder::new()
             .tcp_nodelay(true)
             .timeout(Duration::from_secs(30))
             .build()
             .expect("Failed to init HTTP client for Graph Node"),
-        graph_node_status_url: config
-            .0
-            .graph_node
-            .as_ref()
-            .expect("Config must have `common.graph_node.status_url` set")
-            .status_url
-            .clone(),
-        graph_node_query_base_url: config
-            .0
-            .graph_node
-            .as_ref()
-            .expect("config must have `common.graph_node.query_url` set")
-            .query_base_url
-            .clone(),
+        graph_node_status_url: config.graph_node.status_url.clone().to_string(),
+        graph_node_query_base_url: config.graph_node.query_url.clone().to_string(),
     });
 
     IndexerService::run(IndexerServiceOptions {
         release,
-        config: config.0.clone(),
+        config: config.clone(),
         url_namespace: "subgraphs",
         service_impl: SubgraphService::new(state.clone()),
         extra_routes: Router::new()