refactor: merge poi mods

edgeandnode · Dec 11, 2023 · 59254e0 · 59254e0
1 parent 1342c7b
commit 59254e0
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 73 deletions.
diff --git a/graph-gateway/src/config.rs b/graph-gateway/src/config.rs
@@ -11,7 +11,7 @@ use serde::Deserialize;
 use serde_with::{serde_as, DeserializeAs, DisplayFromStr, FromInto};
 use toolshed::url::Url;
 
-use crate::poi::ProofOfIndexingInfo;
+use crate::indexers::public_poi::ProofOfIndexingInfo;
 
 #[serde_as]
 #[derive(Debug, Deserialize)]

diff --git a/graph-gateway/src/indexers/public_poi.rs b/graph-gateway/src/indexers/public_poi.rs
@@ -10,6 +10,30 @@ use serde_with::{serde_as, DisplayFromStr};
 use thegraph::types::DeploymentId;
 use toolshed::url::Url;
 
+pub type ProofOfIndexing = B256;
+
+#[derive(Debug, Clone, Eq, PartialEq, Hash, serde::Deserialize)]
+pub struct ProofOfIndexingInfo {
+    /// Proof of indexing (POI).
+    pub proof_of_indexing: ProofOfIndexing,
+    /// POI deployment ID (the IPFS Hash in the Graph Network Subgraph).
+    pub deployment_id: DeploymentId,
+    /// POI block number.
+    pub block_number: BlockNumber,
+}
+
+impl ProofOfIndexingInfo {
+    /// Get the POI bytes.
+    pub fn poi(&self) -> ProofOfIndexing {
+        self.proof_of_indexing
+    }
+
+    /// Get the POI metadata.
+    pub fn meta(&self) -> (DeploymentId, BlockNumber) {
+        (self.deployment_id, self.block_number)
+    }
+}
+
 pub async fn query(
     client: reqwest::Client,
     status_url: Url,
@@ -66,8 +90,6 @@ pub async fn merge_queries(
 
 pub const MAX_REQUESTS_PER_QUERY: usize = 10;
 
-pub type ProofOfIndexing = B256;
-
 pub(super) const PUBLIC_PROOF_OF_INDEXING_QUERY_DOCUMENT: &str = indoc! {
     r#"query ($requests: [PublicProofOfIndexingRequest!]!) {
         publicProofsOfIndexing(requests: $requests) {

diff --git a/graph-gateway/src/indexings_blocklist.rs b/graph-gateway/src/indexings_blocklist.rs
@@ -4,15 +4,15 @@ use std::sync::Arc;
 use std::time::Duration;
 
 use alloy_primitives::Address;
-use itertools::Itertools;
+use itertools::Itertools as _;
 use thegraph::types::DeploymentId;
 use tokio::sync::Mutex;
 use toolshed::url::Url;
 
 use indexer_selection::Indexing;
 
 use crate::indexers::public_poi;
-use crate::poi::ProofOfIndexingInfo;
+use crate::indexers::public_poi::ProofOfIndexingInfo;
 use crate::topology::{Deployment, Indexer};
 
 pub const DEFAULT_UPDATE_INTERVAL: Duration = Duration::from_secs(20 * 60); // 20 minutes

diff --git a/graph-gateway/src/lib.rs b/graph-gateway/src/lib.rs
@@ -17,7 +17,6 @@ pub mod indexings_blocklist;
 pub mod ipfs;
 pub mod metrics;
 pub mod network_subgraph;
-pub mod poi;
 pub mod receipts;
 pub mod reports;
 pub mod subgraph_studio;

diff --git a/graph-gateway/src/poi.rs b/graph-gateway/src/poi.rs
diff --git a/graph-gateway/tests/it_indexings_blocklist.rs b/graph-gateway/tests/it_indexings_blocklist.rs
@@ -4,8 +4,8 @@ use alloy_primitives::Address;
 use thegraph::types::DeploymentId;
 use tokio::time::timeout;
 
+use graph_gateway::indexers::public_poi::{ProofOfIndexing, ProofOfIndexingInfo};
 use graph_gateway::indexings_blocklist::check_indexer_pois;
-use graph_gateway::poi::{ProofOfIndexing, ProofOfIndexingInfo};
 
 /// Test utility function to create a valid `ProofOfIndexingInfo` with an zeros POI.
 fn zero_poi() -> ProofOfIndexing {