-
Notifications
You must be signed in to change notification settings - Fork 745
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move dependencies to workspace (#4650)
## Issue Addressed Synchronize dependencies and edition on the workspace `Cargo.toml` ## Proposed Changes with rust-lang/cargo#8415 merged it's now possible to synchronize details on the workspace `Cargo.toml` like the metadata and dependencies. By only having dependencies that are shared between multiple crates aligned on the workspace `Cargo.toml` it's easier to not miss duplicate versions of the same dependency and therefore ease on the compile times. ## Additional Info this PR also removes the no longer required direct dependency of the `serde_derive` crate. should be reviewed after #4639 get's merged. closes #4651 Co-authored-by: Michael Sproul <[email protected]> Co-authored-by: Michael Sproul <[email protected]>
- Loading branch information
3 people
committed
Sep 22, 2023
1 parent
2441a24
commit aa867f0
Showing
87 changed files
with
1,530 additions
and
1,628 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,31 +5,31 @@ authors = [ | |
| "Paul Hauner <[email protected]>", | ||
| "Luke Anderson <[email protected]>", | ||
| ] | ||
| edition = "2021" | ||
| edition = { workspace = true } | ||
|
|
||
| [dependencies] | ||
| bls = { path = "../crypto/bls" } | ||
| clap = "2.33.3" | ||
| types = { path = "../consensus/types" } | ||
| environment = { path = "../lighthouse/environment" } | ||
| eth2_network_config = { path = "../common/eth2_network_config" } | ||
| clap_utils = { path = "../common/clap_utils" } | ||
| directory = { path = "../common/directory" } | ||
| eth2_wallet = { path = "../crypto/eth2_wallet" } | ||
| bls = { workspace = true } | ||
| clap = { workspace = true } | ||
| types = { workspace = true } | ||
| environment = { workspace = true } | ||
| eth2_network_config = { workspace = true } | ||
| clap_utils = { workspace = true } | ||
| directory = { workspace = true } | ||
| eth2_wallet = { workspace = true } | ||
| eth2_wallet_manager = { path = "../common/eth2_wallet_manager" } | ||
| validator_dir = { path = "../common/validator_dir" } | ||
| tokio = { version = "1.14.0", features = ["full"] } | ||
| eth2_keystore = { path = "../crypto/eth2_keystore" } | ||
| account_utils = { path = "../common/account_utils" } | ||
| slashing_protection = { path = "../validator_client/slashing_protection" } | ||
| eth2 = { path = "../common/eth2" } | ||
| safe_arith = { path = "../consensus/safe_arith" } | ||
| slot_clock = { path = "../common/slot_clock" } | ||
| filesystem = { path = "../common/filesystem" } | ||
| sensitive_url = { path = "../common/sensitive_url" } | ||
| serde = { version = "1.0.116", features = ["derive"] } | ||
| serde_json = "1.0.58" | ||
| slog = { version = "2.5.2" } | ||
| 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 } | ||
| sensitive_url = { workspace = true } | ||
| serde = { workspace = true } | ||
| serde_json = { workspace = true } | ||
| slog = { workspace = true } | ||
|
|
||
| [dev-dependencies] | ||
| tempfile = "3.1.0" | ||
| tempfile = { workspace = true } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,7 +5,7 @@ authors = [ | |
| "Paul Hauner <[email protected]>", | ||
| "Age Manning <[email protected]", | ||
| ] | ||
| edition = "2021" | ||
| edition = { workspace = true } | ||
|
|
||
| [lib] | ||
| name = "beacon_node" | ||
|
|
@@ -20,33 +20,30 @@ write_ssz_files = [ | |
| ] # Writes debugging .ssz files to /tmp during block processing. | ||
|
|
||
| [dependencies] | ||
| eth2_config = { path = "../common/eth2_config" } | ||
| beacon_chain = { path = "beacon_chain" } | ||
| types = { path = "../consensus/types" } | ||
| store = { path = "./store" } | ||
| eth2_config = { workspace = true } | ||
| beacon_chain = { workspace = true } | ||
| types = { workspace = true } | ||
| store = { workspace = true } | ||
| client = { path = "client" } | ||
| clap = "2.33.3" | ||
| slog = { version = "2.5.2", features = [ | ||
| "max_level_trace", | ||
| "release_max_level_trace", | ||
| ] } | ||
| dirs = "3.0.1" | ||
| directory = { path = "../common/directory" } | ||
| futures = "0.3.7" | ||
| environment = { path = "../lighthouse/environment" } | ||
| task_executor = { path = "../common/task_executor" } | ||
| genesis = { path = "genesis" } | ||
| eth2_network_config = { path = "../common/eth2_network_config" } | ||
| execution_layer = { path = "execution_layer" } | ||
| lighthouse_network = { path = "./lighthouse_network" } | ||
| serde = "1.0.116" | ||
| clap_utils = { path = "../common/clap_utils" } | ||
| hyper = "0.14.4" | ||
| lighthouse_version = { path = "../common/lighthouse_version" } | ||
| hex = "0.4.2" | ||
| slasher = { path = "../slasher" } | ||
| monitoring_api = { path = "../common/monitoring_api" } | ||
| sensitive_url = { path = "../common/sensitive_url" } | ||
| http_api = { path = "http_api" } | ||
| unused_port = { path = "../common/unused_port" } | ||
| strum = "0.24.1" | ||
| clap = { workspace = true } | ||
| slog = { workspace = true } | ||
| dirs = { workspace = true } | ||
| directory = { workspace = true } | ||
| futures = { workspace = true } | ||
| environment = { workspace = true } | ||
| task_executor = { workspace = true } | ||
| genesis = { workspace = true } | ||
| eth2_network_config = { workspace = true } | ||
| execution_layer = { workspace = true } | ||
| lighthouse_network = { workspace = true } | ||
| serde = { workspace = true } | ||
| clap_utils = { workspace = true } | ||
| hyper = { workspace = true } | ||
| lighthouse_version = { workspace = true } | ||
| hex = { workspace = true } | ||
| slasher = { workspace = true } | ||
| monitoring_api = { workspace = true } | ||
| sensitive_url = { workspace = true } | ||
| http_api = { workspace = true } | ||
| unused_port = { workspace = true } | ||
| strum = { workspace = true } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ | |
| name = "beacon_chain" | ||
| version = "0.2.0" | ||
| authors = ["Paul Hauner <[email protected]>", "Age Manning <[email protected]>"] | ||
| edition = "2021" | ||
| edition = { workspace = true } | ||
| autotests = false # using a single test binary compiles faster | ||
|
|
||
| [features] | ||
|
|
@@ -12,60 +12,59 @@ participation_metrics = [] # Exposes validator participation metrics to Prometh | |
| fork_from_env = [] # Initialise the harness chain spec from the FORK_NAME env variable | ||
|
|
||
| [dev-dependencies] | ||
| maplit = "1.0.2" | ||
| environment = { path = "../../lighthouse/environment" } | ||
| serde_json = "1.0.58" | ||
| maplit = { workspace = true } | ||
| environment = { workspace = true } | ||
| serde_json = { workspace = true } | ||
|
|
||
| [dependencies] | ||
| merkle_proof = { path = "../../consensus/merkle_proof" } | ||
| store = { path = "../store" } | ||
| parking_lot = "0.12.0" | ||
| lazy_static = "1.4.0" | ||
| smallvec = "1.6.1" | ||
| lighthouse_metrics = { path = "../../common/lighthouse_metrics" } | ||
| operation_pool = { path = "../operation_pool" } | ||
| rayon = "1.4.1" | ||
| serde = "1.0.116" | ||
| serde_derive = "1.0.116" | ||
| ethereum_serde_utils = "0.5.0" | ||
| slog = { version = "2.5.2", features = ["max_level_trace"] } | ||
| sloggers = { version = "2.1.1", features = ["json"] } | ||
| slot_clock = { path = "../../common/slot_clock" } | ||
| ethereum_hashing = "1.0.0-beta.2" | ||
| ethereum_ssz = "0.5.0" | ||
| ssz_types = "0.5.3" | ||
| ethereum_ssz_derive = "0.5.0" | ||
| state_processing = { path = "../../consensus/state_processing" } | ||
| tree_hash_derive = "0.5.0" | ||
| tree_hash = "0.5.0" | ||
| types = { path = "../../consensus/types" } | ||
| tokio = "1.14.0" | ||
| tokio-stream = "0.1.3" | ||
| eth1 = { path = "../eth1" } | ||
| futures = "0.3.7" | ||
| genesis = { path = "../genesis" } | ||
| int_to_bytes = { path = "../../consensus/int_to_bytes" } | ||
| rand = "0.8.5" | ||
| proto_array = { path = "../../consensus/proto_array" } | ||
| lru = "0.7.1" | ||
| tempfile = "3.1.0" | ||
| bitvec = "0.20.4" | ||
| bls = { path = "../../crypto/bls" } | ||
| safe_arith = { path = "../../consensus/safe_arith" } | ||
| fork_choice = { path = "../../consensus/fork_choice" } | ||
| task_executor = { path = "../../common/task_executor" } | ||
| derivative = "2.1.1" | ||
| itertools = "0.10.0" | ||
| slasher = { path = "../../slasher" } | ||
| eth2 = { path = "../../common/eth2" } | ||
| strum = { version = "0.24.0", features = ["derive"] } | ||
| logging = { path = "../../common/logging" } | ||
| execution_layer = { path = "../execution_layer" } | ||
| sensitive_url = { path = "../../common/sensitive_url" } | ||
| superstruct = "0.5.0" | ||
| hex = "0.4.2" | ||
| exit-future = "0.2.0" | ||
| oneshot_broadcast = { path = "../../common/oneshot_broadcast" } | ||
| merkle_proof = { workspace = true } | ||
| store = { workspace = true } | ||
| parking_lot = { workspace = true } | ||
| lazy_static = { workspace = true } | ||
| smallvec = { workspace = true } | ||
| lighthouse_metrics = { workspace = true } | ||
| operation_pool = { workspace = true } | ||
| rayon = { workspace = true } | ||
| serde = { workspace = true } | ||
| ethereum_serde_utils = { workspace = true } | ||
| slog = { workspace = true } | ||
| sloggers = { workspace = true } | ||
| slot_clock = { workspace = true } | ||
| ethereum_hashing = { workspace = true } | ||
| ethereum_ssz = { workspace = true } | ||
| ssz_types = { workspace = true } | ||
| ethereum_ssz_derive = { workspace = true } | ||
| state_processing = { workspace = true } | ||
| tree_hash_derive = { workspace = true } | ||
| tree_hash = { workspace = true } | ||
| types = { workspace = true } | ||
| tokio = { workspace = true } | ||
| tokio-stream = { workspace = true } | ||
| eth1 = { workspace = true } | ||
| futures = { workspace = true } | ||
| genesis = { workspace = true } | ||
| int_to_bytes = { workspace = true } | ||
| rand = { workspace = true } | ||
| proto_array = { workspace = true } | ||
| lru = { workspace = true } | ||
| tempfile = { workspace = true } | ||
| bitvec = { workspace = true } | ||
| bls = { workspace = true } | ||
| safe_arith = { workspace = true } | ||
| fork_choice = { workspace = true } | ||
| task_executor = { workspace = true } | ||
| derivative = { workspace = true } | ||
| itertools = { workspace = true } | ||
| slasher = { workspace = true } | ||
| eth2 = { workspace = true } | ||
| strum = { workspace = true } | ||
| logging = { workspace = true } | ||
| execution_layer = { workspace = true } | ||
| sensitive_url = { workspace = true } | ||
| superstruct = { workspace = true } | ||
| hex = { workspace = true } | ||
| exit-future = { workspace = true } | ||
| oneshot_broadcast = { path = "../../common/oneshot_broadcast/" } | ||
|
|
||
| [[test]] | ||
| name = "beacon_chain_tests" | ||
|
|
||
Oops, something went wrong.