[Merged by Bors] - Move dependencies to workspace #4650

jxs · 2023-08-22T22:20:43Z

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

to remove nom warning

on beacon_node and validator_client tests - fix tls test by adding cert and key file

on upstream warp

…ve-to-workspace

…date-deps

…workspace

This reverts commit 281a26e.

…workspace

…ve-to-workspace

bors · 2023-09-22T01:58:58Z

Build failed (retrying...):

release-tests-ubuntu

michaelsproul · 2023-09-22T02:00:36Z

bors r-
bors r+

bors · 2023-09-22T02:00:52Z

Canceled.

## 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 <michael@sigmaprime.io> Co-authored-by: Michael Sproul <micsproul@gmail.com>

michaelsproul · 2023-09-22T02:14:49Z

Ah this is failing because of the web3signer tests and the openssl upgrade. I'll remove it from the current batch and see if I can get it passing by holding back openssl

bors r-

bors · 2023-09-22T02:14:51Z

Canceled.

The previous certs were causing the tests to fail because they used an old encryption algorithm which is no longer supported by our bundled version of openssl.

michaelsproul · 2023-09-22T03:13:13Z

Ok I think I got it to work without holding any deps. I just regenerated the web3signer certs using ./generate.sh. This seems to be enough to make the test pass on my machine. Presumably the new version of openssl defaulted to a more modern non-deprecated algorithm.

paulhauner · 2023-09-22T03:37:07Z

bors r+

## 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 <michael@sigmaprime.io> Co-authored-by: Michael Sproul <micsproul@gmail.com>

bors · 2023-09-22T04:25:21Z

Build failed:

release-tests-windows

paulhauner · 2023-09-22T04:30:39Z

bors retry

## 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 <michael@sigmaprime.io> Co-authored-by: Michael Sproul <micsproul@gmail.com>

bors · 2023-09-22T05:34:35Z

Pull request successfully merged into unstable.

Build succeeded!

The publicly hosted instance of bors-ng is deprecated and will go away soon.

If you want to self-host your own instance, instructions are here.
For more help, visit the forum.

If you want to switch to GitHub's built-in merge queue, visit their help page.

jxs · 2023-09-22T08:21:46Z

Thanks for the help Michael :)

ralexstokes · 2023-09-22T19:50:07Z

beacon_node/execution_layer/Cargo.toml

 builder_client = { path = "../builder_client" }
-fork_choice = { path = "../../consensus/fork_choice" }
+fork_choice = { workspace = true }
 mev-rs = { git = "https://github.com/ralexstokes/mev-rs", rev = "216657016d5c0889b505857c89ae42c7aa2764af" }
 axum = "0.6"
 hyper = "0.14"
 ethereum-consensus = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "e380108" }
 ssz_rs = "0.9.0"


fwiw I've re-exported the ssz_rs prelude to ethereum_consensus::ssz::prelude if you want to drop this dep

## 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 sigp#4639 get's merged. closes sigp#4651 Co-authored-by: Michael Sproul <michael@sigmaprime.io> Co-authored-by: Michael Sproul <micsproul@gmail.com>

Synchronize dependencies and edition on the workspace `Cargo.toml` 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. this PR also removes the no longer required direct dependency of the `serde_derive` crate. should be reviewed after sigp#4639 get's merged. closes sigp#4651 Co-authored-by: Michael Sproul <michael@sigmaprime.io> Co-authored-by: Michael Sproul <micsproul@gmail.com>

jxs added 10 commits August 18, 2023 17:10

update dependencies

5113e7d

switch procinfo for procfs,

21df9d1

to remove nom warning

fix http and metrics flags

b79e881

on beacon_node and validator_client tests - fix tls test by adding cert and key file

fix warp cors to allow all origins

cc53072

on upstream warp

move dependencies to workspace

6c50be3

synchronize edition on the workspace Cargo.toml

499d600

Merge branch 'unstable' of https://github.com/sigp/lighthouse into mo…

683da40

…ve-to-workspace

update Cargo.lock

2013a15

update Cargo.lock

233a580

align rand crate, fix ef-tests

d36e915

jxs force-pushed the move-to-workspace branch from 1c746a8 to d36e915 Compare August 23, 2023 15:52

jxs added 2 commits August 24, 2023 09:33

revert zip update to reduce number of dependencies

281a26e

remove dangling comment

d845917

jxs mentioned this pull request Aug 24, 2023

[Merged by Bors] - update dependencies #4639

Closed

jxs added 9 commits August 24, 2023 09:36

Merge branch 'unstable' of https://github.com/sigp/lighthouse into up…

d211af6

…date-deps

Merge branch 'update-deps' of github.com:jxs/lighthouse into move-to-…

a8046ac

…workspace

revert zip update to reduce number of dependencies

494e4b5

Revert "revert zip update to reduce number of dependencies"

5f5c17a

This reverts commit 281a26e.

update libp2p to latest 0.52.3

b0afd78

re-ignore RUSTSEC-2023-0052

96cf646

Merge branch 'update-deps' of github.com:jxs/lighthouse into move-to-…

baf12d4

…workspace

update deps to fix RUSTSEC-2023-0052

771e547

Merge branch 'unstable' of https://github.com/sigp/lighthouse into mo…

3cac3e7

…ve-to-workspace

jxs force-pushed the move-to-workspace branch from c2887fb to 3cac3e7 Compare August 25, 2023 12:08

jxs added 2 commits August 28, 2023 09:30

Merge branch 'unstable' of https://github.com/sigp/lighthouse into mo…

6ed5319

…ve-to-workspace

fix quickcheck tests

4feecc1

jxs changed the title ~~Move to workspace~~ Move dependencies to workspace Aug 29, 2023

AgeManning added the ready-for-review The code is ready for review label Aug 31, 2023

AgeManning requested review from michaelsproul and jimmygchen August 31, 2023 00:57

michaelsproul added work-in-progress PR is a work-in-progress and removed ready-for-merge This PR is ready to merge. labels Sep 22, 2023

Regenerate web3signer test certs

e684415

The previous certs were causing the tests to fail because they used an old encryption algorithm which is no longer supported by our bundled version of openssl.

michaelsproul added ready-for-merge This PR is ready to merge. and removed work-in-progress PR is a work-in-progress labels Sep 22, 2023

michaelsproul mentioned this pull request Sep 22, 2023

[Merged by Bors] - Ultra Fast Super Slick CI #4755

Closed

paulhauner mentioned this pull request Sep 22, 2023

[Merged by Bors] - Release v4.5.0 #4768

Closed

bors bot changed the title ~~Move dependencies to workspace~~ [Merged by Bors] - Move dependencies to workspace Sep 22, 2023

bors bot closed this Sep 22, 2023

jimmygchen mentioned this pull request Sep 22, 2023

New cargo audit failures on CI (RUSTSEC-2023-0052 & RUSTSEC-2023-0053) #4651

Closed

ralexstokes reviewed Sep 22, 2023

View reviewed changes

jxs mentioned this pull request Sep 23, 2023

disable reqwest default-tls ralexstokes/ethereum-consensus#261

Merged

jimmygchen mentioned this pull request Sep 26, 2023

Merge unstable into deneb-free-blobs #4781

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Merged by Bors] - Move dependencies to workspace #4650

[Merged by Bors] - Move dependencies to workspace #4650

jxs commented Aug 22, 2023 •

edited

Loading

bors bot commented Sep 22, 2023

michaelsproul commented Sep 22, 2023

bors bot commented Sep 22, 2023

michaelsproul commented Sep 22, 2023

bors bot commented Sep 22, 2023

michaelsproul commented Sep 22, 2023

paulhauner commented Sep 22, 2023

bors bot commented Sep 22, 2023

paulhauner commented Sep 22, 2023

bors bot commented Sep 22, 2023

jxs commented Sep 22, 2023

ralexstokes Sep 22, 2023

[Merged by Bors] - Move dependencies to workspace #4650

[Merged by Bors] - Move dependencies to workspace #4650

Conversation

jxs commented Aug 22, 2023 • edited Loading

Issue Addressed

Proposed Changes

Additional Info

bors bot commented Sep 22, 2023

michaelsproul commented Sep 22, 2023

bors bot commented Sep 22, 2023

michaelsproul commented Sep 22, 2023

bors bot commented Sep 22, 2023

michaelsproul commented Sep 22, 2023

paulhauner commented Sep 22, 2023

bors bot commented Sep 22, 2023

paulhauner commented Sep 22, 2023

bors bot commented Sep 22, 2023

jxs commented Sep 22, 2023

ralexstokes Sep 22, 2023

Choose a reason for hiding this comment

jxs commented Aug 22, 2023 •

edited

Loading