fixes

Author: dotansimha

graph/src/data/query/error.rs

@@ -292,18 +292,18 @@ impl fmt::Display for QueryExecutionError {
     }
 }
 
-impl From<QueryExecutionError> for Vec<QueryExecutionError> {
-    fn from(e: QueryExecutionError) -> Self {
-        vec![e]
-    }
-}
-
 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]
+    }
+}
+
 impl From<FromHexError> for QueryExecutionError {
     fn from(e: FromHexError) -> Self {
         QueryExecutionError::ValueParseError("Bytes".to_string(), e.to_string())

graph/src/data/query/result.rs

@@ -172,7 +172,7 @@ impl QueryResults {
     }
 }
 
-/// The result of running a GraphQL query.
+/// The result of running a query, if successful.
 #[derive(Debug, Serialize)]
 pub struct QueryResult {
     #[serde(

graphql/Cargo.toml

@@ -21,4 +21,4 @@ anyhow = "1.0"
 [dev-dependencies]
 pretty_assertions = "1.0.0"
 test-store = { path = "../store/test-store" }
-graph-chain-ethereum = { path = "../chain/ethereum" }
+graph-chain-ethereum = { path = "../chain/ethereum" }

graphql/src/runner.rs

@@ -210,10 +210,10 @@ where
         // point, and everything needs to go through the `store` we are
         // setting up here
         let store = self.store.query_store(target, false).await?;
-        let schema = store.api_schema()?;
         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

node/src/manager/commands/query.rs

@@ -31,9 +31,6 @@ 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| {

store/test-store/Cargo.toml

@@ -16,4 +16,4 @@ lazy_static = "1.1"
 hex-literal = "0.3"
 diesel = { version = "1.4.8", features = ["postgres", "serde_json", "numeric", "r2d2"] }
 graph-chain-ethereum = { path = "../../chain/ethereum" }
-graphql-tools = "0.0.8"
+graphql-tools = "0.0.8"