Enforce alphabetically ordered cargo deps (#6678)

* Enforce alphabetically ordered cargo deps

* Fix test-suite

* Another CI fix

* Merge branch 'unstable' into cargo-sort

* Fix conflicts

* Merge remote-tracking branch 'origin/unstable' into cargo-sort

validator_client/Cargo.toml

@@ -17,10 +17,11 @@ beacon_node_fallback = { workspace = true }
 clap = { workspace = true }
 clap_utils = { workspace = true }
 directory = { workspace = true }
-doppelganger_service = { workspace = true }
 dirs = { workspace = true }
-eth2 = { workspace = true }
+doppelganger_service = { workspace = true }
 environment = { workspace = true }
+eth2 = { workspace = true }
+fdlimit = "0.3.0"
 graffiti_file = { workspace = true }
 hyper = { workspace = true }
 initialized_validators = { workspace = true }
@@ -29,15 +30,14 @@ monitoring_api = { workspace = true }
 parking_lot = { workspace = true }
 reqwest = { workspace = true }
 sensitive_url = { workspace = true }
-slashing_protection = { workspace = true }
 serde = { workspace = true }
+slashing_protection = { workspace = true }
 slog = { workspace = true }
 slot_clock = { workspace = true }
+tokio = { workspace = true }
 types  = { workspace = true }
 validator_http_api = { workspace = true }
 validator_http_metrics = { workspace = true }
 validator_metrics = { workspace = true }
 validator_services = { workspace = true }
 validator_store = { workspace = true }
-tokio = { workspace = true }
-fdlimit = "0.3.0"

validator_client/doppelganger_service/Cargo.toml

@@ -17,4 +17,4 @@ types = { workspace = true }
 
 [dev-dependencies]
 futures = { workspace = true }
-logging = {workspace = true }
+logging = { workspace = true }

validator_client/graffiti_file/Cargo.toml

@@ -9,11 +9,11 @@ name = "graffiti_file"
 path = "src/lib.rs"
 
 [dependencies]
-serde = { workspace = true }
 bls = { workspace = true }
-types = { workspace = true }
+serde = { workspace = true }
 slog = { workspace = true }
+types = { workspace = true }
 
 [dev-dependencies]
-tempfile = { workspace = true }
 hex = { workspace = true }
+tempfile = { workspace = true }

validator_client/http_api/Cargo.toml

@@ -10,25 +10,25 @@ path = "src/lib.rs"
 
 [dependencies]
 account_utils = { workspace = true }
-bls = { workspace = true }
 beacon_node_fallback = { workspace = true }
+bls = { workspace = true }
 deposit_contract = { workspace = true }
 directory = { workspace = true }
-doppelganger_service = { workspace = true }
 dirs = { workspace = true }
-graffiti_file = { workspace = true }
+doppelganger_service = { workspace = true }
 eth2  = { workspace = true }
 eth2_keystore  = { workspace = true }
 ethereum_serde_utils = { workspace = true }
+filesystem = { workspace = true }
+graffiti_file = { workspace = true }
 initialized_validators = { workspace = true }
 lighthouse_version = { workspace = true }
 logging = { workspace = true }
 parking_lot = { workspace = true }
-filesystem = { workspace = true }
 rand = { workspace = true }
+sensitive_url = { workspace = true }
 serde = { workspace = true }
 signing_method = { workspace = true }
-sensitive_url = { workspace = true }
 slashing_protection = { workspace = true }
 slog =  { workspace = true }
 slot_clock =  { workspace = true }
@@ -39,15 +39,15 @@ tempfile =  { workspace = true }
 tokio =  { workspace = true }
 tokio-stream =  { workspace = true }
 types =  { workspace = true }
-validator_dir =  { workspace = true }
-validator_store =  { workspace = true }
-validator_services =  { workspace = true }
 url =  { workspace = true }
-warp_utils = { workspace = true }
+validator_dir =  { workspace = true }
+validator_services =  { workspace = true }
+validator_store =  { workspace = true }
 warp = { workspace = true }
+warp_utils = { workspace = true }
 zeroize = { workspace = true }
 
 [dev-dependencies]
-itertools = { workspace = true }
 futures = { workspace = true }
+itertools = { workspace = true }
 rand = { workspace = true, features = ["small_rng"] }

validator_client/http_metrics/Cargo.toml

@@ -5,16 +5,16 @@ edition = { workspace = true }
 authors = ["Sigma Prime <contact@sigmaprime.io>"]
 
 [dependencies]
+lighthouse_version = { workspace = true }
 malloc_utils = { workspace = true }
-slot_clock = { workspace = true }
 metrics = { workspace = true }
 parking_lot = { workspace = true }
 serde = { workspace = true }
 slog = { workspace = true }
-warp_utils = { workspace = true }
-warp = { workspace = true }
-lighthouse_version = { workspace = true }
+slot_clock = { workspace = true }
+types = { workspace = true }
+validator_metrics = { workspace = true }
 validator_services = { workspace = true }
 validator_store = { workspace = true }
-validator_metrics = { workspace = true }
-types = { workspace = true }
+warp = { workspace = true }
+warp_utils = { workspace = true }

validator_client/initialized_validators/Cargo.toml

@@ -5,23 +5,23 @@ edition = { workspace = true }
 authors = ["Sigma Prime <contact@sigmaprime.io>"]
 
 [dependencies]
-signing_method = { workspace = true }
 account_utils = { workspace = true }
+bincode = { workspace = true }
+bls = { workspace = true }
 eth2_keystore = { workspace = true }
-metrics = { workspace = true }
+filesystem = { workspace = true }
 lockfile = { workspace = true }
+metrics = { workspace = true }
 parking_lot = { workspace = true }
+rand = { workspace = true }
 reqwest = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+signing_method = { workspace = true }
 slog = { workspace = true }
+tokio = { workspace = true }
 types = { workspace = true }
 url = { workspace = true }
 validator_dir = { workspace = true }
-rand = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }
-bls = { workspace = true }
-tokio = { workspace = true }
-bincode = { workspace = true }
-filesystem = { workspace = true }
 validator_metrics = { workspace = true }
 zeroize = { workspace = true }

validator_client/signing_method/Cargo.toml

@@ -6,12 +6,12 @@ authors = ["Sigma Prime <contact@sigmaprime.io>"]
 
 [dependencies]
 eth2_keystore = { workspace = true }
+ethereum_serde_utils = { workspace = true }
 lockfile = { workspace = true }
 parking_lot = { workspace = true }
 reqwest = { workspace = true }
+serde = { workspace = true }
 task_executor = { workspace = true }
 types = { workspace = true }
 url = { workspace = true }
 validator_metrics = { workspace = true }
-serde = { workspace = true }
-ethereum_serde_utils = { workspace = true }

validator_client/slashing_protection/Cargo.toml

@@ -10,16 +10,16 @@ name = "slashing_protection_tests"
 path = "tests/main.rs"
 
 [dependencies]
-tempfile = { workspace = true }
-types = { workspace = true }
-rusqlite = { workspace = true }
-r2d2 = { workspace = true }
-r2d2_sqlite = "0.21.0"
-serde = { workspace = true }
-serde_json = { workspace = true }
+arbitrary = { workspace = true, features = ["derive"] }
 ethereum_serde_utils = { workspace = true }
 filesystem = { workspace = true }
-arbitrary = { workspace = true, features = ["derive"] }
+r2d2 = { workspace = true }
+r2d2_sqlite = "0.21.0"
+rusqlite = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+tempfile = { workspace = true }
+types = { workspace = true }
 
 [dev-dependencies]
 rayon = { workspace = true }

validator_client/validator_services/Cargo.toml

@@ -6,18 +6,18 @@ authors = ["Sigma Prime <contact@sigmaprime.io>"]
 
 [dependencies]
 beacon_node_fallback = { workspace = true }
-validator_metrics = { workspace = true }
-validator_store = { workspace = true }
-graffiti_file = { workspace = true }
+bls =  { workspace = true }
 doppelganger_service = { workspace = true }
 environment = { workspace = true }
 eth2 = { workspace = true }
 futures = { workspace = true }
+graffiti_file = { workspace = true }
 parking_lot = { workspace = true }
 safe_arith = { workspace = true }
 slog =  { workspace = true }
 slot_clock =  { workspace = true }
 tokio =  { workspace = true }
-types =  { workspace = true }
 tree_hash =  { workspace = true }
-bls =  { workspace = true }
+types =  { workspace = true }
+validator_metrics = { workspace = true }
+validator_store = { workspace = true }