From 6bb15328976647ed7786cf8a827d5f295c6e65f9 Mon Sep 17 00:00:00 2001
From: Pratyush Mishra <pratyushmishra@berkeley.edu>
Date: Mon, 15 Jun 2020 10:24:53 -0700
Subject: [PATCH] Update for latest algebra refactor (#31)

---
 Cargo.toml        |  2 +-
 src/ipa_pc/mod.rs | 44 ++++++++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index d78d02e..a92aaed 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -30,7 +30,7 @@ derivative = { version = "2", features = [ "use_core" ] }
 
 [dev-dependencies]
 rand = { version = "0.7", default-features = false }
-algebra = { git = "https://github.com/scipr-lab/zexe/", default-features = false, features = ["jubjub", "bls12_381", "bls12_377"] }
+algebra = { git = "https://github.com/scipr-lab/zexe/", default-features = false, features = ["ed_on_bls12_381", "bls12_381", "bls12_377"] }
 blake2 = { version = "0.8", default-features = false }
 
 [profile.release]
diff --git a/src/ipa_pc/mod.rs b/src/ipa_pc/mod.rs
index 8a97f41..1e51b65 100644
--- a/src/ipa_pc/mod.rs
+++ b/src/ipa_pc/mod.rs
@@ -1015,91 +1015,95 @@ mod tests {
 
     use super::InnerProductArgPC;
 
-    use algebra::jubjub::JubJubAffine;
+    use algebra::ed_on_bls12_381::EdwardsAffine;
     use blake2::Blake2s;
 
     type PC<E, D> = InnerProductArgPC<E, D>;
-    type PC_JJB2S = PC<JubJubAffine, Blake2s>;
+    type PC_JJB2S = PC<EdwardsAffine, Blake2s>;
 
     #[test]
     fn single_poly_test() {
         use crate::tests::*;
-        single_poly_test::<_, PC_JJB2S>().expect("test failed for jubjub-blake2s");
+        single_poly_test::<_, PC_JJB2S>().expect("test failed for ed_on_bls12_381-blake2s");
     }
 
     #[test]
     fn quadratic_poly_degree_bound_multiple_queries_test() {
         use crate::tests::*;
         quadratic_poly_degree_bound_multiple_queries_test::<_, PC_JJB2S>()
-            .expect("test failed for jubjub-blake2s");
+            .expect("test failed for ed_on_bls12_381-blake2s");
     }
 
     #[test]
     fn linear_poly_degree_bound_test() {
         use crate::tests::*;
-        linear_poly_degree_bound_test::<_, PC_JJB2S>().expect("test failed for jubjub-blake2s");
+        linear_poly_degree_bound_test::<_, PC_JJB2S>()
+            .expect("test failed for ed_on_bls12_381-blake2s");
     }
 
     #[test]
     fn single_poly_degree_bound_test() {
         use crate::tests::*;
-        single_poly_degree_bound_test::<_, PC_JJB2S>().expect("test failed for jubjub-blake2s");
+        single_poly_degree_bound_test::<_, PC_JJB2S>()
+            .expect("test failed for ed_on_bls12_381-blake2s");
     }
 
     #[test]
     fn single_poly_degree_bound_multiple_queries_test() {
         use crate::tests::*;
         single_poly_degree_bound_multiple_queries_test::<_, PC_JJB2S>()
-            .expect("test failed for jubjub-blake2s");
+            .expect("test failed for ed_on_bls12_381-blake2s");
     }
 
     #[test]
     fn two_polys_degree_bound_single_query_test() {
         use crate::tests::*;
         two_polys_degree_bound_single_query_test::<_, PC_JJB2S>()
-            .expect("test failed for jubjub-blake2s");
+            .expect("test failed for ed_on_bls12_381-blake2s");
     }
 
     #[test]
     fn full_end_to_end_test() {
         use crate::tests::*;
-        full_end_to_end_test::<_, PC_JJB2S>().expect("test failed for jubjub-blake2s");
-        println!("Finished jubjub-blake2s");
+        full_end_to_end_test::<_, PC_JJB2S>().expect("test failed for ed_on_bls12_381-blake2s");
+        println!("Finished ed_on_bls12_381-blake2s");
     }
 
     #[test]
     fn single_equation_test() {
         use crate::tests::*;
-        single_equation_test::<_, PC_JJB2S>().expect("test failed for jubjub-blake2s");
-        println!("Finished jubjub-blake2s");
+        single_equation_test::<_, PC_JJB2S>().expect("test failed for ed_on_bls12_381-blake2s");
+        println!("Finished ed_on_bls12_381-blake2s");
     }
 
     #[test]
     fn two_equation_test() {
         use crate::tests::*;
-        two_equation_test::<_, PC_JJB2S>().expect("test failed for jubjub-blake2s");
-        println!("Finished jubjub-blake2s");
+        two_equation_test::<_, PC_JJB2S>().expect("test failed for ed_on_bls12_381-blake2s");
+        println!("Finished ed_on_bls12_381-blake2s");
     }
 
     #[test]
     fn two_equation_degree_bound_test() {
         use crate::tests::*;
-        two_equation_degree_bound_test::<_, PC_JJB2S>().expect("test failed for jubjub-blake2s");
-        println!("Finished jubjub-blake2s");
+        two_equation_degree_bound_test::<_, PC_JJB2S>()
+            .expect("test failed for ed_on_bls12_381-blake2s");
+        println!("Finished ed_on_bls12_381-blake2s");
     }
 
     #[test]
     fn full_end_to_end_equation_test() {
         use crate::tests::*;
-        full_end_to_end_equation_test::<_, PC_JJB2S>().expect("test failed for jubjub-blake2s");
-        println!("Finished jubjub-blake2s");
+        full_end_to_end_equation_test::<_, PC_JJB2S>()
+            .expect("test failed for ed_on_bls12_381-blake2s");
+        println!("Finished ed_on_bls12_381-blake2s");
     }
 
     #[test]
     #[should_panic]
     fn bad_degree_bound_test() {
         use crate::tests::*;
-        bad_degree_bound_test::<_, PC_JJB2S>().expect("test failed for jubjub-blake2s");
-        println!("Finished jubjub-blake2s");
+        bad_degree_bound_test::<_, PC_JJB2S>().expect("test failed for ed_on_bls12_381-blake2s");
+        println!("Finished ed_on_bls12_381-blake2s");
     }
 }
-- 
GitLab