refactor(graph-gateway): simplify subgraph deployments resolution (#563)

edgeandnode · Jan 26, 2024 · e7ec282 · e7ec282
1 parent ad55cdf
commit e7ec282
Show file tree

Hide file tree

Showing 9 changed files with 104 additions and 93 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/gateway-framework/Cargo.toml b/gateway-framework/Cargo.toml
@@ -11,6 +11,8 @@ axum.workspace = true
 ethers = "2.0.11"
 eventuals = "0.6.7"
 gateway-common = { path = "../gateway-common" }
+graphql-http.workspace = true
+headers = "0.3.9"
 hex.workspace = true
 indexer-selection = { path = "../indexer-selection" }
 itertools = "0.12.0"
@@ -34,3 +36,6 @@ tokio.workspace = true
 toolshed.workspace = true
 tracing.workspace = true
 tracing-subscriber.workspace = true
+
+[dev-dependencies]
+assert_matches = "1.5.0"
diff --git a/gateway-framework/src/errors.rs b/gateway-framework/src/errors.rs
@@ -1,8 +1,12 @@
 use std::collections::BTreeMap;
 
-use indexer_selection::UnresolvedBlock;
+use axum::response::{IntoResponse, Response};
 use itertools::Itertools;
 
+use indexer_selection::UnresolvedBlock;
+
+use crate::graphql;
+
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
     /// Errors that should only occur in exceptional conditions.
@@ -32,6 +36,12 @@ pub enum Error {
     BadIndexers(IndexerErrors),
 }
 
+impl IntoResponse for Error {
+    fn into_response(self) -> Response {
+        graphql::error_response(self).into_response()
+    }
+}
+
 pub struct IndexerErrors(Vec<IndexerError>);
 
 #[derive(thiserror::Error, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]

diff --git a/graph-gateway/src/client_query/graphql.rs → gateway-framework/src/graphql.rs b/graph-gateway/src/client_query/graphql.rs → gateway-framework/src/graphql.rs
diff --git a/gateway-framework/src/lib.rs b/gateway-framework/src/lib.rs
@@ -4,6 +4,7 @@ pub mod chains;
 pub mod config;
 pub mod errors;
 pub mod geoip;
+pub mod graphql;
 pub mod ipfs;
 pub mod json;
 pub mod metrics;