refactor: create indexer-types and update re-exports (#497)

Author: gusinacio

Cargo.lock

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

Cargo.toml

@@ -6,6 +6,7 @@ edition = "2021"
 [dependencies]
 indexer-config = { path = "../config" }
 indexer-query = { path = "../query" }
+indexer-types = { path = "../types" }
 thiserror.workspace = true
 async-trait.workspace = true
 alloy.workspace = true
@@ -20,7 +21,6 @@ prometheus.workspace = true
 thegraph-core.workspace = true
 axum.workspace = true
 lazy_static.workspace = true
-thegraph-graphql-http.workspace = true
 build-info.workspace = true
 graphql_client.workspace = true
 

crates/common/Cargo.toml

@@ -1,46 +1,16 @@
 // Copyright 2023-, Edge & Node, GraphOps, and Semiotic Labs.
 // SPDX-License-Identifier: Apache-2.0
 
+use crate::{client::SubgraphClient, watcher::new_watcher};
+use alloy::{primitives::Address, primitives::TxHash};
+use indexer_query::allocations_query::{self, AllocationsQuery};
+use indexer_types::Allocation;
 use std::{
     collections::HashMap,
-    str::FromStr,
     time::{Duration, SystemTime, UNIX_EPOCH},
 };
-
-use super::Allocation;
-use crate::{prelude::SubgraphClient, watcher::new_watcher};
-use alloy::primitives::TxHash;
-use indexer_query::allocations_query::{self, AllocationsQuery};
-use thegraph_core::{Address, DeploymentId};
 use tokio::sync::watch::Receiver;
 
-impl TryFrom<allocations_query::AllocationFragment> for Allocation {
-    type Error = anyhow::Error;
-
-    fn try_from(
-        value: allocations_query::AllocationsQueryAllocations,
-    ) -> Result<Self, Self::Error> {
-        Ok(Self {
-            id: Address::from_str(&value.id)?,
-            status: super::AllocationStatus::Null,
-            subgraph_deployment: super::SubgraphDeployment {
-                id: DeploymentId::from_str(&value.subgraph_deployment.id)?,
-                denied_at: Some(value.subgraph_deployment.denied_at as u64),
-            },
-            indexer: Address::from_str(&value.indexer.id)?,
-            allocated_tokens: value.allocated_tokens,
-            created_at_epoch: value.created_at_epoch as u64,
-            created_at_block_hash: value.created_at_block_hash.to_string(),
-            closed_at_epoch: value.closed_at_epoch.map(|v| v as u64),
-            closed_at_epoch_start_block_hash: None,
-            previous_epoch_start_block_hash: None,
-            poi: None,
-            query_fee_rebates: None,
-            query_fees_collected: None,
-        })
-    }
-}
-
 /// An always up-to-date list of an indexer's active and recently closed allocations.
 pub async fn indexer_allocations(
     network_subgraph: &'static SubgraphClient,
@@ -118,7 +88,7 @@ mod test {
         "https://api.thegraph.com/subgraphs/name/graphprotocol/graph-network-arbitrum";
     use std::str::FromStr;
 
-    use crate::{prelude::SubgraphClient, subgraph_client::DeploymentDetails};
+    use crate::client::{DeploymentDetails, SubgraphClient};
 
     use super::*;
 

crates/common/src/allocations/monitor.rs renamed to crates/common/src/allocations.rs

@@ -1,6 +1,8 @@
 // Copyright 2023-, Edge & Node, GraphOps, and Semiotic Labs.
 // SPDX-License-Identifier: Apache-2.0
 
-pub mod dispute_manager;
+mod monitor;
 pub mod signer;
-pub mod signers;
+
+pub use monitor::attestation_signers;
+pub use signer::{derive_key_pair, AttestationSigner};

crates/common/src/attestations/mod.rs renamed to crates/common/src/attestation/mod.rs

@@ -8,10 +8,8 @@ use thegraph_core::{Address, ChainId};
 use tokio::sync::watch::Receiver;
 use tracing::warn;
 
-use crate::{
-    prelude::{Allocation, AttestationSigner},
-    watcher::join_and_map_watcher,
-};
+use crate::{attestation::signer::AttestationSigner, watcher::join_and_map_watcher};
+use indexer_types::Allocation;
 
 /// An always up-to-date list of attestation signers, one for each of the indexer's allocations.
 pub fn attestation_signers(

crates/common/src/attestations/signers.rs renamed to crates/common/src/attestation/monitor.rs

@@ -10,7 +10,7 @@ use alloy::{
 };
 use thegraph_core::{attestation, Address, Attestation, ChainId, DeploymentId};
 
-use crate::prelude::Allocation;
+use indexer_types::Allocation;
 
 pub fn derive_key_pair(
     indexer_mnemonic: &str,
@@ -121,10 +121,8 @@ mod tests {
     use std::str::FromStr;
     use test_log::test;
 
-    use crate::{
-        prelude::{Allocation, AllocationStatus, SubgraphDeployment},
-        test_vectors::DISPUTE_MANAGER_ADDRESS,
-    };
+    use crate::test_vectors::DISPUTE_MANAGER_ADDRESS;
+    use indexer_types::{Allocation, AllocationStatus, SubgraphDeployment};
 
     use super::*;
 

crates/common/src/attestations/signer.rs renamed to crates/common/src/attestation/signer.rs

@@ -1,7 +1,7 @@
 // Copyright 2023-, Edge & Node, GraphOps, and Semiotic Labs.
 // SPDX-License-Identifier: Apache-2.0
 
-mod client;
 mod monitor;
+mod subgraph_client;
 
-pub use client::{DeploymentDetails, Query, QueryVariables, SubgraphClient};
+pub use subgraph_client::{DeploymentDetails, SubgraphClient};

crates/common/src/subgraph_client/mod.rs renamed to crates/common/src/client/mod.rs

@@ -6,75 +6,12 @@ use anyhow::anyhow;
 use axum::body::Bytes;
 use graphql_client::GraphQLQuery;
 use reqwest::{header, Url};
-use serde_json::{Map, Value};
 use thegraph_core::DeploymentId;
-use thegraph_graphql_http::{
-    graphql::{Document, IntoDocument},
-    http::request::{IntoRequestParameters, RequestParameters},
-};
 use tokio::sync::watch::Receiver;
 use tracing::warn;
 
-#[derive(Clone)]
-pub struct Query {
-    pub query: Document,
-    pub variables: Map<String, Value>,
-}
-
 pub type ResponseResult<T> = Result<T, anyhow::Error>;
 
-impl Query {
-    pub fn new(query: &str) -> Self {
-        Self {
-            query: query.into_document(),
-            variables: Map::default(),
-        }
-    }
-
-    pub fn new_with_variables(
-        query: impl IntoDocument,
-        variables: impl Into<QueryVariables>,
-    ) -> Self {
-        Self {
-            query: query.into_document(),
-            variables: variables.into().into(),
-        }
-    }
-}
-
-pub struct QueryVariables(Map<String, Value>);
-
-impl<'a, T> From<T> for QueryVariables
-where
-    T: IntoIterator<Item = (&'a str, Value)>,
-{
-    fn from(variables: T) -> Self {
-        Self(
-            variables
-                .into_iter()
-                .map(|(k, v)| (k.to_string(), v))
-                .collect::<Map<_, _>>(),
-        )
-    }
-}
-
-impl From<QueryVariables> for Map<String, Value> {
-    fn from(variables: QueryVariables) -> Self {
-        variables.0
-    }
-}
-
-impl IntoRequestParameters for Query {
-    fn into_request_parameters(self) -> RequestParameters {
-        RequestParameters {
-            query: self.query.into_document(),
-            variables: self.variables,
-            extensions: Map::default(),
-            operation_name: None,
-        }
-    }
-}
-
 #[derive(Debug, Clone)]
 pub struct DeploymentDetails {
     pub deployment: Option<DeploymentId>,