update to latest

Author: dotansimha

Cargo.lock

@@ -21,7 +21,7 @@ http = "0.2.3"
 fail = { version = "0.5", features = ["failpoints"] }
 futures = "0.1.21"
 graphql-parser = "0.4.0"
-graphql-tools = "0.0.4"
+graphql-tools = "0.0.5"
 lazy_static = "1.4.0"
 mockall = "0.8.3"
 num-bigint = { version = "^0.2.6", features = ["serde"] }

graph/Cargo.toml

@@ -1,5 +1,6 @@
 use super::error::{QueryError, QueryExecutionError};
 use crate::prelude::{r, CacheWeight, DeploymentHash};
+use graphql_tools::validation::utils::ValidationError;
 use http::header::{
     ACCESS_CONTROL_ALLOW_HEADERS, ACCESS_CONTROL_ALLOW_METHODS, ACCESS_CONTROL_ALLOW_ORIGIN,
     CONTENT_TYPE,
@@ -9,7 +10,6 @@ use serde::Serialize;
 use std::collections::BTreeMap;
 use std::convert::TryFrom;
 use std::sync::Arc;
-use graphql_tools::validation::utils::{ValidationError};
 
 fn serialize_data<S>(data: &Option<Data>, serializer: S) -> Result<S::Ok, S::Error>
 where
@@ -253,17 +253,23 @@ impl From<QueryExecutionError> for QueryResult {
 }
 
 impl From<Vec<ValidationError>> for QueryResult {
-  fn from(errors: Vec<ValidationError>) -> Self {
-    let execution_errors = errors.iter().map(|e| {
-      QueryError::ExecutionError(QueryExecutionError::ValidationError(e.locations.clone().into_iter().nth(0), e.message.clone()))
-    }).collect::<Vec<QueryError>>();
-
-      QueryResult {
-          data: None,
-          errors: execution_errors,
-          deployment: None,
-      }
-  }
+    fn from(errors: Vec<ValidationError>) -> Self {
+        let execution_errors = errors
+            .iter()
+            .map(|e| {
+                QueryError::ExecutionError(QueryExecutionError::ValidationError(
+                    e.locations.clone().into_iter().nth(0),
+                    e.message.clone(),
+                ))
+            })
+            .collect::<Vec<QueryError>>();
+
+        QueryResult {
+            data: None,
+            errors: execution_errors,
+            deployment: None,
+        }
+    }
 }
 
 impl From<QueryError> for QueryResult {

graph/src/data/query/result.rs

@@ -8,7 +8,7 @@ crossbeam = "0.8"
 futures01 = { package="futures", version="0.1.29" }
 graph = { path = "../graph" }
 graphql-parser = "0.4.0"
-graphql-tools = "0.0.4"
+graphql-tools = "0.0.5"
 indexmap = "1.7"
 Inflector = "0.11.3"
 lazy_static = "1.2.0"

graphql/Cargo.toml

@@ -21,8 +21,8 @@ use graph::{
     data::query::{QueryResults, QueryTarget},
     prelude::QueryStore,
 };
+use graphql_tools::validation::rules::default_rules_validation_plan;
 use graphql_tools::validation::validate::{validate, ValidationPlan};
-use graphql_tools::validation::rules::{OverlappingFieldsCanBeMerged};
 
 use lazy_static::lazy_static;
 
@@ -138,16 +138,19 @@ where
     ) -> Self {
         let logger = logger.new(o!("component" => "GraphQlRunner"));
         let result_size = Arc::new(ResultSizeMetrics::new(registry));
-        let mut graphql_validation_plan = ValidationPlan { rules: Vec::new() };
-        graphql_validation_plan.add_rule(Box::new(OverlappingFieldsCanBeMerged {}));
+        // This is created only once, and includes the following rules at the moment:
+        // LoneAnonymousOperation
+        // FragmentsOnCompositeTypes
+        // OverlappingFieldsCanBeMerged
+        let graphql_validation_plan = default_rules_validation_plan();
 
         GraphQlRunner {
             logger,
             store,
             subscription_manager,
             load_manager,
             result_size,
-            graphql_validation_plan
+            graphql_validation_plan,
         }
     }
 
@@ -204,7 +207,11 @@ where
         let state = store.deployment_state().await?;
         let network = Some(store.network_name().to_string());
         let schema = store.api_schema()?;
-        let validation_errors = validate(&schema.document(), &query.document, &self.graphql_validation_plan);
+        let validation_errors = validate(
+            &schema.document(),
+            &query.document,
+            &self.graphql_validation_plan,
+        );
 
         if validation_errors.len() > 0 {
             return Ok(QueryResults::from(QueryResult::from(validation_errors)));

graphql/src/runner.rs

@@ -33,7 +33,7 @@ pub async fn run(
     let document = graphql_parser::parse_query(&query)?.into_static();
     // Ideally, `validate` phase should happen here, but we don't have the schema at this point,
     // so we call it in `graphql/runner.rs` instead, where we have the api schema loaded.
-    
+
     let vars: Vec<(String, r::Value)> = vars
         .into_iter()
         .map(|v| {