refactor: move common service to proper crate

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

Author: gusinacio

Cargo.lock

@@ -6,6 +6,7 @@ members = [
   "crates/query",
   "crates/service",
   "crates/tap-agent",
+  "crates/test-vector",
 ]
 resolver = "2"
 

Cargo.toml

@@ -29,16 +29,6 @@ serde_json = { workspace = true }
 tokio = { workspace = true, features = ["fs", "tokio-macros"] }
 cost-model = { git = "https://github.com/graphprotocol/agora", rev = "3ed34ca" }
 regex = "1.7.1"
-axum-extra = { version = "0.9.3", features = [
-  "typed-header",
-], default-features = false }
-autometrics = { version = "1.0.1", features = ["prometheus-exporter"] }
-tower_governor = "0.4.0"
-tower-http = { version = "0.5.2", features = [
-  "cors",
-  "normalize-path",
-  "trace",
-] }
 tokio-util = "0.7.10"
 bip39 = "2.0.0"
 

crates/common/Cargo.toml

@@ -7,7 +7,6 @@ pub mod attestations;
 pub mod cost_model;
 pub mod escrow_accounts;
 pub mod graphql;
-pub mod indexer_service;
 pub mod subgraph_client;
 pub mod tap;
 pub mod watcher;

crates/common/src/indexer_service/http/mod.rs

@@ -10,6 +10,7 @@ license = "Apache-2.0"
 indexer-common = { path = "../common" }
 indexer-config = { path = "../config" }
 indexer-dips = { path = "../dips" }
+indexer-query = { path = "../query" }
 anyhow = { workspace = true }
 prometheus = { workspace = true }
 reqwest = { workspace = true }
@@ -22,6 +23,7 @@ axum.workspace = true
 sqlx.workspace = true
 thegraph-core.workspace = true
 thegraph-graphql-http.workspace = true
+graphql_client.workspace = true
 tracing-subscriber = { workspace = true, features = ["fmt"] }
 clap = { workspace = true, features = ["derive"] }
 build-info.workspace = true
@@ -30,11 +32,23 @@ async-graphql = { version = "7.0.11", default-features = false }
 async-graphql-axum = "7.0.11"
 base64.workspace = true
 graphql = { git = "https://github.com/edgeandnode/toolshed", tag = "graphql-v0.3.0" }
+tap_core.workspace = true
 uuid.workspace = true
 alloy.workspace = true
- 
+tower_governor = "0.4.0"
+tower-http = { version = "0.5.2", features = [
+  "cors",
+  "normalize-path",
+  "trace",
+] }
+autometrics = { version = "1.0.1", features = ["prometheus-exporter"] }
+axum-extra = { version = "0.9.3", features = [
+  "typed-header",
+], default-features = false }
+
 [dev-dependencies]
 hex-literal = "0.4.1"
+test-vector = { path = "../test-vector" }
 
 [build-dependencies]
 build-info-build = { version = "0.0.39", default-features = false }

crates/common/src/indexer_service/mod.rs

@@ -13,9 +13,6 @@ use axum::{
     routing::{post, post_service},
     Json, Router,
 };
-use indexer_common::indexer_service::http::{
-    AttestationOutput, IndexerServiceImpl, IndexerServiceResponse,
-};
 use indexer_config::{Config, DipsConfig};
 use reqwest::Url;
 use serde::{de::DeserializeOwned, Serialize};
@@ -31,14 +28,20 @@ use crate::{
         dips::{AgreementStore, InMemoryAgreementStore},
     },
     routes::dips::Price,
+    service::indexer_service::{
+        AttestationOutput, IndexerService, IndexerServiceImpl, IndexerServiceOptions,
+        IndexerServiceRelease, IndexerServiceResponse,
+    },
 };
-
 use clap::Parser;
-use indexer_common::indexer_service::http::{
-    IndexerService, IndexerServiceOptions, IndexerServiceRelease,
-};
 use tracing::error;
 
+mod health;
+mod indexer_service;
+mod request_handler;
+mod static_subgraph;
+mod tap_receipt_header;
+
 #[derive(Debug)]
 struct SubgraphServiceResponse {
     inner: String,

crates/common/src/lib.rs

@@ -14,6 +14,15 @@ use axum::{
 };
 use axum::{serve, ServiceExt};
 use build_info::BuildInfo;
+use indexer_common::{
+    address::public_key,
+    escrow_accounts::{EscrowAccounts, EscrowAccountsError},
+    prelude::{
+        attestation_signers, dispute_manager, escrow_accounts, indexer_allocations,
+        AttestationSigner, DeploymentDetails, SubgraphClient,
+    },
+    tap::IndexerTapContext,
+};
 use prometheus::TextEncoder;
 use reqwest::StatusCode;
 use serde::{de::DeserializeOwned, Serialize};
@@ -30,22 +39,10 @@ use tokio::signal;
 use tokio::sync::watch::Receiver;
 use tower_governor::{governor::GovernorConfigBuilder, GovernorLayer};
 use tower_http::{cors, cors::CorsLayer, normalize_path::NormalizePath, trace::TraceLayer};
-use tracing::error;
-use tracing::{info, info_span};
+use tracing::{error, info, info_span};
 
 use super::request_handler::request_handler;
-use crate::escrow_accounts::EscrowAccounts;
-use crate::escrow_accounts::EscrowAccountsError;
-use crate::indexer_service::http::health::health;
-use crate::{
-    address::public_key,
-    indexer_service::http::static_subgraph::static_subgraph_request_handler,
-    prelude::{
-        attestation_signers, dispute_manager, escrow_accounts, indexer_allocations,
-        AttestationSigner, DeploymentDetails, SubgraphClient,
-    },
-    tap::IndexerTapContext,
-};
+use super::{health::health, static_subgraph::static_subgraph_request_handler};
 use indexer_config::Config;
 
 pub trait IndexerServiceResponse {