From d0c8fd8f639831d4a3b6ac25b2edbb08e07d2f20 Mon Sep 17 00:00:00 2001 From: Hannes Karppila Date: Thu, 24 Feb 2022 01:54:20 +0200 Subject: [PATCH 1/2] Add Cargo.toml linting to CI --- .github/workflows/ci.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b983ce49002..f0f91604481 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,6 +39,15 @@ jobs: - name: Install rustfmt run: rustup component add rustfmt + - name: Install Cargo.toml linter + uses: baptiste0928/cargo-install@v1 + with: + crate: cargo-toml-lint + version: "0.1" + + - name: Run Cargo.toml linter + run: git ls-files | grep Cargo.toml$ | xargs --verbose -n 1 cargo-toml-lint + - name: Check formatting uses: actions-rs/cargo@v1 with: From 14f070e49f8102b869f496e54df48ccfd0a05dd6 Mon Sep 17 00:00:00 2001 From: Hannes Karppila Date: Thu, 24 Feb 2022 04:41:08 +0200 Subject: [PATCH 2/2] Fix non-alphabetical dependency order in Cargo.toml files --- fuel-core-interfaces/Cargo.toml | 2 +- fuel-core/Cargo.toml | 4 ++-- fuel-p2p/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fuel-core-interfaces/Cargo.toml b/fuel-core-interfaces/Cargo.toml index cbac0e3b0a7..e6fde61b305 100644 --- a/fuel-core-interfaces/Cargo.toml +++ b/fuel-core-interfaces/Cargo.toml @@ -19,10 +19,10 @@ fuel-tx = { version = "0.5", features = ["serde-types"] } fuel-types = { version = "0.1", features = ["serde-types"] } fuel-vm = "0.4" futures = "0.3" +lazy_static = "1.4" parking_lot = "0.11" thiserror = "1.0" tokio = { version = "1.14", features = ["full"] } -lazy_static = "1.4" [dev-dependencies] diff --git a/fuel-core/Cargo.toml b/fuel-core/Cargo.toml index f6d898aecd1..0a44a8dabb9 100644 --- a/fuel-core/Cargo.toml +++ b/fuel-core/Cargo.toml @@ -18,9 +18,9 @@ path = "src/main.rs" test = false [dependencies] +anyhow = "1.0" async-graphql = { version = "=2.9", features = ["chrono", "chrono-tz"] } async-trait = "0.1" -anyhow = "1.0" axum = { version = "0.4.4" } bincode = "1.3" chrono = { version = "0.4", features = ["serde"] } @@ -60,9 +60,9 @@ tracing-subscriber = { version = "0.2", features = ["env-filter"] } uuid = { version = "0.8", features = ["v4"] } [dev-dependencies] +assert_matches = "1.5" fuel-vm = { version = "0.4", features = ["serde-types", "random", "test-helpers"] } insta = "1.8" -assert_matches = "1.5" [features] default = ["rocksdb"] diff --git a/fuel-p2p/Cargo.toml b/fuel-p2p/Cargo.toml index 855f7dc7a25..321fb79e918 100644 --- a/fuel-p2p/Cargo.toml +++ b/fuel-p2p/Cargo.toml @@ -17,8 +17,8 @@ futures = "0.3" futures-timer = "3.0" ip_network = "0.4" libp2p = "0.41" -tracing = "0.1" sha2 = "0.9" +tracing = "0.1" [dev-dependencies] env_logger = "0.9"