server: Make the indexingStatuses argument required

Signed-off-by: Maksim Dimitrov <[email protected]>

Author: dimitrovmaksim

server/index-node/src/resolver.rs

@@ -123,7 +123,7 @@ impl<S: Store> IndexNodeResolver<S> {
     }
 
     fn resolve_indexing_statuses(&self, field: &a::Field) -> Result<r::Value, QueryExecutionError> {
-        let deployments = field
+        let deployments: Vec<String> = field
             .argument_value("subgraphs")
             .map(|value| match value {
                 r::Value::List(ids) => ids
@@ -135,7 +135,7 @@ impl<S: Store> IndexNodeResolver<S> {
                     .collect(),
                 _ => unreachable!(),
             })
-            .unwrap_or_else(Vec::new);
+            .unwrap();
 
         if deployments.is_empty() {
             return Ok(r::Value::List(vec![]));
@@ -171,6 +171,35 @@ impl<S: Store> IndexNodeResolver<S> {
         Ok(infos.into_value())
     }
 
+    fn resolve_indexing_status_for_version(
+        &self,
+        field: &a::Field,
+
+        // If `true` return the current version, if `false` return the pending version.
+        current_version: bool,
+    ) -> Result<r::Value, QueryExecutionError> {
+        // We can safely unwrap because the argument is non-nullable and has been validated.
+        let subgraph_name = field.get_required::<String>("subgraphName").unwrap();
+
+        debug!(
+            self.logger,
+            "Resolve indexing status for subgraph name";
+            "name" => &subgraph_name,
+            "current_version" => current_version,
+        );
+
+        let infos = self.store.status(status::Filter::SubgraphVersion(
+            subgraph_name,
+            current_version,
+        ))?;
+
+        Ok(infos
+            .into_iter()
+            .next()
+            .map(|info| info.into_value())
+            .unwrap_or(r::Value::Null))
+    }
+
     fn resolve_entity_changes_in_block(
         &self,
         field: &a::Field,
@@ -443,35 +472,6 @@ impl<S: Store> IndexNodeResolver<S> {
         Ok(r::Value::List(public_poi_results))
     }
 
-    fn resolve_indexing_status_for_version(
-        &self,
-        field: &a::Field,
-
-        // If `true` return the current version, if `false` return the pending version.
-        current_version: bool,
-    ) -> Result<r::Value, QueryExecutionError> {
-        // We can safely unwrap because the argument is non-nullable and has been validated.
-        let subgraph_name = field.get_required::<String>("subgraphName").unwrap();
-
-        debug!(
-            self.logger,
-            "Resolve indexing status for subgraph name";
-            "name" => &subgraph_name,
-            "current_version" => current_version,
-        );
-
-        let infos = self.store.status(status::Filter::SubgraphVersion(
-            subgraph_name,
-            current_version,
-        ))?;
-
-        Ok(infos
-            .into_iter()
-            .next()
-            .map(|info| info.into_value())
-            .unwrap_or(r::Value::Null))
-    }
-
     async fn validate_and_extract_features<C, SgStore>(
         subgraph_store: &Arc<SgStore>,
         unvalidated_subgraph_manifest: UnvalidatedSubgraphManifest<C>,

server/index-node/src/schema.graphql

@@ -21,7 +21,7 @@ type Query {
   indexingStatusesForSubgraphName(
     subgraphName: String!
   ): [SubgraphIndexingStatus!]!
-  indexingStatuses(subgraphs: [String!]): [SubgraphIndexingStatus!]!
+  indexingStatuses(subgraphs: [String!]!): [SubgraphIndexingStatus!]!
   proofOfIndexing(
     subgraph: String!
     blockNumber: Int!