Update workspace and dependency paths
Pratyush Mishra pratyushmishra@berkeley.edu
Fri, 18 Sep 2020 16:01:05 -0700
5 files changed,
13 insertions(+),
69 deletions(-)
M
.github/workflows/ci.yml
→
.github/workflows/ci.yml
@@ -84,10 +84,7 @@ with:
command: test args: "--all \ --all-features \ - --exclude cp-benches \ - --exclude algebra-benches \ - --exclude ff-fft-benches \ - -- --skip dpc --skip integration_test" + --exclude cp-benches " check_no_std: name: Check no_std@@ -118,53 +115,11 @@ ~/.cargo/git
target key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} - - name: algebra-core - run: | - cd algebra-core - cargo build -p algebra-core --no-default-features --target thumbv6m-none-eabi - cargo check --examples -p algebra-core --no-default-features --target thumbv6m-none-eabi - cd .. - - - name: algebra - run: | - cd algebra - cargo build -p algebra --no-default-features --target thumbv6m-none-eabi - cargo check --examples -p algebra --no-default-features --target thumbv6m-none-eabi - cd .. - - - name: r1cs-core - run: | - cd r1cs-core - cargo build -p r1cs-core --no-default-features --target thumbv6m-none-eabi - cargo check --examples -p r1cs-core --no-default-features --target thumbv6m-none-eabi - cd .. - - name: r1cs-std run: | cd r1cs-std cargo build -p r1cs-std --no-default-features --target aarch64-unknown-none cargo check --examples -p r1cs-std --no-default-features --target aarch64-unknown-none - cd .. - - - name: ff-fft - run: | - cd ff-fft - cargo build -p ff-fft --no-default-features --target thumbv6m-none-eabi - cargo check --examples -p ff-fft --no-default-features --target thumbv6m-none-eabi - cd .. - - - name: groth16 - run: | - cd groth16 - cargo build -p groth16 --no-default-features --target thumbv6m-none-eabi - cargo check --examples -p groth16 --no-default-features --target thumbv6m-none-eabi - cd .. - - - name: gm17 - run: | - cd gm17 - cargo build -p gm17 --no-default-features --target thumbv6m-none-eabi - cargo check --examples -p gm17 --no-default-features --target thumbv6m-none-eabi cd .. - name: crypto-primitives
M
Cargo.toml
→
Cargo.toml
@@ -1,20 +1,9 @@
[workspace] members = [ - "algebra-core", - "algebra", - "algebra-benches", - "bench-utils", "cp-benches", "crypto-primitives", - "dpc", - "ff-fft", - "ff-fft-benches", - "gm17", - "groth16", - "r1cs-core", "r1cs-std", - "algebra-core/algebra-core-derive", ] [profile.release]
M
cp-benches/Cargo.toml
→
cp-benches/Cargo.toml
@@ -22,7 +22,7 @@
################################# Dependencies ################################ [dev-dependencies] -algebra = { path = "../algebra", default-features = false, features = [ "ed_on_bls12_377" ] } +algebra = { git = "https://github.com/scipr-lab/zexe/", default-features = false, features = [ "ed_on_bls12_377" ] } blake2 = { version = "0.8", default-features = false } criterion = "0.3.1" crypto-primitives = { path = "../crypto-primitives" }@@ -49,4 +49,4 @@
[[bench]] name = "schnorr_sig" path = "benches/crypto_primitives/signature.rs" -harness = false+harness = false
M
crypto-primitives/Cargo.toml
→
crypto-primitives/Cargo.toml
@@ -22,17 +22,17 @@
################################# Dependencies ################################ [dependencies] -algebra-core = { path = "../algebra-core", default-features = false } -bench-utils = { path = "../bench-utils" } +algebra-core = { git = "https://github.com/scipr-lab/zexe", default-features = false } +bench-utils = { git = "https://github.com/scipr-lab/zexe" } blake2 = { version = "0.8", default-features = false } digest = "0.8" -ff-fft = { path = "../ff-fft", default-features = false } -gm17 = { path = "../gm17", optional = true, default-features = false } -groth16 = { path = "../groth16", optional = true, default-features = false } +ff-fft = { git = "https://github.com/scipr-lab/zexe", default-features = false } +gm17 = { git = "https://github.com/scipr-lab/zexe", optional = true, default-features = false } +groth16 = { git = "https://github.com/scipr-lab/zexe", optional = true, default-features = false } -r1cs-core = { path = "../r1cs-core", optional = true, default-features = false } +r1cs-core = { git = "https://github.com/scipr-lab/zexe", optional = true, default-features = false } r1cs-std = { path = "../r1cs-std", optional = true, default-features = false } rand = { version = "0.7", default-features = false }@@ -47,6 +47,6 @@ std = [ "algebra-core/std", "r1cs-core/std", "r1cs-std/std"]
parallel = ["std", "rayon", "gm17/parallel", "groth16/parallel", "ff-fft/parallel"] [dev-dependencies] -algebra = { path = "../algebra", default-features = false, features = [ "ed_on_bls12_381", "bls12_377", "mnt4_298", "mnt6_298" ] } +algebra = { git = "https://github.com/scipr-lab/zexe", default-features = false, features = [ "ed_on_bls12_381", "bls12_377", "mnt4_298", "mnt6_298" ] } r1cs-std = { path = "../r1cs-std", default-features = false, features = [ "ed_on_bls12_381", "bls12_377", "mnt4_298", "mnt6_298" ] } rand_xorshift = { version = "0.2" }
M
r1cs-std/Cargo.toml
→
r1cs-std/Cargo.toml
@@ -22,8 +22,8 @@
################################# Dependencies ################################ [dependencies] -algebra = { path = "../algebra", default-features = false } -r1cs-core = { path = "../r1cs-core", default-features = false } +algebra = { git = "https://github.com/scipr-lab/zexe", default-features = false } +r1cs-core = { git = "https://github.com/scipr-lab/zexe", default-features = false } derivative = { version = "2", features = ["use_core"] } tracing = { version = "0.1", default-features = false, features = [ "attributes" ] }@@ -32,7 +32,7 @@ rand = { version = "0.7", default-features = false }
rand_xorshift = { version = "0.2" } # Currently this means that all downstream users of `r1cs-std` will be using # `algebra` with the `bls12_381` feature. This is because of a cargo bug. -algebra = { path = "../algebra", default-features = false, features = [ "bls12_381" ] } +algebra = { git = "https://github.com/scipr-lab/zexe", default-features = false, features = [ "bls12_381" ] } [features] default = ["std"]