Skip to content

Commit a2797d4

Browse files
ackintoshackintosh
authored
Fix formatting errors from cargo-sort (#7512)
[cargo-sort is currently failing on CI](https://github.com/sigp/lighthouse/actions/runs/15198128212/job/42746931918?pr=7025), likely due to new checks introduced in version [2.0.0](https://github.com/DevinR528/cargo-sort/releases/tag/v2.0.0). Fixed the errors by running cargo-sort with formatting enabled.
1 parent 6af8c18 commit a2797d4

File tree

26 files changed

+246
-247
lines changed

26 files changed

+246
-247
lines changed

‎Cargo.toml

Lines changed: 70 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[workspace]
22
members = [
33
"account_manager",
4-
54
"beacon_node",
65
"beacon_node/beacon_chain",
76
"beacon_node/beacon_processor",
@@ -17,9 +16,7 @@ members = [
1716
"beacon_node/operation_pool",
1817
"beacon_node/store",
1918
"beacon_node/timer",
20-
2119
"boot_node",
22-
2320
"common/account_utils",
2421
"common/clap_utils",
2522
"common/compare_fields",
@@ -52,7 +49,6 @@ members = [
5249
"common/validator_dir",
5350
"common/warp_utils",
5451
"common/workspace_members",
55-
5652
"consensus/context_deserialize",
5753
"consensus/context_deserialize_derive",
5854
"consensus/fixed_bytes",
@@ -64,23 +60,17 @@ members = [
6460
"consensus/state_processing",
6561
"consensus/swap_or_not_shuffle",
6662
"consensus/types",
67-
6863
"crypto/bls",
6964
"crypto/eth2_key_derivation",
7065
"crypto/eth2_keystore",
7166
"crypto/eth2_wallet",
7267
"crypto/kzg",
73-
7468
"database_manager",
75-
7669
"lcli",
77-
7870
"lighthouse",
7971
"lighthouse/environment",
80-
8172
"slasher",
8273
"slasher/service",
83-
8474
"testing/ef_tests",
8575
"testing/eth1_test_rig",
8676
"testing/execution_engine_integration",
@@ -89,8 +79,6 @@ members = [
8979
"testing/state_transition_vectors",
9080
"testing/validator_test_rig",
9181
"testing/web3signer_tests",
92-
93-
9482
"validator_client",
9583
"validator_client/beacon_node_fallback",
9684
"validator_client/doppelganger_service",
@@ -103,7 +91,6 @@ members = [
10391
"validator_client/slashing_protection",
10492
"validator_client/validator_metrics",
10593
"validator_client/validator_services",
106-
10794
"validator_manager",
10895
]
10996
resolver = "2"
@@ -112,63 +99,107 @@ resolver = "2"
11299
edition = "2021"
113100

114101
[workspace.dependencies]
102+
account_utils = { path = "common/account_utils" }
103+
alloy-consensus = "0.3.0"
115104
alloy-primitives = { version = "0.8", features = ["rlp", "getrandom"] }
116105
alloy-rlp = "0.3.4"
117-
alloy-consensus = "0.3.0"
118106
anyhow = "1"
119107
arbitrary = { version = "1", features = ["derive"] }
120108
async-channel = "1.9.0"
121109
axum = "0.7.7"
110+
beacon_chain = { path = "beacon_node/beacon_chain" }
111+
beacon_node = { path = "beacon_node" }
112+
beacon_node_fallback = { path = "validator_client/beacon_node_fallback" }
113+
beacon_processor = { path = "beacon_node/beacon_processor" }
122114
bincode = "1"
123115
bitvec = "1"
116+
bls = { path = "crypto/bls" }
124117
byteorder = "1"
125118
bytes = "1"
126-
cargo_metadata = "0.19"
127-
clap = { version = "4.5.4", features = ["derive", "cargo", "wrap_help"] }
128119
# Turn off c-kzg's default features which include `blst/portable`. We can turn on blst's portable
129120
# feature ourselves when desired.
130121
c-kzg = { version = "1", default-features = false }
122+
cargo_metadata = "0.19"
123+
clap = { version = "4.5.4", features = ["derive", "cargo", "wrap_help"] }
124+
clap_utils = { path = "common/clap_utils" }
125+
compare_fields = { path = "common/compare_fields" }
131126
compare_fields_derive = { path = "common/compare_fields_derive" }
132127
context_deserialize = { path = "consensus/context_deserialize" }
133128
context_deserialize_derive = { path = "consensus/context_deserialize_derive" }
134129
criterion = "0.5"
135130
delay_map = "0.4"
131+
deposit_contract = { path = "common/deposit_contract" }
136132
derivative = "2"
133+
directory = { path = "common/directory" }
137134
dirs = "3"
138-
either = "1.9"
139-
rust_eth_kzg = "0.5.4"
140135
discv5 = { version = "0.9", features = ["libp2p"] }
136+
doppelganger_service = { path = "validator_client/doppelganger_service" }
137+
either = "1.9"
141138
env_logger = "0.9"
139+
environment = { path = "lighthouse/environment" }
140+
eth1 = { path = "beacon_node/eth1" }
141+
eth1_test_rig = { path = "testing/eth1_test_rig" }
142+
eth2 = { path = "common/eth2" }
143+
eth2_config = { path = "common/eth2_config" }
144+
eth2_key_derivation = { path = "crypto/eth2_key_derivation" }
145+
eth2_keystore = { path = "crypto/eth2_keystore" }
146+
eth2_network_config = { path = "common/eth2_network_config" }
147+
eth2_wallet = { path = "crypto/eth2_wallet" }
142148
ethereum_hashing = "0.7.0"
143149
ethereum_serde_utils = "0.7"
144150
ethereum_ssz = "0.8.2"
145151
ethereum_ssz_derive = "0.8.2"
146152
ethers-core = "1"
153+
ethers-middleware = { version = "1", default-features = false }
147154
ethers-providers = { version = "1", default-features = false }
148155
ethers-signers = { version = "1", default-features = false }
149-
ethers-middleware = { version = "1", default-features = false }
156+
execution_layer = { path = "beacon_node/execution_layer" }
150157
exit-future = "0.2"
158+
filesystem = { path = "common/filesystem" }
159+
fixed_bytes = { path = "consensus/fixed_bytes" }
151160
fnv = "1"
161+
fork_choice = { path = "consensus/fork_choice" }
152162
fs2 = "0.4"
153163
futures = "0.3"
154-
graffiti_file = { path = "validator_client/graffiti_file" }
164+
genesis = { path = "beacon_node/genesis" }
155165
gossipsub = { package = "libp2p-gossipsub", git = "https://github.com/sigp/rust-libp2p.git", rev = "61b2820" }
156-
hex = "0.4"
166+
graffiti_file = { path = "validator_client/graffiti_file" }
157167
hashlink = "0.9.0"
168+
health_metrics = { path = "common/health_metrics" }
169+
hex = "0.4"
170+
http_api = { path = "beacon_node/http_api" }
158171
hyper = "1"
172+
initialized_validators = { path = "validator_client/initialized_validators" }
173+
int_to_bytes = { path = "consensus/int_to_bytes" }
159174
itertools = "0.10"
175+
kzg = { path = "crypto/kzg" }
160176
libsecp256k1 = "0.7"
177+
lighthouse_network = { path = "beacon_node/lighthouse_network" }
178+
lighthouse_validator_store = { path = "validator_client/lighthouse_validator_store" }
179+
lighthouse_version = { path = "common/lighthouse_version" }
180+
lockfile = { path = "common/lockfile" }
161181
log = "0.4"
182+
logging = { path = "common/logging" }
162183
logroller = "0.1.8"
163184
lru = "0.12"
185+
lru_cache = { path = "common/lru_cache" }
186+
malloc_utils = { path = "common/malloc_utils" }
164187
maplit = "1"
188+
merkle_proof = { path = "consensus/merkle_proof" }
189+
metrics = { path = "common/metrics" }
165190
milhouse = "0.5"
166191
mockito = "1.5.0"
192+
monitoring_api = { path = "common/monitoring_api" }
193+
network = { path = "beacon_node/network" }
194+
node_test_rig = { path = "testing/node_test_rig" }
167195
num_cpus = "1"
168196
once_cell = "1.17.1"
197+
operation_pool = { path = "beacon_node/operation_pool" }
169198
parking_lot = "0.12"
170199
paste = "1"
200+
pretty_reqwest_error = { path = "common/pretty_reqwest_error" }
171201
prometheus = { version = "0.13", default-features = false }
202+
proto_array = { path = "consensus/proto_array" }
172203
quickcheck = "1"
173204
quickcheck_macros = "1"
174205
quote = "1"
@@ -186,18 +217,30 @@ reqwest = { version = "0.11", default-features = false, features = [
186217
ring = "0.17"
187218
rpds = "0.11"
188219
rusqlite = { version = "0.28", features = ["bundled"] }
220+
rust_eth_kzg = "0.5.4"
221+
safe_arith = { path = "consensus/safe_arith" }
222+
sensitive_url = { path = "common/sensitive_url" }
189223
serde = { version = "1", features = ["derive"] }
190224
serde_json = "1"
191225
serde_repr = "0.1"
192226
serde_yaml = "0.9"
193227
sha2 = "0.9"
228+
signing_method = { path = "validator_client/signing_method" }
229+
slasher = { path = "slasher", default-features = false }
230+
slashing_protection = { path = "validator_client/slashing_protection" }
231+
slot_clock = { path = "common/slot_clock" }
194232
smallvec = { version = "1.11.2", features = ["arbitrary"] }
195233
snap = "1"
196234
ssz_types = "0.10"
235+
state_processing = { path = "consensus/state_processing" }
236+
store = { path = "beacon_node/store" }
197237
strum = { version = "0.24", features = ["derive"] }
198238
superstruct = "0.8"
239+
swap_or_not_shuffle = { path = "consensus/swap_or_not_shuffle" }
199240
syn = "1"
200241
sysinfo = "0.26"
242+
system_health = { path = "common/system_health" }
243+
task_executor = { path = "common/task_executor" }
201244
tempfile = "3"
202245
tokio = { version = "1", features = [
203246
"rt-multi-thread",
@@ -214,72 +257,10 @@ tracing-log = "0.2"
214257
tracing-subscriber = { version = "0.3", features = ["env-filter", "json"] }
215258
tree_hash = "0.9"
216259
tree_hash_derive = "0.9"
217-
url = "2"
218-
uuid = { version = "0.8", features = ["serde", "v4"] }
219-
warp = { version = "0.3.7", default-features = false, features = ["tls"] }
220-
zeroize = { version = "1", features = ["zeroize_derive", "serde"] }
221-
zip = "0.6"
222-
223-
# Local crates.
224-
account_utils = { path = "common/account_utils" }
225-
beacon_chain = { path = "beacon_node/beacon_chain" }
226-
beacon_node = { path = "beacon_node" }
227-
beacon_node_fallback = { path = "validator_client/beacon_node_fallback" }
228-
beacon_processor = { path = "beacon_node/beacon_processor" }
229-
bls = { path = "crypto/bls" }
230-
clap_utils = { path = "common/clap_utils" }
231-
compare_fields = { path = "common/compare_fields" }
232-
deposit_contract = { path = "common/deposit_contract" }
233-
directory = { path = "common/directory" }
234-
doppelganger_service = { path = "validator_client/doppelganger_service" }
235-
environment = { path = "lighthouse/environment" }
236-
eth1 = { path = "beacon_node/eth1" }
237-
eth1_test_rig = { path = "testing/eth1_test_rig" }
238-
eth2 = { path = "common/eth2" }
239-
eth2_config = { path = "common/eth2_config" }
240-
eth2_key_derivation = { path = "crypto/eth2_key_derivation" }
241-
eth2_keystore = { path = "crypto/eth2_keystore" }
242-
eth2_network_config = { path = "common/eth2_network_config" }
243-
eth2_wallet = { path = "crypto/eth2_wallet" }
244-
execution_layer = { path = "beacon_node/execution_layer" }
245-
fixed_bytes = { path = "consensus/fixed_bytes" }
246-
filesystem = { path = "common/filesystem" }
247-
fork_choice = { path = "consensus/fork_choice" }
248-
genesis = { path = "beacon_node/genesis" }
249-
health_metrics = { path = "common/health_metrics" }
250-
http_api = { path = "beacon_node/http_api" }
251-
initialized_validators = { path = "validator_client/initialized_validators" }
252-
int_to_bytes = { path = "consensus/int_to_bytes" }
253-
kzg = { path = "crypto/kzg" }
254-
metrics = { path = "common/metrics" }
255-
lighthouse_network = { path = "beacon_node/lighthouse_network" }
256-
lighthouse_validator_store = { path = "validator_client/lighthouse_validator_store" }
257-
lighthouse_version = { path = "common/lighthouse_version" }
258-
workspace_members = { path = "common/workspace_members" }
259-
lockfile = { path = "common/lockfile" }
260-
logging = { path = "common/logging" }
261-
lru_cache = { path = "common/lru_cache" }
262-
malloc_utils = { path = "common/malloc_utils" }
263-
merkle_proof = { path = "consensus/merkle_proof" }
264-
monitoring_api = { path = "common/monitoring_api" }
265-
network = { path = "beacon_node/network" }
266-
node_test_rig = { path = "testing/node_test_rig" }
267-
operation_pool = { path = "beacon_node/operation_pool" }
268-
pretty_reqwest_error = { path = "common/pretty_reqwest_error" }
269-
proto_array = { path = "consensus/proto_array" }
270-
safe_arith = { path = "consensus/safe_arith" }
271-
sensitive_url = { path = "common/sensitive_url" }
272-
signing_method = { path = "validator_client/signing_method" }
273-
slasher = { path = "slasher", default-features = false }
274-
slashing_protection = { path = "validator_client/slashing_protection" }
275-
slot_clock = { path = "common/slot_clock" }
276-
state_processing = { path = "consensus/state_processing" }
277-
store = { path = "beacon_node/store" }
278-
swap_or_not_shuffle = { path = "consensus/swap_or_not_shuffle" }
279-
system_health = { path = "common/system_health" }
280-
task_executor = { path = "common/task_executor" }
281260
types = { path = "consensus/types" }
282261
unused_port = { path = "common/unused_port" }
262+
url = "2"
263+
uuid = { version = "0.8", features = ["serde", "v4"] }
283264
validator_client = { path = "validator_client" }
284265
validator_dir = { path = "common/validator_dir" }
285266
validator_http_api = { path = "validator_client/http_api" }
@@ -288,8 +269,12 @@ validator_metrics = { path = "validator_client/validator_metrics" }
288269
validator_services = { path = "validator_client/validator_services" }
289270
validator_store = { path = "validator_client/validator_store" }
290271
validator_test_rig = { path = "testing/validator_test_rig" }
272+
warp = { version = "0.3.7", default-features = false, features = ["tls"] }
291273
warp_utils = { path = "common/warp_utils" }
274+
workspace_members = { path = "common/workspace_members" }
292275
xdelta3 = { git = "http://github.com/sigp/xdelta3-rs", rev = "4db64086bb02e9febb584ba93b9d16bb2ae3825a" }
276+
zeroize = { version = "1", features = ["zeroize_derive", "serde"] }
277+
zip = "0.6"
293278
zstd = "0.13"
294279

295280
[profile.maxperf]

‎beacon_node/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ edition = { workspace = true }
1111
name = "beacon_node"
1212
path = "src/lib.rs"
1313

14-
[dev-dependencies]
15-
node_test_rig = { path = "../testing/node_test_rig" }
16-
1714
[features]
1815
write_ssz_files = [
1916
"beacon_chain/write_ssz_files",
@@ -45,3 +42,6 @@ task_executor = { workspace = true }
4542
tracing = { workspace = true }
4643
types = { workspace = true }
4744
unused_port = { workspace = true }
45+
46+
[dev-dependencies]
47+
node_test_rig = { path = "../testing/node_test_rig" }

‎beacon_node/beacon_chain/Cargo.toml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ authors = ["Paul Hauner <[email protected]>", "Age Manning <[email protected]
55
edition = { workspace = true }
66
autotests = false # using a single test binary compiles faster
77

8-
[[bench]]
9-
name = "benches"
10-
harness = false
11-
128
[features]
139
default = ["participation_metrics"]
1410
write_ssz_files = [] # Writes debugging .ssz files to /tmp during block processing.
@@ -17,11 +13,6 @@ fork_from_env = [] # Initialise the harness chain spec from the FORK_NAME env va
1713
portable = ["bls/supranational-portable"]
1814
test_backfill = []
1915

20-
[dev-dependencies]
21-
criterion = { workspace = true }
22-
maplit = { workspace = true }
23-
serde_json = { workspace = true }
24-
2516
[dependencies]
2617
alloy-primitives = { workspace = true }
2718
bitvec = { workspace = true }
@@ -75,6 +66,15 @@ tree_hash = { workspace = true }
7566
tree_hash_derive = { workspace = true }
7667
types = { workspace = true }
7768

69+
[dev-dependencies]
70+
criterion = { workspace = true }
71+
maplit = { workspace = true }
72+
serde_json = { workspace = true }
73+
74+
[[bench]]
75+
name = "benches"
76+
harness = false
77+
7878
[[test]]
7979
name = "beacon_chain_tests"
8080
path = "tests/main.rs"

‎beacon_node/client/Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@ version = "0.2.0"
44
authors = ["Sigma Prime <[email protected]>"]
55
edition = { workspace = true }
66

7-
[dev-dependencies]
8-
operation_pool = { workspace = true }
9-
serde_yaml = { workspace = true }
10-
state_processing = { workspace = true }
11-
tokio = { workspace = true }
12-
137
[dependencies]
148
beacon_chain = { workspace = true }
159
beacon_processor = { workspace = true }
@@ -46,3 +40,9 @@ tokio = { workspace = true }
4640
tracing = { workspace = true }
4741
tracing-subscriber = { workspace = true }
4842
types = { workspace = true }
43+
44+
[dev-dependencies]
45+
operation_pool = { workspace = true }
46+
serde_yaml = { workspace = true }
47+
state_processing = { workspace = true }
48+
tokio = { workspace = true }

0 commit comments

Comments
 (0)