refactor: consolidate indexing status requests

src/indexers.rs

@@ -1,2 +1 @@
-pub mod indexing_progress;
 pub mod public_poi;

src/network.rs

@@ -1,6 +1,7 @@
 pub use errors::{DeploymentError, SubgraphError};
 pub use internal::{Indexing, IndexingId};
 pub use service::{NetworkService, ResolvedSubgraphInfo};
+use thegraph_graphql_http::graphql::{IntoDocument as _, IntoDocumentWithVariables};
 
 pub mod cost_model;
 mod errors;
@@ -12,3 +13,16 @@ pub mod internal;
 pub mod service;
 pub mod subgraph_client;
 pub mod version_filter;
+
+pub struct GraphQlRequest {
+    document: String,
+    variables: serde_json::Value,
+}
+impl IntoDocumentWithVariables for GraphQlRequest {
+    type Variables = serde_json::Value;
+    fn into_document_with_variables(
+        self,
+    ) -> (thegraph_graphql_http::graphql::Document, Self::Variables) {
+        (self.document.into_document(), self.variables)
+    }
+}

src/network/cost_model.rs

@@ -2,12 +2,11 @@ use std::collections::HashMap;
 
 use anyhow::anyhow;
 use thegraph_core::DeploymentId;
-use thegraph_graphql_http::{
-    graphql::{Document, IntoDocument, IntoDocumentWithVariables},
-    http_client::ReqwestExt,
-};
+use thegraph_graphql_http::http_client::ReqwestExt;
 use url::Url;
 
+use crate::network::GraphQlRequest;
+
 pub struct CostModelResolver {
     http: reqwest::Client,
     cache: parking_lot::Mutex<HashMap<DeploymentId, u128>>,
@@ -51,15 +50,14 @@ impl CostModelResolver {
     ) -> anyhow::Result<HashMap<DeploymentId, String>> {
         let url = url.join("cost").map_err(|_| anyhow!("invalid URL"))?;
 
-        const QUERY: &str = r#"
+        let query = r#"
             query costModels($deployments: [String!]!) {
                 costModels(deployments: $deployments) {
                     deployment
                     model
                 }
             }
         "#;
-        let deployments = deployments.iter().map(|item| item.to_string()).collect();
         #[derive(serde::Deserialize)]
         #[serde(rename_all = "camelCase")]
         struct Response {
@@ -70,22 +68,13 @@ impl CostModelResolver {
             pub deployment: DeploymentId,
             pub model: String,
         }
-        struct Request {
-            deployments: Vec<String>,
-        }
-        impl IntoDocumentWithVariables for Request {
-            type Variables = serde_json::Value;
-            fn into_document_with_variables(self) -> (Document, Self::Variables) {
-                (
-                    QUERY.into_document(),
-                    serde_json::json!({ "deployments": self.deployments }),
-                )
-            }
-        }
         let resp = self
             .http
             .post(url)
-            .send_graphql::<Response>(Request { deployments })
+            .send_graphql::<Response>(GraphQlRequest {
+                document: query.to_string(),
+                variables: serde_json::json!({ "deployments": deployments }),
+            })
             .await??;
         Ok(resp
             .cost_models