fixes

Author: dotansimha

graph/src/data/query/error.rs

@@ -1,5 +1,4 @@
 use graphql_parser::Pos;
-use graphql_tools::validation::utils::ValidationError;
 use hex::FromHexError;
 use num_bigint;
 use serde::ser::*;
@@ -292,12 +291,6 @@ impl fmt::Display for QueryExecutionError {
     }
 }
 
-impl From<ValidationError> for QueryExecutionError {
-    fn from(e: ValidationError) -> Self {
-        QueryExecutionError::ValidationError(e.locations.clone().into_iter().nth(0), e.message)
-    }
-}
-
 impl From<QueryExecutionError> for Vec<QueryExecutionError> {
     fn from(e: QueryExecutionError) -> Self {
         vec![e]

graphql/src/execution/query.rs

@@ -10,11 +10,10 @@ use graph::data::graphql::{
     ext::{DocumentExt, TypeExt},
     ObjectOrInterface,
 };
+use graph::data::query::QueryExecutionError;
 use graph::data::query::{Query as GraphDataQuery, QueryVariables};
 use graph::data::schema::ApiSchema;
-use graph::prelude::{
-    info, o, q, r, s, BlockNumber, CheapClone, Logger, QueryExecutionError, TryFromValue,
-};
+use graph::prelude::{info, o, q, r, s, BlockNumber, CheapClone, Logger, TryFromValue};
 
 use crate::introspection::introspection_schema;
 use crate::query::{ast as qast, ext::BlockConstraint};
@@ -122,7 +121,12 @@ impl Query {
         if validation_errors.len() > 0 {
             return Err(validation_errors
                 .into_iter()
-                .map(|e| QueryExecutionError::from(e))
+                .map(|e| {
+                    QueryExecutionError::ValidationError(
+                        e.locations.clone().into_iter().nth(0),
+                        e.message,
+                    )
+                })
                 .collect());
         }
 

graphql/src/runner.rs

@@ -213,7 +213,7 @@ where
         let state = store.deployment_state().await?;
         let network = Some(store.network_name().to_string());
         let schema = store.api_schema()?;
-        
+
         // Test only, see c435c25decbc4ad7bbbadf8e0ced0ff2
         #[cfg(debug_assertions)]
         let state = INITIAL_DEPLOYMENT_STATE_FOR_TESTS