From b493896017142a2fabd272071ce5efba11fd61f3 Mon Sep 17 00:00:00 2001 From: Rostyslav Tyshko Date: Wed, 30 Oct 2024 00:52:59 +0100 Subject: [PATCH 1/2] fix lint CI job for TOML --- .github/workflows/ci.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 073b162..ee434f7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,7 +59,14 @@ jobs: if: success() || failure() run: | cargo clippy --release -- -D warnings - + - name: install taplo + if: success() || failure() + run: | + cargo install taplo-cli --locked + - name: taplo fmt + if: success() || failure() + run: | + taplo fmt --check test: strategy: matrix: From abe6977aa235c10ef204aeebc54a4ec1def509d6 Mon Sep 17 00:00:00 2001 From: Rostyslav Tyshko Date: Wed, 30 Oct 2024 00:53:12 +0100 Subject: [PATCH 2/2] taplo fmt --- Cargo.toml | 34 ++++++++++++++++++---------------- accounts/Cargo.toml | 2 +- consensus/Cargo.toml | 2 +- mempool/Cargo.toml | 2 +- networking/Cargo.toml | 2 +- node_core/Cargo.toml | 2 +- node_rpc/Cargo.toml | 2 +- node_runner/Cargo.toml | 2 +- rust-toolchain.toml | 2 +- rustfmt.toml | 2 +- sequencer_core/Cargo.toml | 2 +- sequencer_rpc/Cargo.toml | 2 +- sequencer_runner/Cargo.toml | 2 +- storage/Cargo.toml | 2 +- utxo/Cargo.toml | 2 +- vm/Cargo.toml | 2 +- zkvm/Cargo.toml | 2 +- 17 files changed, 34 insertions(+), 32 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 003f145..da4ffc6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,21 +1,21 @@ [workspace] resolver = "2" members = [ - "node_runner", - "sequencer_runner", - "storage", - "accounts", - "utxo", - "vm", - "networking", - "consensus", - "node_rpc", - "sequencer_rpc", - "mempool", - "zkvm", - "node_core", - "sequencer_core", - "rpc_primitives", + "node_runner", + "sequencer_runner", + "storage", + "accounts", + "utxo", + "vm", + "networking", + "consensus", + "node_rpc", + "sequencer_rpc", + "mempool", + "zkvm", + "node_core", + "sequencer_core", + "rpc_primitives", ] [workspace.dependencies] @@ -37,7 +37,9 @@ sha2 = "0.10.8" monotree = "0.1.5" hex = "0.4.3" -rocksdb = { version = "0.21.0", default-features = false, features = ["snappy"] } +rocksdb = { version = "0.21.0", default-features = false, features = [ + "snappy", +] } #ToDo: Add necessary risc0 submodules for zkvm module diff --git a/accounts/Cargo.toml b/accounts/Cargo.toml index 9f48799..b69c4ab 100644 --- a/accounts/Cargo.toml +++ b/accounts/Cargo.toml @@ -16,4 +16,4 @@ elliptic-curve.workspace = true hex.workspace = true [dependencies.storage] -path = "../storage" \ No newline at end of file +path = "../storage" diff --git a/consensus/Cargo.toml b/consensus/Cargo.toml index a86f661..664f53d 100644 --- a/consensus/Cargo.toml +++ b/consensus/Cargo.toml @@ -12,4 +12,4 @@ serde.workspace = true tokio.workspace = true [dependencies.networking] -path = "../networking" \ No newline at end of file +path = "../networking" diff --git a/mempool/Cargo.toml b/mempool/Cargo.toml index 0b6a6ce..ff8b855 100644 --- a/mempool/Cargo.toml +++ b/mempool/Cargo.toml @@ -8,4 +8,4 @@ anyhow.workspace = true serde_json.workspace = true env_logger.workspace = true log.workspace = true -serde.workspace = true \ No newline at end of file +serde.workspace = true diff --git a/networking/Cargo.toml b/networking/Cargo.toml index 7a2fbf5..5649f66 100644 --- a/networking/Cargo.toml +++ b/networking/Cargo.toml @@ -8,4 +8,4 @@ anyhow.workspace = true serde_json.workspace = true env_logger.workspace = true log.workspace = true -serde.workspace = true \ No newline at end of file +serde.workspace = true diff --git a/node_core/Cargo.toml b/node_core/Cargo.toml index 8b5f0c1..17b45b4 100644 --- a/node_core/Cargo.toml +++ b/node_core/Cargo.toml @@ -11,4 +11,4 @@ log.workspace = true serde.workspace = true [dependencies.storage] -path = "../storage" \ No newline at end of file +path = "../storage" diff --git a/node_rpc/Cargo.toml b/node_rpc/Cargo.toml index ef65de0..86588ed 100644 --- a/node_rpc/Cargo.toml +++ b/node_rpc/Cargo.toml @@ -40,4 +40,4 @@ path = "../zkvm" path = "../node_core" [dependencies.rpc_primitives] -path = "../rpc_primitives" \ No newline at end of file +path = "../rpc_primitives" diff --git a/node_runner/Cargo.toml b/node_runner/Cargo.toml index 757081d..6b2e6be 100644 --- a/node_runner/Cargo.toml +++ b/node_runner/Cargo.toml @@ -42,4 +42,4 @@ path = "../node_rpc" path = "../node_core" [dependencies.rpc_primitives] -path = "../rpc_primitives" \ No newline at end of file +path = "../rpc_primitives" diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 271800c..5d56faf 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "nightly" \ No newline at end of file +channel = "nightly" diff --git a/rustfmt.toml b/rustfmt.toml index 36c419b..3a26366 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -1 +1 @@ -edition = "2021" \ No newline at end of file +edition = "2021" diff --git a/sequencer_core/Cargo.toml b/sequencer_core/Cargo.toml index 0de8d48..5d713ba 100644 --- a/sequencer_core/Cargo.toml +++ b/sequencer_core/Cargo.toml @@ -14,4 +14,4 @@ serde.workspace = true path = "../storage" [dependencies.mempool] -path = "../mempool" \ No newline at end of file +path = "../mempool" diff --git a/sequencer_rpc/Cargo.toml b/sequencer_rpc/Cargo.toml index b15efe3..545bfe1 100644 --- a/sequencer_rpc/Cargo.toml +++ b/sequencer_rpc/Cargo.toml @@ -28,4 +28,4 @@ path = "../networking" path = "../sequencer_core" [dependencies.rpc_primitives] -path = "../rpc_primitives" \ No newline at end of file +path = "../rpc_primitives" diff --git a/sequencer_runner/Cargo.toml b/sequencer_runner/Cargo.toml index f2d5518..6140725 100644 --- a/sequencer_runner/Cargo.toml +++ b/sequencer_runner/Cargo.toml @@ -30,4 +30,4 @@ path = "../sequencer_rpc" path = "../sequencer_core" [dependencies.rpc_primitives] -path = "../rpc_primitives" \ No newline at end of file +path = "../rpc_primitives" diff --git a/storage/Cargo.toml b/storage/Cargo.toml index 6230644..17e4271 100644 --- a/storage/Cargo.toml +++ b/storage/Cargo.toml @@ -15,4 +15,4 @@ thiserror.workspace = true rocksdb.workspace = true rs_merkle.workspace = true sha2.workspace = true -monotree.workspace = true \ No newline at end of file +monotree.workspace = true diff --git a/utxo/Cargo.toml b/utxo/Cargo.toml index 3a2f1b9..09b9a13 100644 --- a/utxo/Cargo.toml +++ b/utxo/Cargo.toml @@ -13,4 +13,4 @@ monotree.workspace = true sha2.workspace = true [dependencies.storage] -path = "../storage" \ No newline at end of file +path = "../storage" diff --git a/vm/Cargo.toml b/vm/Cargo.toml index 6c9a84d..b69c32f 100644 --- a/vm/Cargo.toml +++ b/vm/Cargo.toml @@ -8,4 +8,4 @@ anyhow.workspace = true serde_json.workspace = true env_logger.workspace = true log.workspace = true -serde.workspace = true \ No newline at end of file +serde.workspace = true diff --git a/zkvm/Cargo.toml b/zkvm/Cargo.toml index e77801f..089941d 100644 --- a/zkvm/Cargo.toml +++ b/zkvm/Cargo.toml @@ -13,4 +13,4 @@ serde.workspace = true #ToDo: Add necessary risc0 dependencies [dependencies.vm] -path = "../vm" \ No newline at end of file +path = "../vm"