Skip to content

Ensure the "workspace.dependencies" table is sorted #97

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.

Sign up for GitHub

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

Merged
jking-aus merged 2 commits into from
Jan 16, 2025
Merged

Ensure the "workspace.dependencies" table is sorted #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1aad41f
Ensure the "workspace.dependencies" table is sorted
dknopik Jan 14, 2025
fe8f333
Merge branch 'unstable' into check-workspace-deps
dknopik Jan 15, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/test-suite.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,6 @@ jobs:
with:
channel: stable
cache-target: release
bins: cargo-sort
bins: cargo-sort, taplo-cli
- name: Run cargo sort to check if Cargo.toml files are sorted
run: cargo sort --check --workspace
run: make sort
123 changes: 63 additions & 60 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,104 +1,107 @@
[workspace]
# Extra tooling projects will be added.
members = [
"anchor",
"anchor/client",
"anchor/common/qbft",
"anchor/common/ssv_types",
"anchor/common/version",
"anchor/database",
"anchor/eth",
"anchor/http_api",
"anchor/http_metrics",
"anchor/network",
"anchor/processor",
"anchor/qbft_manager",
"anchor/signature_collector",
"anchor/validator_store",
"anchor",
"anchor/client",
"anchor/common/qbft",
"anchor/common/ssv_types",
"anchor/common/version",
"anchor/database",
"anchor/eth",
"anchor/http_api",
"anchor/http_metrics",
"anchor/network",
"anchor/processor",
"anchor/qbft_manager",
"anchor/signature_collector",
"anchor/validator_store",
]
resolver = "2"

[workspace.package]
edition = "2021"

# NOTE: The block below is currently not sorted by `cargo sort`. Please keep sorted manually, especially during merges!
# This table has three subsections: first the internal dependencies, then the lighthouse dependencies, then all other.
[workspace.dependencies]
anchor_validator_store = { path = "anchor/validator_store" }
client = { path = "anchor/client" }
database = { path = "anchor/database" }
eth = { path = "anchor/eth" }
http_api = { path = "anchor/http_api" }
http_metrics = { path = "anchor/http_metrics" }
network = { path = "anchor/network" }
processor = { path = "anchor/processor" }
qbft = { path = "anchor/common/qbft" }
qbft_manager = { path = "anchor/qbft_manager" }
signature_collector = { path = "anchor/signature_collector" }
ssv_types = { path = "anchor/common/ssv_types" }
version = { path = "anchor/common/version" }

beacon_node_fallback = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
eth2 = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
eth2_config = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
health_metrics = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
lighthouse_network = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
metrics = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
safe_arith = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
sensitive_url = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
slashing_protection = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
slot_clock = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
task_executor = { git = "https://github.com/sigp/lighthouse", branch = "anchor", default-features = false, features = [
"tracing",
] }
types = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
unused_port = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
validator_metrics = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
validator_services = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
validator_store = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }

alloy = { version = "0.6.4", features = [
"sol-types",
"transports",
"json",
"contract",
"pubsub",
"provider-ws",
"rpc-types",
"rlp",
"sol-types",
"transports",
"json",
"contract",
"pubsub",
"provider-ws",
"rpc-types",
"rlp",
] }
anchor_validator_store = { path = "anchor/validator_store" }
async-channel = "1.9"
axum = "0.7.7"
base64 = "0.22.1"
beacon_node_fallback = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
clap = { version = "4.5.15", features = ["derive", "wrap_help"] }
client = { path = "anchor/client" }
dashmap = "6.1.0"
database = { path = "anchor/database" }
derive_more = { version = "1.0.0", features = ["full"] }
dirs = "5.0.1"
discv5 = "0.9.0"
either = "1.13.0"
eth = { path = "anchor/eth" }
eth2 = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
eth2_config = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
futures = "0.3.30"
health_metrics = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
hex = "0.4.3"
http_api = { path = "anchor/http_api" }
http_metrics = { path = "anchor/http_metrics" }
hyper = "1.4"
indexmap = "2.7.0"
lighthouse_network = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
metrics = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
network = { path = "anchor/network" }
num_cpus = "1"
openssl = "0.10.68"
parking_lot = "0.12"
processor = { path = "anchor/processor" }
qbft = { path = "anchor/common/qbft" }
qbft_manager = { path = "anchor/qbft_manager" }
reqwest = "0.12.12"
rusqlite = "0.28.0"
safe_arith = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
sensitive_url = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
serde = { version = "1.0.208", features = ["derive"] }
signature_collector = { path = "anchor/signature_collector" }
slashing_protection = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
slot_clock = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
ssv_types = { path = "anchor/common/ssv_types" }
strum = { version = "0.24", features = ["derive"] }
task_executor = { git = "https://github.com/sigp/lighthouse", branch = "anchor", default-features = false, features = [
"tracing",
] }
tokio = { version = "1.39.2", features = [
"rt",
"rt-multi-thread",
"time",
"signal",
"macros",
"rt",
"rt-multi-thread",
"time",
"signal",
"macros",
] }
tower-http = { version = "0.6", features = ["cors"] }
tracing = "0.1.40"
tracing-subscriber = { version = "0.3.18", features = ["fmt", "env-filter"] }
tree_hash = "0.8"
tree_hash_derive = "0.8"
types = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
unused_port = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
validator_metrics = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
validator_services = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
validator_store = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
version = { path = "anchor/common/version" }

[profile.maxperf]
inherits = "release"
lto = "fat"

codegen-units = 1
incremental = false
lto = "fat"
6 changes: 6 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,3 +150,9 @@ udeps:
# Performs a `cargo` clean
clean:
cargo clean

# Check if dependencies are sorted (requires cargo-sort and taplo-cli)
sort:
cargo sort --check --workspace
# separate check for root Cargo toml to check workspace dependencies
taplo fmt -o reorder_keys=true -o "indent_string= " Cargo.toml --diff --check
Loading