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

common/account_utils/Cargo.toml

@@ -3,20 +3,19 @@ name = "account_utils"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = { workspace = true }
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-rand = { workspace = true }
-eth2_wallet = { workspace = true }
+directory = { workspace = true }
 eth2_keystore = { workspace = true }
+eth2_wallet = { workspace = true }
 filesystem = { workspace = true }
-zeroize = { workspace = true }
+rand = { workspace = true }
+regex = { workspace = true }
+rpassword = "5.0.0"
 serde = { workspace = true }
 serde_yaml = { workspace = true }
 slog = { workspace = true }
 types = { workspace = true }
 validator_dir = { workspace = true }
-regex = { workspace = true }
-rpassword = "5.0.0"
-directory = { workspace = true }
+zeroize = { workspace = true }

common/clap_utils/Cargo.toml

@@ -3,16 +3,15 @@ name = "clap_utils"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = { workspace = true }
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 alloy-primitives = { workspace = true }
 clap = { workspace = true }
-hex = { workspace = true }
 dirs = { workspace = true }
 eth2_network_config = { workspace = true }
 ethereum_ssz = { workspace = true }
+hex = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 serde_yaml = { workspace = true }

common/compare_fields_derive/Cargo.toml

@@ -8,5 +8,5 @@ edition = { workspace = true }
 proc-macro = true
 
 [dependencies]
-syn = { workspace = true }
 quote = { workspace = true }
+syn = { workspace = true }

common/deposit_contract/Cargo.toml

@@ -7,13 +7,13 @@ edition = { workspace = true }
 build = "build.rs"
 
 [build-dependencies]
+hex = { workspace = true }
 reqwest = { workspace = true }
 serde_json = { workspace = true }
 sha2 = { workspace = true }
-hex = { workspace = true }
 
 [dependencies]
-types = { workspace = true }
+ethabi = "16.0.0"
 ethereum_ssz = { workspace = true }
 tree_hash = { workspace = true }
-ethabi = "16.0.0"
+types = { workspace = true }

common/directory/Cargo.toml

@@ -3,7 +3,6 @@ name = "directory"
 version = "0.1.0"
 authors = ["pawan <pawandhananjay@gmail.com>"]
 edition = { workspace = true }
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]

common/eth2/Cargo.toml

@@ -3,31 +3,30 @@ name = "eth2"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = { workspace = true }
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-serde = { workspace = true }
-serde_json = { workspace = true }
-ssz_types = { workspace = true }
-types = { workspace = true }
-reqwest = { workspace = true }
-lighthouse_network = { workspace = true }
-proto_array = { workspace = true }
-ethereum_serde_utils = { workspace = true }
+derivative = { workspace = true }
 eth2_keystore = { workspace = true }
-zeroize = { workspace = true }
-sensitive_url = { workspace = true }
+ethereum_serde_utils = { workspace = true }
 ethereum_ssz = { workspace = true }
 ethereum_ssz_derive = { workspace = true }
-futures-util = "0.3.8"
 futures = { workspace = true }
-store = { workspace = true }
-slashing_protection = { workspace = true }
+futures-util = "0.3.8"
+lighthouse_network = { workspace = true }
 mediatype = "0.19.13"
 pretty_reqwest_error = { workspace = true }
-derivative = { workspace = true }
+proto_array = { workspace = true }
+reqwest = { workspace = true }
 reqwest-eventsource = "0.5.0"
+sensitive_url = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+slashing_protection = { workspace = true }
+ssz_types = { workspace = true }
+store = { workspace = true }
+types = { workspace = true }
+zeroize = { workspace = true }
 
 [dev-dependencies]
 tokio = { workspace = true }

common/eth2_config/Cargo.toml

@@ -5,5 +5,5 @@ authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = { workspace = true }
 
 [dependencies]
-types = { workspace = true }
 paste = { workspace = true }
+types = { workspace = true }

common/eth2_interop_keypairs/Cargo.toml

@@ -3,16 +3,15 @@ name = "eth2_interop_keypairs"
 version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = { workspace = true }
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-num-bigint = "0.4.2"
+bls = { workspace = true }
 ethereum_hashing = { workspace = true }
 hex = { workspace = true }
-serde_yaml = { workspace = true }
+num-bigint = "0.4.2"
 serde = { workspace = true }
-bls = { workspace = true }
+serde_yaml = { workspace = true }
 
 [dev-dependencies]
 base64 = "0.13.0"

common/eth2_network_config/Cargo.toml

@@ -7,25 +7,25 @@ edition = { workspace = true }
 build = "build.rs"
 
 [build-dependencies]
-zip = { workspace = true }
 eth2_config = { workspace = true }
+zip = { workspace = true }
 
 [dev-dependencies]
+ethereum_ssz = { workspace = true }
 tempfile = { workspace = true }
 tokio = { workspace = true }
-ethereum_ssz = { workspace = true }
 
 [dependencies]
-serde_yaml = { workspace = true }
-types = { workspace = true }
-eth2_config = { workspace = true }
-discv5 = { workspace = true }
-reqwest = { workspace = true }
-pretty_reqwest_error = { workspace = true }
-sha2 = { workspace = true }
-url = { workspace = true }
-sensitive_url = { workspace = true }
-slog = { workspace = true }
-logging = { workspace = true }
 bytes = { workspace = true }
+discv5 = { workspace = true }
+eth2_config = { workspace = true }
 kzg = { workspace = true }
+logging = { workspace = true }
+pretty_reqwest_error = { workspace = true }
+reqwest = { workspace = true }
+sensitive_url = { workspace = true }
+serde_yaml = { workspace = true }
+sha2 = { workspace = true }
+slog = { workspace = true }
+types = { workspace = true }
+url = { workspace = true }

common/eth2_wallet_manager/Cargo.toml

@@ -3,7 +3,6 @@ name = "eth2_wallet_manager"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = { workspace = true }
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]

common/lighthouse_version/Cargo.toml

@@ -3,7 +3,6 @@ name = "lighthouse_version"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = { workspace = true }
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]

common/logging/Cargo.toml

@@ -19,7 +19,7 @@ sloggers = { workspace = true }
 take_mut = "0.2.2"
 tokio = { workspace = true, features = [ "time" ] }
 tracing = "0.1"
+tracing-appender = { workspace = true }
 tracing-core = { workspace = true }
 tracing-log = { workspace = true }
 tracing-subscriber = { workspace = true }
-tracing-appender = { workspace = true }

common/malloc_utils/Cargo.toml

@@ -5,8 +5,8 @@ authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = { workspace = true }
 
 [dependencies]
-metrics = { workspace = true }
 libc = "0.2.79"
+metrics = { workspace = true }
 parking_lot = { workspace = true }
 tikv-jemalloc-ctl = { version = "0.6.0", optional = true, features = ["stats"] }
 

common/monitoring_api/Cargo.toml

@@ -3,19 +3,18 @@ name = "monitoring_api"
 version = "0.1.0"
 authors = ["pawan <pawandhananjay@gmail.com>"]
 edition = { workspace = true }
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-reqwest = { workspace = true }
-task_executor = { workspace = true }
-tokio = { workspace = true }
 eth2 = { workspace = true }
-serde_json = { workspace = true }
-serde = { workspace = true }
 lighthouse_version = { workspace = true }
 metrics = { workspace = true }
+regex = { workspace = true }
+reqwest = { workspace = true }
+sensitive_url = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
 slog = { workspace = true }
 store = { workspace = true }
-regex = { workspace = true }
-sensitive_url = { workspace = true }
+task_executor = { workspace = true }
+tokio = { workspace = true }

common/oneshot_broadcast/Cargo.toml

@@ -2,7 +2,6 @@
 name = "oneshot_broadcast"
 version = "0.1.0"
 edition = { workspace = true }
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]

common/pretty_reqwest_error/Cargo.toml

@@ -2,7 +2,6 @@
 name = "pretty_reqwest_error"
 version = "0.1.0"
 edition = { workspace = true }
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]

common/sensitive_url/Cargo.toml

@@ -3,9 +3,8 @@ name = "sensitive_url"
 version = "0.1.0"
 authors = ["Mac L <mjladson@pm.me>"]
 edition = { workspace = true }
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-url = { workspace = true }
 serde = { workspace = true }
+url = { workspace = true }

common/slot_clock/Cargo.toml

@@ -5,6 +5,6 @@ authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = { workspace = true }
 
 [dependencies]
-types = { workspace = true }
 metrics = { workspace = true }
 parking_lot = { workspace = true }
+types = { workspace = true }

common/system_health/Cargo.toml

@@ -5,7 +5,7 @@ edition = { workspace = true }
 
 [dependencies]
 lighthouse_network = { workspace = true }
-types = { workspace = true }
-sysinfo = { workspace = true }
-serde = { workspace = true }
 parking_lot = { workspace = true }
+serde = { workspace = true }
+sysinfo = { workspace = true }
+types = { workspace = true }

common/task_executor/Cargo.toml

@@ -11,10 +11,10 @@ tracing = ["dep:tracing"]
 
 [dependencies]
 async-channel = { workspace = true }
-tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
-slog = { workspace = true, optional = true }
 futures = { workspace = true }
-metrics = { workspace = true }
-sloggers = { workspace = true, optional = true }
 logging = { workspace = true, optional = true }
+metrics = { workspace = true }
+slog = { workspace = true, optional = true }
+sloggers = { workspace = true, optional = true }
+tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
 tracing = { workspace = true, optional = true }

common/test_random_derive/Cargo.toml

@@ -9,5 +9,5 @@ description = "Procedural derive macros for implementation of TestRandom trait"
 proc-macro = true
 
 [dependencies]
-syn = { workspace = true }
 quote = { workspace = true }
+syn = { workspace = true }

common/unused_port/Cargo.toml

@@ -2,7 +2,6 @@
 name = "unused_port"
 version = "0.1.0"
 edition = { workspace = true }
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]

common/validator_dir/Cargo.toml

@@ -6,21 +6,20 @@ edition = { workspace = true }
 
 [features]
 insecure_keys = []
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 bls = { workspace = true }
+deposit_contract = { workspace = true }
+derivative = { workspace = true }
+directory = { workspace = true }
 eth2_keystore = { workspace = true }
 filesystem = { workspace = true }
-types = { workspace = true }
-rand = { workspace = true }
-deposit_contract = { workspace = true }
-tree_hash = { workspace = true }
 hex = { workspace = true }
-derivative = { workspace = true }
 lockfile = { workspace = true }
-directory = { workspace = true }
+rand = { workspace = true }
+tree_hash = { workspace = true }
+types = { workspace = true }
 
 [dev-dependencies]
 tempfile = { workspace = true }

common/warp_utils/Cargo.toml

@@ -3,20 +3,19 @@ name = "warp_utils"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = { workspace = true }
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-warp = { workspace = true }
-eth2 = { workspace = true }
-types = { workspace = true }
 beacon_chain = { workspace = true }
-state_processing = { workspace = true }
-safe_arith = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }
-tokio = { workspace = true }
+bytes = { workspace = true }
+eth2 = { workspace = true }
 headers = "0.3.2"
 metrics = { workspace = true }
+safe_arith = { workspace = true }
+serde = { workspace = true }
 serde_array_query = "0.1.0"
-bytes = { workspace = true }
+serde_json = { workspace = true }
+state_processing = { workspace = true }
+tokio = { workspace = true }
+types = { workspace = true }
+warp = { workspace = true }