Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enforce alphabetically ordered cargo deps #6678

Merged
merged 6 commits into from
Dec 19, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
914 changes: 465 additions & 449 deletions .github/workflows/test-suite.yml

Large diffs are not rendered by default.

49 changes: 32 additions & 17 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ members = [
"beacon_node/builder_client",
"beacon_node/client",
"beacon_node/eth1",
"beacon_node/lighthouse_network",
"beacon_node/lighthouse_network/gossipsub",
"beacon_node/execution_layer",
"beacon_node/http_api",
"beacon_node/http_metrics",
"beacon_node/lighthouse_network",
"beacon_node/lighthouse_network/gossipsub",
"beacon_node/network",
"beacon_node/store",
"beacon_node/timer",
Expand All @@ -30,40 +30,40 @@ members = [
"common/eth2_interop_keypairs",
"common/eth2_network_config",
"common/eth2_wallet_manager",
"common/metrics",
"common/lighthouse_version",
"common/lockfile",
"common/logging",
"common/lru_cache",
"common/malloc_utils",
"common/metrics",
"common/monitoring_api",
"common/oneshot_broadcast",
"common/pretty_reqwest_error",
"common/sensitive_url",
"common/slot_clock",
"common/system_health",
"common/task_executor",
"common/target_check",
"common/task_executor",
"common/test_random_derive",
"common/unused_port",
"common/validator_dir",
"common/warp_utils",
"common/monitoring_api",

"database_manager",

"consensus/int_to_bytes",
"consensus/fixed_bytes",
"consensus/fork_choice",

"consensus/int_to_bytes",
"consensus/proto_array",
"consensus/safe_arith",
"consensus/state_processing",
"consensus/swap_or_not_shuffle",

"crypto/bls",
"crypto/kzg",
"crypto/eth2_key_derivation",
"crypto/eth2_keystore",
"crypto/eth2_wallet",
"crypto/kzg",

"database_manager",

"lcli",

Expand All @@ -78,8 +78,8 @@ members = [
"testing/execution_engine_integration",
"testing/node_test_rig",
"testing/simulator",
"testing/test-test_logger",
"testing/state_transition_vectors",
"testing/test-test_logger",
"testing/web3signer_tests",

"validator_client",
Expand Down Expand Up @@ -126,8 +126,8 @@ delay_map = "0.4"
derivative = "2"
dirs = "3"
either = "1.9"
# TODO: rust_eth_kzg is pinned for now while a perf regression is investigated
# The crate_crypto_* dependencies can be removed from this file completely once we update
# TODO: rust_eth_kzg is pinned for now while a perf regression is investigated
# The crate_crypto_* dependencies can be removed from this file completely once we update
rust_eth_kzg = "=0.5.1"
crate_crypto_internal_eth_kzg_bls12_381 = "=0.5.1"
crate_crypto_internal_eth_kzg_erasure_codes = "=0.5.1"
Expand Down Expand Up @@ -167,7 +167,13 @@ r2d2 = "0.8"
rand = "0.8"
rayon = "1.7"
regex = "1"
reqwest = { version = "0.11", default-features = false, features = ["blocking", "json", "stream", "rustls-tls", "native-tls-vendored"] }
reqwest = { version = "0.11", default-features = false, features = [
"blocking",
"json",
"stream",
"rustls-tls",
"native-tls-vendored",
] }
ring = "0.16"
rpds = "0.11"
rusqlite = { version = "0.28", features = ["bundled"] }
Expand All @@ -176,7 +182,11 @@ serde_json = "1"
serde_repr = "0.1"
serde_yaml = "0.9"
sha2 = "0.9"
slog = { version = "2", features = ["max_level_debug", "release_max_level_debug", "nested-values"] }
slog = { version = "2", features = [
"max_level_debug",
"release_max_level_debug",
"nested-values",
] }
slog-async = "2"
slog-term = "2"
sloggers = { version = "2", features = ["json"] }
Expand All @@ -188,7 +198,12 @@ superstruct = "0.8"
syn = "1"
sysinfo = "0.26"
tempfile = "3"
tokio = { version = "1", features = ["rt-multi-thread", "sync", "signal", "macros"] }
tokio = { version = "1", features = [
"rt-multi-thread",
"sync",
"signal",
"macros",
] }
tokio-stream = { version = "0.1", features = ["sync"] }
tokio-util = { version = "0.7", features = ["codec", "compat", "time"] }
tracing = "0.1.40"
Expand Down Expand Up @@ -267,7 +282,7 @@ validator_dir = { path = "common/validator_dir" }
validator_http_api = { path = "validator_client/http_api" }
validator_http_metrics = { path = "validator_client/http_metrics" }
validator_metrics = { path = "validator_client/validator_metrics" }
validator_store= { path = "validator_client/validator_store" }
validator_store = { path = "validator_client/validator_store" }
warp_utils = { path = "common/warp_utils" }
xdelta3 = { git = "http://github.com/sigp/xdelta3-rs", rev = "50d63cdf1878e5cf3538e9aae5eed34a22c64e4a" }
zstd = "0.13"
Expand Down
22 changes: 11 additions & 11 deletions account_manager/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,25 @@ authors = [
edition = { workspace = true }

[dependencies]
account_utils = { workspace = true }
bls = { workspace = true }
clap = { workspace = true }
types = { workspace = true }
environment = { workspace = true }
eth2_network_config = { workspace = true }
clap_utils = { workspace = true }
directory = { workspace = true }
environment = { workspace = true }
eth2 = { workspace = true }
eth2_keystore = { workspace = true }
eth2_network_config = { workspace = true }
eth2_wallet = { workspace = true }
eth2_wallet_manager = { path = "../common/eth2_wallet_manager" }
validator_dir = { workspace = true }
tokio = { workspace = true }
eth2_keystore = { workspace = true }
account_utils = { workspace = true }
slashing_protection = { workspace = true }
eth2 = { workspace = true }
safe_arith = { workspace = true }
slot_clock = { workspace = true }
filesystem = { workspace = true }
safe_arith = { workspace = true }
sensitive_url = { workspace = true }
slashing_protection = { workspace = true }
slot_clock = { workspace = true }
tokio = { workspace = true }
types = { workspace = true }
validator_dir = { workspace = true }

[dev-dependencies]
tempfile = { workspace = true }
32 changes: 16 additions & 16 deletions beacon_node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,28 +20,28 @@ write_ssz_files = [
] # Writes debugging .ssz files to /tmp during block processing.

[dependencies]
eth2_config = { workspace = true }
account_utils = { workspace = true }
beacon_chain = { workspace = true }
types = { workspace = true }
store = { workspace = true }
client = { path = "client" }
clap = { workspace = true }
slog = { workspace = true }
dirs = { workspace = true }
clap_utils = { workspace = true }
client = { path = "client" }
directory = { workspace = true }
dirs = { workspace = true }
environment = { workspace = true }
task_executor = { workspace = true }
genesis = { workspace = true }
eth2_config = { workspace = true }
execution_layer = { workspace = true }
lighthouse_network = { workspace = true }
serde_json = { workspace = true }
clap_utils = { workspace = true }
hyper = { workspace = true }
genesis = { workspace = true }
hex = { workspace = true }
slasher = { workspace = true }
http_api = { workspace = true }
hyper = { workspace = true }
lighthouse_network = { workspace = true }
monitoring_api = { workspace = true }
sensitive_url = { workspace = true }
http_api = { workspace = true }
unused_port = { workspace = true }
serde_json = { workspace = true }
slasher = { workspace = true }
slog = { workspace = true }
store = { workspace = true }
strum = { workspace = true }
account_utils = { workspace = true }
task_executor = { workspace = true }
types = { workspace = true }
unused_port = { workspace = true }
4 changes: 2 additions & 2 deletions beacon_node/beacon_chain/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ portable = ["bls/supranational-portable"]
test_backfill = []

[dev-dependencies]
criterion = { workspace = true }
maplit = { workspace = true }
serde_json = { workspace = true }
criterion = { workspace = true }

[dependencies]
alloy-primitives = { workspace = true }
Expand All @@ -42,11 +42,11 @@ hex = { workspace = true }
int_to_bytes = { workspace = true }
itertools = { workspace = true }
kzg = { workspace = true }
metrics = { workspace = true }
lighthouse_version = { workspace = true }
logging = { workspace = true }
lru = { workspace = true }
merkle_proof = { workspace = true }
metrics = { workspace = true }
oneshot_broadcast = { path = "../../common/oneshot_broadcast/" }
operation_pool = { workspace = true }
parking_lot = { workspace = true }
Expand Down
22 changes: 11 additions & 11 deletions beacon_node/beacon_processor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@ version = "0.1.0"
edition = { workspace = true }

[dependencies]
slog = { workspace = true }
itertools = { workspace = true }
logging = { workspace = true }
tokio = { workspace = true }
tokio-util = { workspace = true }
futures = { workspace = true }
fnv = { workspace = true }
strum = { workspace = true }
task_executor = { workspace = true }
slot_clock = { workspace = true }
futures = { workspace = true }
itertools = { workspace = true }
lighthouse_network = { workspace = true }
types = { workspace = true }
logging = { workspace = true }
metrics = { workspace = true }
parking_lot = { workspace = true }
num_cpus = { workspace = true }
parking_lot = { workspace = true }
serde = { workspace = true }
slog = { workspace = true }
slot_clock = { workspace = true }
strum = { workspace = true }
task_executor = { workspace = true }
tokio = { workspace = true }
tokio-util = { workspace = true }
types = { workspace = true }

[dev-dependencies]
tokio = { workspace = true, features = ["test-util"] }
4 changes: 2 additions & 2 deletions beacon_node/builder_client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ edition = { workspace = true }
authors = ["Sean Anderson <sean@sigmaprime.io>"]

[dependencies]
eth2 = { workspace = true }
lighthouse_version = { workspace = true }
reqwest = { workspace = true }
sensitive_url = { workspace = true }
eth2 = { workspace = true }
serde = { workspace = true }
lighthouse_version = { workspace = true }
48 changes: 24 additions & 24 deletions beacon_node/client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,41 +5,41 @@ authors = ["Sigma Prime <contact@sigmaprime.io>"]
edition = { workspace = true }

[dev-dependencies]
operation_pool = { workspace = true }
serde_yaml = { workspace = true }
state_processing = { workspace = true }
operation_pool = { workspace = true }
tokio = { workspace = true }

[dependencies]
beacon_chain = { workspace = true }
store = { workspace = true }
network = { workspace = true }
timer = { path = "../timer" }
lighthouse_network = { workspace = true }
types = { workspace = true }
eth2_config = { workspace = true }
slot_clock = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
slog = { workspace = true }
tokio = { workspace = true }
futures = { workspace = true }
beacon_processor = { workspace = true }
directory = { workspace = true }
dirs = { workspace = true }
environment = { workspace = true }
eth1 = { workspace = true }
eth2 = { workspace = true }
kzg = { workspace = true }
sensitive_url = { workspace = true }
eth2_config = { workspace = true }
ethereum_ssz = { workspace = true }
execution_layer = { workspace = true }
futures = { workspace = true }
genesis = { workspace = true }
task_executor = { workspace = true }
environment = { workspace = true }
metrics = { workspace = true }
time = "0.3.5"
directory = { workspace = true }
http_api = { workspace = true }
http_metrics = { path = "../http_metrics" }
kzg = { workspace = true }
lighthouse_network = { workspace = true }
metrics = { workspace = true }
monitoring_api = { workspace = true }
network = { workspace = true }
sensitive_url = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
slasher = { workspace = true }
slasher_service = { path = "../../slasher/service" }
monitoring_api = { workspace = true }
execution_layer = { workspace = true }
beacon_processor = { workspace = true }
ethereum_ssz = { workspace = true }
slog = { workspace = true }
slot_clock = { workspace = true }
store = { workspace = true }
task_executor = { workspace = true }
time = "0.3.5"
timer = { path = "../timer" }
tokio = { workspace = true }
types = { workspace = true }
24 changes: 12 additions & 12 deletions beacon_node/eth1/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,27 @@ authors = ["Paul Hauner <paul@paulhauner.com>"]
edition = { workspace = true }

[dev-dependencies]
environment = { workspace = true }
eth1_test_rig = { workspace = true }
serde_yaml = { workspace = true }
sloggers = { workspace = true }
environment = { workspace = true }

[dependencies]
eth2 = { workspace = true }
ethereum_ssz = { workspace = true }
ethereum_ssz_derive = { workspace = true }
execution_layer = { workspace = true }
futures = { workspace = true }
serde = { workspace = true }
types = { workspace = true }
logging = { workspace = true }
merkle_proof = { workspace = true }
ethereum_ssz = { workspace = true }
ethereum_ssz_derive = { workspace = true }
tree_hash = { workspace = true }
metrics = { workspace = true }
parking_lot = { workspace = true }
sensitive_url = { workspace = true }
serde = { workspace = true }
slog = { workspace = true }
logging = { workspace = true }
superstruct = { workspace = true }
tokio = { workspace = true }
state_processing = { workspace = true }
metrics = { workspace = true }
superstruct = { workspace = true }
task_executor = { workspace = true }
eth2 = { workspace = true }
sensitive_url = { workspace = true }
tokio = { workspace = true }
tree_hash = { workspace = true }
types = { workspace = true }
Loading
Loading