Skip to content

Commit c7871b4

Browse files
dorimedini-starkwaredorimedini-starkware
authored
chore: add taplo (starkware-libs#85)
Signed-off-by: Dori Medini <[email protected]>
1 parent a0b2115 commit c7871b4

File tree

30 files changed

+153
-146
lines changed

30 files changed

+153
-146
lines changed

‎.github/workflows/main.yml

+13
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,19 @@ jobs:
133133
env:
134134
SEED: 0
135135

136+
taplo:
137+
runs-on: ubuntu-latest
138+
steps:
139+
- uses: actions/checkout@v4
140+
- uses: dtolnay/rust-toolchain@stable
141+
- uses: Swatinem/rust-cache@v2
142+
- uses: baptiste0928/cargo-install@v3
143+
with:
144+
crate: taplo-cli
145+
version: '0.9.0'
146+
locked: true
147+
- run: scripts/taplo.sh
148+
136149
machete:
137150
runs-on: ubuntu-latest
138151
steps:

‎Cargo.toml

+32-32
Original file line numberDiff line numberDiff line change
@@ -4,38 +4,38 @@
44
resolver = "2"
55

66
members = [
7-
"crates/blockifier",
8-
"crates/committer",
9-
"crates/committer_cli",
10-
"crates/gateway",
11-
"crates/mempool",
12-
"crates/mempool_infra",
13-
"crates/mempool_node",
14-
"crates/mempool_test_utils",
15-
"crates/mempool_types",
16-
"crates/native_blockifier",
17-
"crates/papyrus_base_layer",
18-
"crates/papyrus_common",
19-
"crates/papyrus_config",
20-
"crates/papyrus_execution",
21-
"crates/papyrus_load_test",
22-
"crates/papyrus_monitoring_gateway",
23-
"crates/papyrus_network",
24-
"crates/papyrus_node",
25-
"crates/papyrus_p2p_sync",
26-
"crates/papyrus_proc_macros",
27-
"crates/papyrus_protobuf",
28-
"crates/papyrus_rpc",
29-
"crates/papyrus_storage",
30-
"crates/papyrus_sync",
31-
"crates/papyrus_test_utils",
32-
"crates/sequencing/papyrus_block_builder",
33-
"crates/sequencing/papyrus_consensus",
34-
"crates/starknet_api",
35-
"crates/starknet_client",
36-
"crates/starknet_sierra_compile",
37-
"crates/task_executor",
38-
"crates/tests-integration",
7+
"crates/blockifier",
8+
"crates/committer",
9+
"crates/committer_cli",
10+
"crates/gateway",
11+
"crates/mempool",
12+
"crates/mempool_infra",
13+
"crates/mempool_node",
14+
"crates/mempool_test_utils",
15+
"crates/mempool_types",
16+
"crates/native_blockifier",
17+
"crates/papyrus_base_layer",
18+
"crates/papyrus_common",
19+
"crates/papyrus_config",
20+
"crates/papyrus_execution",
21+
"crates/papyrus_load_test",
22+
"crates/papyrus_monitoring_gateway",
23+
"crates/papyrus_network",
24+
"crates/papyrus_node",
25+
"crates/papyrus_p2p_sync",
26+
"crates/papyrus_proc_macros",
27+
"crates/papyrus_protobuf",
28+
"crates/papyrus_rpc",
29+
"crates/papyrus_storage",
30+
"crates/papyrus_sync",
31+
"crates/papyrus_test_utils",
32+
"crates/sequencing/papyrus_block_builder",
33+
"crates/sequencing/papyrus_consensus",
34+
"crates/starknet_api",
35+
"crates/starknet_client",
36+
"crates/starknet_sierra_compile",
37+
"crates/task_executor",
38+
"crates/tests-integration",
3939
]
4040

4141
[workspace.package]

‎crates/committer_cli/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ criterion = { version = "0.5.1", features = ["html_reports"] }
1414
pretty_assertions.workspace = true
1515

1616
[dependencies]
17-
clap = { version = "4.5.4", features = ["cargo", "derive"] }
17+
clap = { version = "4.5.4", features = ["cargo", "derive"] }
1818
committer = { path = "../committer", features = ["testing"] }
1919
derive_more.workspace = true
2020
ethnum.workspace = true
@@ -27,7 +27,7 @@ serde_json = "1.0.116"
2727
serde_repr = "0.1.19"
2828
simplelog.workspace = true
2929
starknet-types-core.workspace = true
30-
starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0"}
30+
starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0" }
3131
strum.workspace = true
3232
strum_macros.workspace = true
3333
thiserror.workspace = true

‎crates/gateway/Cargo.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,27 @@ blockifier = { path = "../blockifier", version = "0.8.0-rc.0", features = ["test
1818
cairo-lang-starknet-classes.workspace = true
1919
cairo-vm.workspace = true
2020
hyper.workspace = true
21+
mempool_test_utils = { path = "../mempool_test_utils", version = "0.0" }
2122
num-traits.workspace = true
22-
papyrus_config = { path = "../papyrus_config", version = "0.4.0-rc.0"}
23-
papyrus_rpc = { path = "../papyrus_rpc", version = "0.4.0-rc.0"}
23+
papyrus_config = { path = "../papyrus_config", version = "0.4.0-rc.0" }
24+
papyrus_rpc = { path = "../papyrus_rpc", version = "0.4.0-rc.0" }
2425
reqwest.workspace = true
2526
serde.workspace = true
2627
serde_json.workspace = true
27-
starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0"}
28+
starknet-types-core.workspace = true
29+
starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0" }
2830
starknet_mempool_infra = { path = "../mempool_infra", version = "0.0" }
2931
starknet_mempool_types = { path = "../mempool_types", version = "0.0" }
3032
starknet_sierra_compile = { path = "../starknet_sierra_compile", version = "0.0" }
31-
starknet-types-core.workspace = true
32-
mempool_test_utils = { path = "../mempool_test_utils", version = "0.0"}
3333
thiserror.workspace = true
3434
tokio.workspace = true
3535
tracing.workspace = true
3636
validator.workspace = true
3737

3838
[dev-dependencies]
3939
assert_matches.workspace = true
40-
mockito = "1.4.0"
4140
mockall.workspace = true
41+
mockito = "1.4.0"
4242
num-bigint.workspace = true
4343
pretty_assertions.workspace = true
4444
rstest.workspace = true

‎crates/mempool/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ workspace = true
1111
[dependencies]
1212
async-trait.workspace = true
1313
derive_more.workspace = true
14+
starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0" }
1415
starknet_mempool_infra = { path = "../mempool_infra", version = "0.0" }
15-
starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0"}
1616
starknet_mempool_types = { path = "../mempool_types", version = "0.0" }
1717
tokio.workspace = true
1818

‎crates/mempool_node/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ anyhow.workspace = true
1313
clap.workspace = true
1414
const_format.workspace = true
1515
futures.workspace = true
16-
papyrus_config = { path = "../papyrus_config", version = "0.4.0-rc.0"}
16+
papyrus_config = { path = "../papyrus_config", version = "0.4.0-rc.0" }
1717
serde.workspace = true
1818
starknet_gateway = { path = "../gateway", version = "0.0" }
1919
starknet_mempool = { path = "../mempool", version = "0.0" }
@@ -27,6 +27,6 @@ validator.workspace = true
2727
assert-json-diff.workspace = true
2828
assert_matches.workspace = true
2929
colored.workspace = true
30+
mempool_test_utils = { path = "../mempool_test_utils" }
3031
pretty_assertions.workspace = true
3132
serde_json.workspace = true
32-
mempool_test_utils = { path = "../mempool_test_utils" }

‎crates/mempool_test_utils/Cargo.toml

+3-5
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ license.workspace = true
99

1010
[dependencies]
1111
assert_matches.workspace = true
12-
blockifier = { path = "../blockifier", version = "0.8.0-rc.0", features = ["testing"]}
13-
starknet-types-core.workspace = true
14-
starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0"}
12+
blockifier = { path = "../blockifier", version = "0.8.0-rc.0", features = ["testing"] }
1513
serde_json.workspace = true
16-
17-
14+
starknet-types-core.workspace = true
15+
starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0" }

‎crates/mempool_types/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ workspace = true
1010

1111
[dependencies]
1212
async-trait.workspace = true
13-
starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0"}
1413
mockall.workspace = true
14+
starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0" }
1515
starknet_mempool_infra = { path = "../mempool_infra" }
1616
thiserror.workspace = true

‎crates/papyrus_base_layer/Cargo.toml

+3-5
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,16 @@ papyrus_config = { path = "../papyrus_config", version = "0.4.0-rc.0" }
1212
rustc-hex.workspace = true
1313
serde.workspace = true
1414
serde_json.workspace = true
15-
starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0"}
15+
starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0" }
1616
thiserror.workspace = true
1717
tokio = { workspace = true, features = ["full", "sync"] }
1818
url.workspace = true
1919

2020
[dev-dependencies]
2121
ethers-core = { version = "2.0.3" }
2222
pretty_assertions.workspace = true
23-
starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0", features = ["testing"] }
2423
starknet-types-core.workspace = true
24+
starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0", features = ["testing"] }
2525
tar = { version = "0.4.38" }
2626
tempfile.workspace = true
27-
test-with = { version = "0.9.3", default-features = false, features = [
28-
"executable",
29-
] }
27+
test-with = { version = "0.9.3", default-features = false, features = ["executable"] }

‎crates/papyrus_common/Cargo.toml

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@ description = "Common utils and objects for a Starknet node."
99
[dependencies]
1010
cairo-lang-starknet-classes.workspace = true
1111
hex.workspace = true
12+
indexmap.workspace = true
1213
itertools.workspace = true
1314
lazy_static.workspace = true
15+
rand.workspace = true
1416
serde.workspace = true
1517
serde_json.workspace = true
1618
sha3.workspace = true
17-
starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0"}
1819
starknet-types-core = { workspace = true, features = ["hash"] }
20+
starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0" }
1921
thiserror.workspace = true
20-
rand.workspace = true
21-
indexmap.workspace = true
2222

2323
[dev-dependencies]
2424
assert_matches.workspace = true
25-
pretty_assertions.workspace = true
26-
serde_json = { workspace = true, features = ["arbitrary_precision"]}
2725
papyrus_test_utils = { path = "../papyrus_test_utils" }
26+
pretty_assertions.workspace = true
27+
serde_json = { workspace = true, features = ["arbitrary_precision"] }

‎crates/papyrus_config/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ license-file.workspace = true
77
description = "A library for handling node configuration."
88

99
[package.metadata.cargo-udeps.ignore]
10-
development = ["tempfile"] # Dependency of a doc-test
10+
development = ["tempfile"] # Dependency of a doc-test
1111

1212
[dependencies]
1313
clap = { workspace = true, features = ["env", "string"] }
1414
itertools.workspace = true
1515
serde = { workspace = true, features = ["derive"] }
16-
serde_json = { workspace = true, features = ["arbitrary_precision"]}
16+
serde_json = { workspace = true, features = ["arbitrary_precision"] }
1717
strum_macros.workspace = true
1818
thiserror.workspace = true
1919
validator = { workspace = true, features = ["derive"] }
@@ -22,5 +22,5 @@ validator = { workspace = true, features = ["derive"] }
2222
assert_matches.workspace = true
2323
itertools.workspace = true
2424
lazy_static.workspace = true
25-
tempfile.workspace = true
2625
papyrus_test_utils = { path = "../papyrus_test_utils" }
26+
tempfile.workspace = true

‎crates/papyrus_execution/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ license-file.workspace = true
77
description = "Transaction and entry point execution functionality for a Papyrus node."
88

99
[features]
10-
testing = ["rand", "rand_chacha", "papyrus_test_utils"]
10+
testing = ["papyrus_test_utils", "rand", "rand_chacha"]
1111

1212
[dependencies]
1313
anyhow.workspace = true
14-
blockifier = { path = "../blockifier", version = "0.8.0-rc.0"}
14+
blockifier = { path = "../blockifier", version = "0.8.0-rc.0" }
1515
cairo-lang-starknet-classes.workspace = true
1616
cairo-vm.workspace = true
1717
indexmap.workspace = true
@@ -25,7 +25,7 @@ rand = { workspace = true, optional = true }
2525
rand_chacha = { workspace = true, optional = true }
2626
serde = { workspace = true, features = ["derive"] }
2727
serde_json = { workspace = true, features = ["arbitrary_precision"] }
28-
starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0"}
28+
starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0" }
2929
starknet-types-core.workspace = true
3030
papyrus_test_utils = { path = "../papyrus_test_utils", optional = true }
3131
thiserror.workspace = true

‎crates/papyrus_load_test/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ anyhow.workspace = true
1313
assert_matches.workspace = true
1414
goose = "0.17.0"
1515
once_cell.workspace = true
16-
serde = { workspace = true, features = ["derive"] }
17-
serde_json = { workspace = true, features = ["arbitrary_precision"]}
18-
tokio.workspace = true
1916
rand.workspace = true
2017
reqwest.workspace = true
18+
serde = { workspace = true, features = ["derive"] }
19+
serde_json = { workspace = true, features = ["arbitrary_precision"] }
20+
tokio.workspace = true
2121

2222
[dev-dependencies]
2323
lazy_static.workspace = true

‎crates/papyrus_monitoring_gateway/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ axum.workspace = true
1010
hyper = { workspace = true, features = ["full"] }
1111
metrics-exporter-prometheus = { version = "0.12.1" }
1212
metrics-process = { version = "1.0.11" }
13-
papyrus_storage = { path = "../papyrus_storage", version = "0.4.0-rc.0" }
1413
papyrus_config = { path = "../papyrus_config", version = "0.4.0-rc.0" }
14+
papyrus_storage = { path = "../papyrus_storage", version = "0.4.0-rc.0" }
1515
rand.workspace = true
1616
serde = { workspace = true, features = ["derive"] }
1717
serde_json = { workspace = true, features = ["arbitrary_precision"] }

‎crates/papyrus_network/Cargo.toml

+12-12
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ testing = []
1010

1111
[[bin]]
1212
name = "streamed_bytes_benchmark"
13-
required-features = ["clap"]
1413
path = "src/bin/streamed_bytes_benchmark.rs"
14+
required-features = ["clap"]
1515

1616
[dependencies]
1717
async-stream.workspace = true
@@ -21,21 +21,21 @@ derive_more.workspace = true
2121
futures.workspace = true
2222
lazy_static.workspace = true
2323
libp2p = { workspace = true, features = [
24-
"gossipsub",
25-
"identify",
26-
"kad",
27-
"macros",
28-
"noise",
29-
"quic",
30-
"tcp",
31-
"tokio",
32-
"yamux",
33-
"serde",
24+
"gossipsub",
25+
"identify",
26+
"kad",
27+
"macros",
28+
"noise",
29+
"quic",
30+
"serde",
31+
"tcp",
32+
"tokio",
33+
"yamux",
3434
] }
3535
metrics.workspace = true
36-
replace_with.workspace = true
3736
papyrus_common = { path = "../papyrus_common", version = "0.4.0-rc.0" }
3837
papyrus_config = { path = "../papyrus_config", version = "0.4.0-rc.0" }
38+
replace_with.workspace = true
3939
serde = { workspace = true, features = ["derive"] }
4040
thiserror.workspace = true
4141
tokio = { workspace = true, features = ["full", "sync"] }

0 commit comments

Comments
 (0)