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.

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

Jump to bottom

[Merged by Bors] - Update external deps #1711

Closed
wants to merge 2 commits into from
Closed

[Merged by Bors] - Update external deps #1711

wants to merge 2 commits into from

Conversation

paulhauner
Copy link
Member

@paulhauner paulhauner commented Oct 3, 2020 •
edited
Loading

Issue Addressed

Proposed Changes

Updates dependencies across the workspace. Any crate that was not able to be brought to the latest version is listed in #1712.

Additional Info

NA

@paulhauner paulhauner added the A0 label Oct 3, 2020
@paulhauner paulhauner changed the base branch from master to v0.3.0-staging October 3, 2020 03:22
@paulhauner paulhauner changed the base branch from v0.3.0-staging to master October 3, 2020 03:25
@paulhauner paulhauner changed the base branch from master to v0.3.0-staging October 3, 2020 03:25
@paulhauner paulhauner added the ready-for-review The code is ready for review label Oct 3, 2020
realbigsean
realbigsean reviewed Oct 4, 2020
View reviewed changes
Copy link
Member

@realbigsean realbigsean left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just had one comment (in a few places) on the tree_hash dependency. Looks like it went from using a relative path (to version 0.1.1) to now using what's on crates.io (0.1.0). Not sure if this was unintentional.

beacon_node/http_api/Cargo.toml Outdated
@@ -30,5 +30,5 @@ slot_clock = { path = "../../common/slot_clock" }
[dev-dependencies]
store = { path = "../store" }
environment = { path = "../../lighthouse/environment" }
tree_hash = { path = "../../consensus/tree_hash" }
discv5 = { version = "0.1.0-alpha.10", features = ["libp2p"] }
tree_hash = "0.1.0"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like the tree_hash in the code base is 0.1.1, not sure what the difference here is though.

common/validator_dir/Cargo.toml Outdated
rayon = "1.3.0"
tree_hash = { path = "../../consensus/tree_hash" }
rayon = "1.4.1"
tree_hash = "0.1.0"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above

consensus/fork_choice/Cargo.toml Outdated

[dev-dependencies]
state_processing = { path = "../../consensus/state_processing" }
beacon_chain = { path = "../../beacon_node/beacon_chain" }
store = { path = "../../beacon_node/store" }
tree_hash = { path = "../../consensus/tree_hash" }
tree_hash = "0.1.0"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above

validator_client/slashing_protection/Cargo.toml Outdated
rusqlite = { version = "0.23.1", features = ["bundled"] }
r2d2 = "0.8.8"
r2d2_sqlite = "0.16.0"
tree_hash = "0.1.0"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same

@AgeManning
Copy link
Member

tree_hash is patched in the global workspace. I do recall there being a necessity for the patch, but am not sure why we can't just reference by path everywhere and be consistent?

@paulhauner
Copy link
Member Author

I do recall there being a necessity for the patch, but am not sure why we can't just reference by path everywhere and be consistent?

You can't publish on crates.io with a local path reference.

@paulhauner
Copy link
Member Author

bors r+

bors bot pushed a commit that referenced this pull request Oct 5, 2020
@paulhauner
Update external deps (#1711)
1adad33 
## Issue Addressed

- Resolves #1706 

## Proposed Changes

Updates dependencies across the workspace. Any crate that was not able to be brought to the latest version is listed in #1712.

## Additional Info

NA
@bors
Copy link

bors bot commented Oct 5, 2020

Canceled.

@paulhauner
Copy link
Member Author

bors r+

bors bot pushed a commit that referenced this pull request Oct 5, 2020
@paulhauner
Update external deps (#1711)
ee7c8a0 
## Issue Addressed

- Resolves #1706 

## Proposed Changes

Updates dependencies across the workspace. Any crate that was not able to be brought to the latest version is listed in #1712.

## Additional Info

NA
@bors
Copy link

bors bot commented Oct 5, 2020

Pull request successfully merged into v0.3.0-staging.

Build succeeded:

@bors bors bot changed the title Update external deps [Merged by Bors] - Update external deps Oct 5, 2020
@bors bors bot closed this Oct 5, 2020
@paulhauner paulhauner mentioned this pull request Oct 5, 2020
Closed
@AgeManning AgeManning deleted the update-deps-3.0 branch January 7, 2021 02:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@realbigsean realbigsean realbigsean left review comments

@AgeManning AgeManning AgeManning approved these changes

Assignees
No one assigned
Labels
ready-for-review The code is ready for review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Update deps
3 participants
@paulhauner @AgeManning @realbigsean