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

unfork ed25519-dalek #6776

Merged
merged 1 commit into from Nov 8, 2019
Merged

Conversation

@rob-solana
Copy link
Contributor

rob-solana commented Nov 6, 2019

Problem

ed25519-dalek upstream has improved, PartialEq excuse for forking holds no water

Summary of Changes

unfork

Fixes #

@@ -34,7 +34,7 @@ solana-measure = { path = "../measure", version = "0.21.0" }
solana-merkle-tree = { path = "../merkle-tree", version = "0.21.0" }
solana-metrics = { path = "../metrics", version = "0.21.0" }
solana-perf = { path = "../perf", version = "0.21.0" }
solana-ed25519-dalek = "0.2.0"
ed25519-dalek = "0.9"

This comment has been minimized.

Copy link
@garious

garious Nov 6, 2019

Member

Can we jump to 1.0.0-pre.2?

This comment has been minimized.

Copy link
@rob-solana

rob-solana Nov 6, 2019

Author Contributor

if you'd prefer

This comment has been minimized.

Copy link
@rob-solana

rob-solana Nov 6, 2019

Author Contributor

hm. some libra issues:

cd ~/dev/solana &&  cargo test -p solana-sdk -- --nocapture
    Updating crates.io index
error: failed to select a version for `ed25519-dalek`.
    ... required by package `solana_libra_crypto v0.0.1-sol4`
    ... which is depended on by `solana_libra_config v0.0.1-sol4`
    ... which is depended on by `solana_libra_language_e2e_tests v0.0.1-sol4`
    ... which is depended on by `solana-librapay-api v0.21.0 (/home/rwalker/dev/solana/programs/librapay_api)`
    ... which is depended on by `solana-bench-tps v0.21.0 (/home/rwalker/dev/solana/bench-tps)`
    ... which is depended on by `solana-local-cluster v0.21.0 (/home/rwalker/dev/solana/local_cluster)`
versions that meet the requirements `= 1.0.0-pre.1` are: 1.0.0-pre.1

all possible versions conflict with previously selected packages.

  previously selected package `ed25519-dalek v1.0.0-pre.2`
    ... which is depended on by `solana-core v0.21.0 (/home/rwalker/dev/solana/core)`
    ... which is depended on by `solana-archiver v0.21.0 (/home/rwalker/dev/solana/archiver)`

failed to select a version for `ed25519-dalek` which could resolve this conflict

This comment has been minimized.

Copy link
@garious

garious Nov 6, 2019

Member

I guess 1.0.0-pre.1 then... @jackcmay, need non-protocol dependencies out of the main build!

This comment has been minimized.

Copy link
@jackcmay

jackcmay Nov 9, 2019

Contributor

@garious I think this is more related to bench-tps's dependency on both core and libra and depending on a non-semver supported version. I doubt moving non-protocol dependencies out of the tree will help here.

@rob-solana rob-solana changed the title unfork dalek-ed25519 unfork ed25519-dalek Nov 6, 2019
@rob-solana rob-solana force-pushed the rob-solana:unfork-dalek-ed25519 branch 2 times, most recently from 00f2566 to 1f27856 Nov 6, 2019
@rob-solana rob-solana force-pushed the rob-solana:unfork-dalek-ed25519 branch from 1f27856 to 2180a7b Nov 7, 2019
@codecov

This comment has been minimized.

Copy link

codecov bot commented Nov 7, 2019

Codecov Report

Merging #6776 into master will decrease coverage by 5.2%.
The diff coverage is 69%.

@@           Coverage Diff            @@
##           master   #6776     +/-   ##
========================================
- Coverage    67.6%   62.4%   -5.3%     
========================================
  Files         219     219             
  Lines       48910   53031   +4121     
========================================
+ Hits        33109   33116      +7     
- Misses      15801   19915   +4114
@garious

This comment has been minimized.

Copy link
Member

garious commented Nov 7, 2019

:shipit:

@rob-solana rob-solana merged commit b64b54f into solana-labs:master Nov 8, 2019
11 checks passed
11 checks passed
Summary 1 rule matches and 7 potential rules
Details
buildkite/solana Build #14484 passed (59 minutes, 48 seconds)
Details
buildkite/solana/bench Passed (25 minutes, 17 seconds)
Details
buildkite/solana/checks Passed (6 minutes, 34 seconds)
Details
buildkite/solana/coverage Passed (10 minutes, 56 seconds)
Details
buildkite/solana/local-cluster Passed (14 minutes, 46 seconds)
Details
buildkite/solana/pipeline-upload Passed (14 seconds)
Details
buildkite/solana/shellcheck Passed (31 seconds)
Details
buildkite/solana/stable Passed (34 minutes, 20 seconds)
Details
buildkite/solana/stable-perf Passed (8 minutes, 55 seconds)
Details
ci-gate Pull Request accepted for CI pipeline
@rob-solana rob-solana deleted the rob-solana:unfork-dalek-ed25519 branch Nov 8, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.