refactor: move extra routes to routes mod

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

Author: gusinacio

crates/service/src/service/health.rs renamed to crates/service/src/routes/health.rs

@@ -3,6 +3,12 @@
 
 pub mod cost;
 pub mod dips;
+mod health;
+mod request_handler;
+mod static_subgraph;
 mod status;
 
+pub use health::health;
+pub use request_handler::request_handler;
+pub use static_subgraph::static_subgraph_request_handler;
 pub use status::status;

crates/service/src/routes/mod.rs

@@ -18,10 +18,9 @@ use tap_core::receipt::Context;
 use thegraph_core::DeploymentId;
 use tracing::trace;
 
-use super::{
-    indexer_service::{AttestationOutput, IndexerServiceError, IndexerServiceState},
-    tap_receipt_header::TapReceipt,
-    IndexerServiceImpl, IndexerServiceResponse,
+use crate::service::{
+    AttestationOutput, IndexerServiceError, IndexerServiceImpl, IndexerServiceResponse,
+    IndexerServiceState, TapReceipt,
 };
 
 lazy_static! {

crates/service/src/service/request_handler.rs renamed to crates/service/src/routes/request_handler.rs

@@ -6,7 +6,7 @@ use tracing::warn;
 
 use indexer_common::SubgraphClient;
 
-use super::{indexer_service::IndexerServiceError, IndexerServiceImpl};
+use crate::service::{IndexerServiceError, IndexerServiceImpl};
 
 #[autometrics::autometrics]
 pub async fn static_subgraph_request_handler<I>(

crates/service/src/service/static_subgraph.rs renamed to crates/service/src/routes/static_subgraph.rs

@@ -28,20 +28,20 @@ use crate::{
         dips::{AgreementStore, InMemoryAgreementStore},
     },
     routes::dips::Price,
-    service::indexer_service::{
-        AttestationOutput, IndexerService, IndexerServiceImpl, IndexerServiceOptions,
-        IndexerServiceRelease, IndexerServiceResponse,
-    },
+    service::indexer_service::{IndexerService, IndexerServiceOptions, IndexerServiceRelease},
 };
 use clap::Parser;
 use tracing::error;
 
-mod health;
 mod indexer_service;
-mod request_handler;
-mod static_subgraph;
 mod tap_receipt_header;
 
+pub use indexer_service::{
+    AttestationOutput, IndexerServiceError, IndexerServiceImpl, IndexerServiceResponse,
+    IndexerServiceState,
+};
+pub use tap_receipt_header::TapReceipt;
+
 #[derive(Debug)]
 struct SubgraphServiceResponse {
     inner: String,

crates/service/src/service.rs

@@ -39,8 +39,9 @@ use tower_governor::{governor::GovernorConfigBuilder, GovernorLayer};
 use tower_http::{cors, cors::CorsLayer, normalize_path::NormalizePath, trace::TraceLayer};
 use tracing::{error, info, info_span};
 
-use super::request_handler::request_handler;
-use super::{health::health, static_subgraph::static_subgraph_request_handler};
+use crate::routes::health;
+use crate::routes::request_handler;
+use crate::routes::static_subgraph_request_handler;
 use crate::tap::IndexerTapContext;
 use indexer_config::Config;