refactor: move common service to proper crate (#493)

Author: gusinacio

Cargo.lock

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

Cargo.toml

@@ -29,20 +29,11 @@ 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"
 
 [dev-dependencies]
 env_logger = { version = "0.11.0", default-features = false }
 test-log = { version = "0.2.12", default-features = false }
 wiremock = "0.5.19"
+test-tap-utils = { path = "../tests/tap-utils" }

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

@@ -202,7 +202,8 @@ mod tests {
     use tap_core::receipt::{Context, ReceiptWithState};
     use tokio::sync::watch;
 
-    use crate::test_vectors::{self, create_signed_receipt, TAP_SENDER};
+    use crate::test_vectors;
+    use test_tap_utils::{self, create_signed_receipt, TAP_EIP712_DOMAIN, TAP_SENDER};
 
     use super::*;
 
@@ -216,12 +217,7 @@ mod tests {
         ))
         .1;
 
-        DenyListCheck::new(
-            pgpool,
-            escrow_accounts_rx,
-            test_vectors::TAP_EIP712_DOMAIN.to_owned(),
-        )
-        .await
+        DenyListCheck::new(pgpool, escrow_accounts_rx, TAP_EIP712_DOMAIN.to_owned()).await
     }
 
     #[sqlx::test(migrations = "../../migrations")]

crates/common/src/indexer_service/mod.rs

@@ -348,6 +348,7 @@ enum CostModelNotification {
 mod tests {
     use alloy::primitives::{address, Address};
     use std::time::Duration;
+    use test_tap_utils::create_signed_receipt;
 
     use sqlx::PgPool;
     use tap_core::receipt::{checks::Check, Context, ReceiptWithState};
@@ -356,7 +357,6 @@ mod tests {
     use crate::{
         cost_model::test::{add_cost_models, global_cost_model, to_db_models},
         tap::AgoraQuery,
-        test_vectors::create_signed_receipt,
     };
 
     use super::MinimumValue;

crates/common/src/lib.rs

@@ -3,18 +3,9 @@
 
 use std::{collections::HashMap, str::FromStr};
 
-use alloy::{
-    dyn_abi::Eip712Domain,
-    primitives::U256,
-    signers::local::{coins_bip39::English, MnemonicBuilder, PrivateKeySigner},
-};
+use alloy::primitives::U256;
 use bip39::Mnemonic;
 use lazy_static::lazy_static;
-use tap_core::{
-    receipt::{Receipt, SignedReceipt},
-    signed_message::EIP712SignedMessage,
-    tap_eip712_domain,
-};
 use thegraph_core::{Address, DeploymentId};
 
 use crate::prelude::{Allocation, AllocationStatus, SubgraphDeployment};
@@ -229,54 +220,4 @@ lazy_static! {
         ),
     ]);
 
-    /// Fixture to generate a wallet and address.
-    /// Address: 0x9858EfFD232B4033E47d90003D41EC34EcaEda94
-    pub static ref TAP_SENDER: (PrivateKeySigner, Address) = {
-        let wallet: PrivateKeySigner = MnemonicBuilder::<English>::default()
-            .phrase("abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about")
-            .build()
-            .unwrap();
-        let address = wallet.address();
-
-        (wallet, address)
-    };
-
-    /// Fixture to generate a wallet and address.
-    /// Address: 0x533661F0fb14d2E8B26223C86a610Dd7D2260892
-    pub static ref TAP_SIGNER: (PrivateKeySigner, Address) = {
-        let wallet: PrivateKeySigner = MnemonicBuilder::<English>::default()
-            .phrase("rude pipe parade travel organ vendor card festival magnet novel forget refuse keep draft tool")
-            .build()
-            .unwrap();
-        let address = wallet.address();
-
-        (wallet, address)
-    };
-
-    pub static ref TAP_EIP712_DOMAIN: Eip712Domain = tap_eip712_domain(
-        1,
-        Address::from([0x11u8; 20])
-    );
-}
-
-/// Function to generate a signed receipt using the TAP_SIGNER wallet.
-pub async fn create_signed_receipt(
-    allocation_id: Address,
-    nonce: u64,
-    timestamp_ns: u64,
-    value: u128,
-) -> SignedReceipt {
-    let (wallet, _) = &*self::TAP_SIGNER;
-
-    EIP712SignedMessage::new(
-        &self::TAP_EIP712_DOMAIN,
-        Receipt {
-            allocation_id,
-            nonce,
-            timestamp_ns,
-            value,
-        },
-        wallet,
-    )
-    .unwrap()
 }

crates/common/src/tap/checks/deny_list_check.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-tap-utils = { path = "../tests/tap-utils" }
 
 [build-dependencies]
 build-info-build = { version = "0.0.39", default-features = false }