Bump tower-http,axum (#146)

* Bump tower-http,axum * remove example * Remove example from CI Co-authored-by: Brandon Kite <brandonkite92@gmail.com>
FuelLabs · Jan 21, 2022 · 2baeae6 · 2baeae6
1 parent 9b0b744
commit 2baeae6
Show file tree

Hide file tree

Showing 15 changed files with 49 additions and 189 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -63,30 +63,6 @@ jobs:
         command: test
         args: --verbose --all-targets
 
-    - name: Check formatting (examples)
-      uses: actions-rs/cargo@v1
-      with:
-        command: fmt
-        args: --manifest-path examples/Cargo.toml --all --verbose -- --check
-
-    - name: Check build (examples)
-      uses: actions-rs/cargo@v1
-      with:
-        command: check
-        args: --manifest-path examples/Cargo.toml --verbose --all-targets
-
-    - name: Check Clippy Lints (examples)
-      uses: actions-rs/cargo@v1
-      with:
-        command: clippy
-        args: --manifest-path examples/Cargo.toml --verbose --all-targets
-
-    - name: Run tests (examples)
-      uses: actions-rs/cargo@v1
-      with:
-        command: test
-        args: --manifest-path examples/Cargo.toml --verbose --all-targets
-
   publish:
     # Only do this job if publishing a release
     needs: build

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/examples/.gitignore b/examples/.gitignore
diff --git a/examples/Cargo.toml b/examples/Cargo.toml
diff --git a/examples/simple-wasm/.cargo/config b/examples/simple-wasm/.cargo/config
diff --git a/examples/simple-wasm/Cargo.toml b/examples/simple-wasm/Cargo.toml
diff --git a/examples/simple-wasm/README.md b/examples/simple-wasm/README.md
diff --git a/examples/simple-wasm/contracts/my_struct.json b/examples/simple-wasm/contracts/my_struct.json
diff --git a/examples/simple-wasm/manifest.yaml b/examples/simple-wasm/manifest.yaml
diff --git a/examples/simple-wasm/schema/schema.graphql b/examples/simple-wasm/schema/schema.graphql
diff --git a/examples/simple-wasm/src/lib.rs b/examples/simple-wasm/src/lib.rs
diff --git a/fuel-core/Cargo.toml b/fuel-core/Cargo.toml
@@ -19,7 +19,8 @@ test = false
 
 [dependencies]
 async-graphql = { version = "=2.9", features = ["chrono", "chrono-tz"] }
-axum = { version = "0.2" }
+async-trait = "0.1"
+axum = { version = "0.4.4" }
 bincode = "1.3"
 chrono = { version = "0.4", features = ["serde"] }
 derive_more = { version = "0.99" }
@@ -46,7 +47,7 @@ strum = "0.21"
 strum_macros = "0.21"
 thiserror = "1.0.26"
 tokio = { version = "1.8", features = ["macros", "rt-multi-thread"] }
-tower-http = { version = "0.1", features = ["set-header"] }
+tower-http = { version = "0.2.1", features = ["set-header"] }
 tower-layer = "0.3"
 tracing = "0.1"
 tracing-subscriber = { version = "0.2", features = ["env-filter"] }

diff --git a/fuel-core/src/service/graph_api.rs b/fuel-core/src/service/graph_api.rs
@@ -3,10 +3,9 @@ use crate::schema::{build_schema, dap, CoreSchema};
 use crate::service::Config;
 use crate::tx_pool::TxPool;
 use async_graphql::{http::playground_source, http::GraphQLPlaygroundConfig, Request, Response};
+use axum::routing::{get, post};
 use axum::{
-    body::Body,
     extract::Extension,
-    handler::{get, post},
     http::{
         header::{
             ACCESS_CONTROL_ALLOW_HEADERS, ACCESS_CONTROL_ALLOW_METHODS, ACCESS_CONTROL_ALLOW_ORIGIN,
@@ -40,19 +39,18 @@ pub async fn start_server(
         .route("/graphql", post(graphql_handler).options(ok))
         .route("/health", get(health))
         .layer(AddExtensionLayer::new(schema))
-        .layer(SetResponseHeaderLayer::<_, Body>::overriding(
+        .layer(SetResponseHeaderLayer::<_>::overriding(
             ACCESS_CONTROL_ALLOW_ORIGIN,
             HeaderValue::from_static("*"),
         ))
-        .layer(SetResponseHeaderLayer::<_, Body>::overriding(
+        .layer(SetResponseHeaderLayer::<_>::overriding(
             ACCESS_CONTROL_ALLOW_METHODS,
             HeaderValue::from_static("*"),
         ))
-        .layer(SetResponseHeaderLayer::<_, Body>::overriding(
+        .layer(SetResponseHeaderLayer::<_>::overriding(
             ACCESS_CONTROL_ALLOW_HEADERS,
             HeaderValue::from_static("*"),
-        ))
-        .boxed();
+        ));
 
     let (tx, rx) = tokio::sync::oneshot::channel();
     let listener = TcpListener::bind(&config.addr)?;

diff --git a/fuel-indexer/derive/Cargo.toml b/fuel-indexer/derive/Cargo.toml
@@ -18,7 +18,7 @@ quote = "1.0"
 syn = { version = "1.0", features = ["full"] }
 
 [dev-dependencies]
-fuels-core = { version = "0.1" }
 fuel-indexer = { path = "../lib" }
+fuels-core = { version = "0.1" }
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 trybuild = "1.0"
diff --git a/fuel-indexer/indexer/Cargo.toml b/fuel-indexer/indexer/Cargo.toml
@@ -24,8 +24,8 @@ wasmer-engine-universal = "2.0"
 [dev-dependencies]
 fuel-indexer = { path = "../lib" }
 fuel-tx = { version = "0.2", features = ["serde-types"] }
-fuels-core = { version = "0.1" }
 fuel-types = { version = "0.1", features = ["serde-types"] }
+fuels-core = { version = "0.1" }
 serde_yaml = "0.8.19"
 
 [features]