chore: add taplo

Signed-off-by: Dori Medini <[email protected]>
starkware-libs · Jul 25, 2024 · 8d9cab7 · 8d9cab7
1 parent a9dc431
commit 8d9cab7
Show file tree

Hide file tree

Showing 30 changed files with 153 additions and 146 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -120,6 +120,19 @@ jobs:
         env:
           SEED: 0
 
+  taplo:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
+      - uses: Swatinem/rust-cache@v2
+      - uses: baptiste0928/cargo-install@v3
+        with:
+          crate: taplo-cli
+          version: '0.9.0'
+          locked: true
+      - run: scripts/taplo.sh
+
   machete:
     runs-on: ubuntu-latest
     steps:

diff --git a/Cargo.toml b/Cargo.toml
@@ -4,38 +4,38 @@
 resolver = "2"
 
 members = [
-    "crates/blockifier",
-    "crates/committer",
-    "crates/committer_cli",
-    "crates/gateway",
-    "crates/mempool",
-    "crates/mempool_infra",
-    "crates/mempool_node",
-    "crates/mempool_test_utils",
-    "crates/mempool_types",
-    "crates/native_blockifier",
-    "crates/papyrus_base_layer",
-    "crates/papyrus_common",
-    "crates/papyrus_config",
-    "crates/papyrus_execution",
-    "crates/papyrus_load_test",
-    "crates/papyrus_monitoring_gateway",
-    "crates/papyrus_network",
-    "crates/papyrus_node",
-    "crates/papyrus_p2p_sync",
-    "crates/papyrus_proc_macros",
-    "crates/papyrus_protobuf",
-    "crates/papyrus_rpc",
-    "crates/papyrus_storage",
-    "crates/papyrus_sync",
-    "crates/papyrus_test_utils",
-    "crates/sequencing/papyrus_block_builder",
-    "crates/sequencing/papyrus_consensus",
-    "crates/starknet_api",
-    "crates/starknet_client",
-    "crates/starknet_sierra_compile",
-    "crates/task_executor",
-    "crates/tests-integration",
+  "crates/blockifier",
+  "crates/committer",
+  "crates/committer_cli",
+  "crates/gateway",
+  "crates/mempool",
+  "crates/mempool_infra",
+  "crates/mempool_node",
+  "crates/mempool_test_utils",
+  "crates/mempool_types",
+  "crates/native_blockifier",
+  "crates/papyrus_base_layer",
+  "crates/papyrus_common",
+  "crates/papyrus_config",
+  "crates/papyrus_execution",
+  "crates/papyrus_load_test",
+  "crates/papyrus_monitoring_gateway",
+  "crates/papyrus_network",
+  "crates/papyrus_node",
+  "crates/papyrus_p2p_sync",
+  "crates/papyrus_proc_macros",
+  "crates/papyrus_protobuf",
+  "crates/papyrus_rpc",
+  "crates/papyrus_storage",
+  "crates/papyrus_sync",
+  "crates/papyrus_test_utils",
+  "crates/sequencing/papyrus_block_builder",
+  "crates/sequencing/papyrus_consensus",
+  "crates/starknet_api",
+  "crates/starknet_client",
+  "crates/starknet_sierra_compile",
+  "crates/task_executor",
+  "crates/tests-integration",
 ]
 
 [workspace.package]

diff --git a/crates/committer_cli/Cargo.toml b/crates/committer_cli/Cargo.toml
@@ -14,7 +14,7 @@ criterion = { version = "0.5.1", features = ["html_reports"] }
 pretty_assertions.workspace = true
 
 [dependencies]
-clap =  { version = "4.5.4", features = ["cargo", "derive"] }
+clap = { version = "4.5.4", features = ["cargo", "derive"] }
 committer = { path = "../committer", features = ["testing"] }
 derive_more.workspace = true
 ethnum.workspace = true
@@ -27,7 +27,7 @@ serde_json = "1.0.116"
 serde_repr = "0.1.19"
 simplelog.workspace = true
 starknet-types-core.workspace = true
-starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0"}
+starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0" }
 strum.workspace = true
 strum_macros.workspace = true
 thiserror.workspace = true

diff --git a/crates/gateway/Cargo.toml b/crates/gateway/Cargo.toml
@@ -18,27 +18,27 @@ blockifier = { path = "../blockifier", version = "0.8.0-rc.0", features = ["test
 cairo-lang-starknet-classes.workspace = true
 cairo-vm.workspace = true
 hyper.workspace = true
+mempool_test_utils = { path = "../mempool_test_utils", version = "0.0" }
 num-traits.workspace = true
-papyrus_config = { path = "../papyrus_config", version = "0.4.0-rc.0"}
-papyrus_rpc = { path = "../papyrus_rpc", version = "0.4.0-rc.0"}
+papyrus_config = { path = "../papyrus_config", version = "0.4.0-rc.0" }
+papyrus_rpc = { path = "../papyrus_rpc", version = "0.4.0-rc.0" }
 reqwest.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0"}
+starknet-types-core.workspace = true
+starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0" }
 starknet_mempool_infra = { path = "../mempool_infra", version = "0.0" }
 starknet_mempool_types = { path = "../mempool_types", version = "0.0" }
 starknet_sierra_compile = { path = "../starknet_sierra_compile", version = "0.0" }
-starknet-types-core.workspace = true
-mempool_test_utils = { path = "../mempool_test_utils", version = "0.0"}
 thiserror.workspace = true
 tokio.workspace = true
 tracing.workspace = true
 validator.workspace = true
 
 [dev-dependencies]
 assert_matches.workspace = true
-mockito = "1.4.0"
 mockall.workspace = true
+mockito = "1.4.0"
 num-bigint.workspace = true
 pretty_assertions.workspace = true
 rstest.workspace = true

diff --git a/crates/mempool/Cargo.toml b/crates/mempool/Cargo.toml
@@ -11,8 +11,8 @@ workspace = true
 [dependencies]
 async-trait.workspace = true
 derive_more.workspace = true
+starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0" }
 starknet_mempool_infra = { path = "../mempool_infra", version = "0.0" }
-starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0"}
 starknet_mempool_types = { path = "../mempool_types", version = "0.0" }
 tokio.workspace = true
 

diff --git a/crates/mempool_node/Cargo.toml b/crates/mempool_node/Cargo.toml
@@ -13,7 +13,7 @@ anyhow.workspace = true
 clap.workspace = true
 const_format.workspace = true
 futures.workspace = true
-papyrus_config = { path = "../papyrus_config", version = "0.4.0-rc.0"}
+papyrus_config = { path = "../papyrus_config", version = "0.4.0-rc.0" }
 serde.workspace = true
 starknet_gateway = { path = "../gateway", version = "0.0" }
 starknet_mempool = { path = "../mempool", version = "0.0" }
@@ -27,6 +27,6 @@ validator.workspace = true
 assert-json-diff.workspace = true
 assert_matches.workspace = true
 colored.workspace = true
+mempool_test_utils = { path = "../mempool_test_utils" }
 pretty_assertions.workspace = true
 serde_json.workspace = true
-mempool_test_utils = { path = "../mempool_test_utils" }
diff --git a/crates/mempool_test_utils/Cargo.toml b/crates/mempool_test_utils/Cargo.toml
@@ -9,9 +9,7 @@ license.workspace = true
 
 [dependencies]
 assert_matches.workspace = true
-blockifier = { path = "../blockifier", version = "0.8.0-rc.0", features = ["testing"]}
-starknet-types-core.workspace = true
-starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0"}
+blockifier = { path = "../blockifier", version = "0.8.0-rc.0", features = ["testing"] }
 serde_json.workspace = true
-
-
+starknet-types-core.workspace = true
+starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0" }
diff --git a/crates/mempool_types/Cargo.toml b/crates/mempool_types/Cargo.toml
@@ -10,7 +10,7 @@ workspace = true
 
 [dependencies]
 async-trait.workspace = true
-starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0"}
 mockall.workspace = true
+starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0" }
 starknet_mempool_infra = { path = "../mempool_infra" }
 thiserror.workspace = true
diff --git a/crates/papyrus_base_layer/Cargo.toml b/crates/papyrus_base_layer/Cargo.toml
@@ -12,18 +12,16 @@ papyrus_config = { path = "../papyrus_config", version = "0.4.0-rc.0" }
 rustc-hex.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0"}
+starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0" }
 thiserror.workspace = true
 tokio = { workspace = true, features = ["full", "sync"] }
 url.workspace = true
 
 [dev-dependencies]
 ethers-core = { version = "2.0.3" }
 pretty_assertions.workspace = true
-starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0", features = ["testing"] }
 starknet-types-core.workspace = true
+starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0", features = ["testing"] }
 tar = { version = "0.4.38" }
 tempfile.workspace = true
-test-with = { version = "0.9.3", default-features = false, features = [
-    "executable",
-] }
+test-with = { version = "0.9.3", default-features = false, features = ["executable"] }
diff --git a/crates/papyrus_common/Cargo.toml b/crates/papyrus_common/Cargo.toml
@@ -9,19 +9,19 @@ description = "Common utils and objects for a Starknet node."
 [dependencies]
 cairo-lang-starknet-classes.workspace = true
 hex.workspace = true
+indexmap.workspace = true
 itertools.workspace = true
 lazy_static.workspace = true
+rand.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 sha3.workspace = true
-starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0"}
 starknet-types-core = { workspace = true, features = ["hash"] }
+starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0" }
 thiserror.workspace = true
-rand.workspace = true
-indexmap.workspace = true
 
 [dev-dependencies]
 assert_matches.workspace = true
-pretty_assertions.workspace = true
-serde_json = { workspace = true, features = ["arbitrary_precision"]}
 papyrus_test_utils = { path = "../papyrus_test_utils" }
+pretty_assertions.workspace = true
+serde_json = { workspace = true, features = ["arbitrary_precision"] }
diff --git a/crates/papyrus_config/Cargo.toml b/crates/papyrus_config/Cargo.toml
@@ -7,13 +7,13 @@ license-file.workspace = true
 description = "A library for handling node configuration."
 
 [package.metadata.cargo-udeps.ignore]
-development = ["tempfile"]  # Dependency of a doc-test
+development = ["tempfile"] # Dependency of a doc-test
 
 [dependencies]
 clap = { workspace = true, features = ["env", "string"] }
 itertools.workspace = true
 serde = { workspace = true, features = ["derive"] }
-serde_json = { workspace = true, features = ["arbitrary_precision"]}
+serde_json = { workspace = true, features = ["arbitrary_precision"] }
 strum_macros.workspace = true
 thiserror.workspace = true
 validator = { workspace = true, features = ["derive"] }
@@ -22,5 +22,5 @@ validator = { workspace = true, features = ["derive"] }
 assert_matches.workspace = true
 itertools.workspace = true
 lazy_static.workspace = true
-tempfile.workspace = true
 papyrus_test_utils = { path = "../papyrus_test_utils" }
+tempfile.workspace = true
diff --git a/crates/papyrus_execution/Cargo.toml b/crates/papyrus_execution/Cargo.toml
@@ -7,11 +7,11 @@ license-file.workspace = true
 description = "Transaction and entry point execution functionality for a Papyrus node."
 
 [features]
-testing = ["rand", "rand_chacha", "papyrus_test_utils"]
+testing = ["papyrus_test_utils", "rand", "rand_chacha"]
 
 [dependencies]
 anyhow.workspace = true
-blockifier = { path = "../blockifier", version = "0.8.0-rc.0"}
+blockifier = { path = "../blockifier", version = "0.8.0-rc.0" }
 cairo-lang-starknet-classes.workspace = true
 cairo-vm.workspace = true
 indexmap.workspace = true
@@ -25,7 +25,7 @@ rand = { workspace = true, optional = true }
 rand_chacha = { workspace = true, optional = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true, features = ["arbitrary_precision"] }
-starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0"}
+starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0" }
 starknet-types-core.workspace = true
 papyrus_test_utils = { path = "../papyrus_test_utils", optional = true }
 thiserror.workspace = true

diff --git a/crates/papyrus_load_test/Cargo.toml b/crates/papyrus_load_test/Cargo.toml
@@ -13,11 +13,11 @@ anyhow.workspace = true
 assert_matches.workspace = true
 goose = "0.17.0"
 once_cell.workspace = true
-serde = { workspace = true, features = ["derive"] }
-serde_json = { workspace = true, features = ["arbitrary_precision"]}
-tokio.workspace = true
 rand.workspace = true
 reqwest.workspace = true
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true, features = ["arbitrary_precision"] }
+tokio.workspace = true
 
 [dev-dependencies]
 lazy_static.workspace = true

diff --git a/crates/papyrus_monitoring_gateway/Cargo.toml b/crates/papyrus_monitoring_gateway/Cargo.toml
@@ -10,8 +10,8 @@ axum.workspace = true
 hyper = { workspace = true, features = ["full"] }
 metrics-exporter-prometheus = { version = "0.12.1" }
 metrics-process = { version = "1.0.11" }
-papyrus_storage = { path = "../papyrus_storage", version = "0.4.0-rc.0" }
 papyrus_config = { path = "../papyrus_config", version = "0.4.0-rc.0" }
+papyrus_storage = { path = "../papyrus_storage", version = "0.4.0-rc.0" }
 rand.workspace = true
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true, features = ["arbitrary_precision"] }

diff --git a/crates/papyrus_network/Cargo.toml b/crates/papyrus_network/Cargo.toml
@@ -10,8 +10,8 @@ testing = []
 
 [[bin]]
 name = "streamed_bytes_benchmark"
-required-features = ["clap"]
 path = "src/bin/streamed_bytes_benchmark.rs"
+required-features = ["clap"]
 
 [dependencies]
 async-stream.workspace = true
@@ -21,21 +21,21 @@ derive_more.workspace = true
 futures.workspace = true
 lazy_static.workspace = true
 libp2p = { workspace = true, features = [
-    "gossipsub",
-    "identify",
-    "kad",
-    "macros",
-    "noise",
-    "quic",
-    "tcp",
-    "tokio",
-    "yamux",
-    "serde",
+  "gossipsub",
+  "identify",
+  "kad",
+  "macros",
+  "noise",
+  "quic",
+  "serde",
+  "tcp",
+  "tokio",
+  "yamux",
 ] }
 metrics.workspace = true
-replace_with.workspace = true
 papyrus_common = { path = "../papyrus_common", version = "0.4.0-rc.0" }
 papyrus_config = { path = "../papyrus_config", version = "0.4.0-rc.0" }
+replace_with.workspace = true
 serde = { workspace = true, features = ["derive"] }
 thiserror.workspace = true
 tokio = { workspace = true, features = ["full", "sync"] }