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

Migrate to ff and group crates #46

Merged
merged 69 commits into from
Feb 26, 2019
Merged

Migrate to ff and group crates #46

merged 69 commits into from
Feb 26, 2019

Conversation

str4d
Copy link
Contributor

@str4d str4d commented Nov 10, 2018

ebfull and others added 30 commits June 25, 2017 23:09
This reduces the differences in the generated code between the current
implementations of Fq and Fr in pairing, and their derived versions.
This further reduces the difference between pairing's manual and derived
implementations.
Update dependencies and traits
@str4d
Copy link
Contributor Author

str4d commented Jan 6, 2019

Force-pushed to rebuild this PR on top of current master (taking into account #39 and #30). I also pulled the ff and group crates into the workspace at @ebfull's request.

@ebfull
Copy link
Collaborator

ebfull commented Jan 7, 2019

ACK!

@str4d
Copy link
Contributor Author

str4d commented Jan 23, 2019

Note to reviewers: most of the commits in this PR are only here because we pulled in the history of ff and group. Suggested review strategy:

@bitcartel bitcartel self-assigned this Jan 24, 2019
@bitcartel
Copy link
Contributor

bitcartel commented Jan 30, 2019

cargo test reports:

test circuit::sprout::test_sprout_constraints ... ok

failures:

---- circuit::uint32::test::test_uint32_shr stdout ----
thread 'circuit::uint32::test::test_uint32_shr' panicked at 'attempt to shift right with overflow', sapling-crypto/src/circuit/uint32.rs:659:42
note: Run with `RUST_BACKTRACE=1` for a backtrace.


failures:
    circuit::uint32::test::test_uint32_shr

test result: FAILED. 86 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out

@str4d
Copy link
Contributor Author

str4d commented Jan 30, 2019

@bitcartel that is #52, not caused by this PR. cargo test --release should pass.

@Eirik0
Copy link
Contributor

Eirik0 commented Feb 1, 2019

Not sure if it's just me but I am getting the error: Commits that don’t share a common merge base with the base branch are not supported. When I try to look commit by commit.

@str4d
Copy link
Contributor Author

str4d commented Feb 1, 2019

@Eirik0 That's because this PR uses git subtree to import the history of the ff and group crates (per @ebfull's request), meaning that almost all of the commits in the PR are from a different history, and thus don't share a common merge base with the base branch.

@Eirik0
Copy link
Contributor

Eirik0 commented Feb 1, 2019

Got it. Thank you!

This was referenced Feb 18, 2019
Copy link
Contributor

@Eirik0 Eirik0 left a comment

Choose a reason for hiding this comment

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

ACK. I reviewed the two PRs referenced by @str4d and ensured that group and ff match the repositories that those are coming from. LGTM.

@str4d str4d merged commit c57a31e into zcash:master Feb 26, 2019
@str4d str4d deleted the ff-traits branch February 26, 2019 20:41
ebfull pushed a commit to ebfull/librustzcash that referenced this pull request Mar 4, 2020
Migrate to ff and group crates
ebfull added a commit to ebfull/librustzcash that referenced this pull request Mar 4, 2020
2279da4 Merge pull request zcash#38 from debris/docs
2e57190 Remove documentation entry from Cargo.toml
346d540 bellman 0.2.0
8d79665 Merge pull request zcash#93 from defuse/qed-it-lrz
f50079f Crate docs
701cb2b Update READMEs
ccf1ee9 CI: Check intra-doc links
ddd390a Add READMEs to Cargo.toml files
54d3122 Add missing cs.is_satisfied() to bellman test
52bf23c Fix build warnings
581ad35 boolean: adds tests for alloc_conditionally
0403396 blake2s: adds test vectors from go-jubjub
9f24e47 Fix blake2s test data length assertion.
42d5b3b Add blake2s test vectors for varying sizes from go-jubjub
b2597de pedersen_hash: removes debug prints
c903fad pedersen hashes: example of size limit bug
bc697c1 bellman: Fix compile errors without multicore feature
a4e5df9 Upgrade to hex-literal 0.2
c063509 Migrate bellman to crossbeam 0.7
1775843 Take self directly in into_* functions
614d784 Rename into_ -> to_ where &self is used.
08664b1 Address various clippy warnings/errors in bellman
bb11ef2 cargo fmt
cff2e2f cargo fix --edition-idioms for bellman
dc2a280 Add edition = 2018
1a2bc19 cargo fmt
ad37878 cargo fix --edition for bellman
e73d1a2 cargo fmt bellman
dfb86fc Move generic circuit gadgets into bellman
9b3d766 Migrate to rand 0.7
055280f Migrate ff, group, pairing, and bellman to rand 0.6
533d586 Migrate bellman to rand 0.5
bfa9aaf Merge pull request zcash#61 from rex4539/fix-typos
3dd8490 Place bellman multicore operations behind a (default) feature flag
955e679 Merge pull request zcash#46 from str4d/ff-traits
d4ddaa9 Fix typos
12f93f2 Add ff and group crates to Cargo workspace
2e35a32 Update sapling-crypto crate to use ff crate
2019e63 Update workspace after pulling in external crates

git-subtree-dir: bellman
git-subtree-split: 2279da4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants