graph, graphql: Move shape_hash into graph crate

Author: lutter

graph/src/data/graphql/mod.rs

@@ -19,3 +19,5 @@ pub use self::values::{
     // Trait for plucking typed values out of a GraphQL value maps.
     ValueMap,
 };
+
+pub mod shape_hash;

graphql/src/query/shape_hash.rs renamed to graph/src/data/graphql/shape_hash.rs

@@ -113,7 +113,9 @@ pub mod prelude {
     pub use crate::components::{EventConsumer, EventProducer};
 
     pub use crate::cheap_clone::CheapClone;
-    pub use crate::data::graphql::{SerializableValue, TryFromValue, ValueMap};
+    pub use crate::data::graphql::{
+        shape_hash::shape_hash, SerializableValue, TryFromValue, ValueMap,
+    };
     pub use crate::data::query::{
         Query, QueryError, QueryExecutionError, QueryResult, QueryVariables,
     };

graph/src/lib.rs

@@ -14,9 +14,6 @@ pub mod ast;
 /// Extension traits
 pub mod ext;
 
-/// Hashing the 'shape' of a query
-pub mod shape_hash;
-
 /// Options available for query execution.
 pub struct QueryExecutionOptions<R>
 where

graphql/src/query/mod.rs

@@ -9,10 +9,10 @@ use std::time::{Duration, Instant};
 use crate::prelude::{
     object, object_value, QueryExecutionOptions, StoreResolver, SubscriptionExecutionOptions,
 };
-use crate::query::{execute_query, shape_hash::shape_hash};
+use crate::query::execute_query;
 use crate::subscription::execute_prepared_subscription;
 use graph::prelude::{
-    o, EthereumBlockPointer, GraphQlRunner as GraphQlRunnerTrait, Logger, Query,
+    o, shape_hash, EthereumBlockPointer, GraphQlRunner as GraphQlRunnerTrait, Logger, Query,
     QueryExecutionError, QueryResult, QueryResultFuture, Store, StoreError, SubgraphDeploymentId,
     SubgraphDeploymentStore, Subscription, SubscriptionError, SubscriptionResultFuture,
 };