Rename curves

r1cs-std/Cargo.toml

@@ -35,12 +35,12 @@ algebra = { path = "../algebra", default-features = false, features = [ "bls12_3
 
 [features]
 default = ["std"]
-full = [ "bls12_377", "jubjub", "edwards_bls12", "edwards_sw6", "mnt4_298", "mnt4_753", "mnt6_298", "mnt6_753" ]
+full = [ "bls12_377", "edwards_on_bls12_381", "edwards_on_bls12_377", "edwards_on_cp6_782", "mnt4_298", "mnt4_753", "mnt6_298", "mnt6_753" ]
 
 bls12_377 = [ "algebra/bls12_377" ]
-jubjub = [ "algebra/jubjub" ]
-edwards_bls12 = [ "algebra/edwards_bls12" ]
-edwards_sw6 = [ "algebra/edwards_sw6" ]
+edwards_on_bls12_381 = [ "algebra/edwards_on_bls12_381" ]
+edwards_on_bls12_377 = [ "algebra/edwards_on_bls12_377" ]
+edwards_on_cp6_782 = [ "algebra/edwards_on_cp6_782" ]
 mnt4_298 = [ "algebra/mnt4_298" ]
 mnt4_753 = [ "algebra/mnt4_753" ]
 mnt6_298 = [ "algebra/mnt6_298" ]

r1cs-std/src/instantiated/edwards_bls12/curves.rs

@@ -1,11 +0,0 @@
-use crate::groups::curves::twisted_edwards::AffineGadget;
-use algebra::edwards_bls12::*;
-
-use crate::edwards_bls12::FqGadget;
-
-pub type EdwardsBlsGadget = AffineGadget<EdwardsParameters, Fq, FqGadget>;
-
-#[test]
-fn test() {
-    crate::groups::curves::twisted_edwards::test::<_, EdwardsParameters, EdwardsBlsGadget>();
-}

r1cs-std/src/instantiated/edwards_on_bls12_377/curves.rs

@@ -0,0 +1,11 @@
+use crate::groups::curves::twisted_edwards::AffineGadget;
+use algebra::edwards_on_bls12_377::*;
+
+use crate::edwards_on_bls12_377::FqGadget;
+
+pub type EdwardsGadget = AffineGadget<EdwardsParameters, Fq, FqGadget>;
+
+#[test]
+fn test() {
+    crate::groups::curves::twisted_edwards::test::<_, EdwardsParameters, EdwardsGadget>();
+}

r1cs-std/src/instantiated/edwards_on_bls12_377/fields.rs

@@ -1,5 +1,5 @@
 use crate::fields::fp::FpGadget;
-use algebra::edwards_sw6::fq::Fq;
+use algebra::edwards_on_bls12_377::fq::Fq;
 
 pub type FqGadget = FpGadget<Fq>;
 

r1cs-std/src/instantiated/edwards_on_bls12_381/curves.rs

@@ -0,0 +1,11 @@
+use crate::groups::curves::twisted_edwards::AffineGadget;
+use algebra::edwards_on_bls12_381::*;
+
+use crate::edwards_on_bls12_381::FqGadget;
+
+pub type EdwardsGadget = AffineGadget<EdwardsParameters, Fq, FqGadget>;
+
+#[test]
+fn test() {
+    crate::groups::curves::twisted_edwards::test::<Fq, _, EdwardsGadget>();
+}

r1cs-std/src/instantiated/edwards_on_bls12_381/fields.rs

@@ -0,0 +1,8 @@
+use crate::fields::fp::FpGadget;
+
+pub type FqGadget = FpGadget<algebra::edwards_on_bls12_381::Fq>;
+
+#[test]
+fn test() {
+    crate::fields::tests::field_test::<_, algebra::edwards_on_bls12_381::Fq, FqGadget>();
+}

r1cs-std/src/instantiated/edwards_on_cp6_782/curves.rs

@@ -0,0 +1,11 @@
+use crate::groups::curves::twisted_edwards::AffineGadget;
+use algebra::edwards_on_cp6_782::*;
+
+use crate::edwards_on_cp6_782::FqGadget;
+
+pub type EdwardsGadget = AffineGadget<EdwardsParameters, Fq, FqGadget>;
+
+#[test]
+fn test() {
+    crate::groups::curves::twisted_edwards::test::<_, EdwardsParameters, EdwardsGadget>();
+}

r1cs-std/src/instantiated/edwards_on_cp6_782/fields.rs

@@ -1,5 +1,5 @@
 use crate::fields::fp::FpGadget;
-use algebra::edwards_bls12::fq::Fq;
+use algebra::edwards_on_cp6_782::fq::Fq;
 
 pub type FqGadget = FpGadget<Fq>;
 

r1cs-std/src/instantiated/edwards_sw6/curves.rs

@@ -1,11 +0,0 @@
-use crate::groups::curves::twisted_edwards::AffineGadget;
-use algebra::edwards_sw6::*;
-
-use crate::edwards_sw6::FqGadget;
-
-pub type EdwardsSWGadget = AffineGadget<EdwardsParameters, Fq, FqGadget>;
-
-#[test]
-fn test() {
-    crate::groups::curves::twisted_edwards::test::<_, EdwardsParameters, EdwardsSWGadget>();
-}

r1cs-std/src/instantiated/jubjub/curves.rs

@@ -1,11 +0,0 @@
-use crate::groups::curves::twisted_edwards::AffineGadget;
-use algebra::jubjub::*;
-
-use crate::jubjub::FqGadget;
-
-pub type JubJubGadget = AffineGadget<JubJubParameters, Fq, FqGadget>;
-
-#[test]
-fn test() {
-    crate::groups::curves::twisted_edwards::test::<Fq, _, JubJubGadget>();
-}

r1cs-std/src/instantiated/jubjub/fields.rs

@@ -1,8 +0,0 @@
-use crate::fields::fp::FpGadget;
-
-pub type FqGadget = FpGadget<algebra::jubjub::Fq>;
-
-#[test]
-fn test() {
-    crate::fields::tests::field_test::<_, algebra::jubjub::Fq, FqGadget>();
-}

r1cs-std/src/instantiated/mod.rs

@@ -1,14 +1,14 @@
 #[cfg(feature = "bls12_377")]
 pub mod bls12_377;
 
-#[cfg(feature = "edwards_bls12")]
-pub mod edwards_bls12;
+#[cfg(feature = "edwards_on_bls12_377")]
+pub mod edwards_on_bls12_377;
 
-#[cfg(feature = "edwards_sw6")]
-pub mod edwards_sw6;
+#[cfg(feature = "edwards_on_cp6_782")]
+pub mod edwards_on_cp6_782;
 
-#[cfg(feature = "jubjub")]
-pub mod jubjub;
+#[cfg(feature = "edwards_on_bls12_381")]
+pub mod edwards_on_bls12_381;
 
 #[cfg(feature = "mnt4_298")]
 pub mod mnt4_298;

r1cs-std/src/lib.rs

@@ -48,14 +48,14 @@ mod instantiated;
 #[cfg(feature = "bls12_377")]
 pub use instantiated::bls12_377;
 
-#[cfg(feature = "edwards_bls12")]
-pub use instantiated::edwards_bls12;
+#[cfg(feature = "edwards_on_bls12_377")]
+pub use instantiated::edwards_on_bls12_377;
 
-#[cfg(feature = "edwards_sw6")]
-pub use instantiated::edwards_sw6;
+#[cfg(feature = "edwards_on_cp6_782")]
+pub use instantiated::edwards_on_cp6_782;
 
-#[cfg(feature = "jubjub")]
-pub use instantiated::jubjub;
+#[cfg(feature = "edwards_on_bls12_381")]
+pub use instantiated::edwards_on_bls12_381;
 
 #[cfg(feature = "mnt4_298")]
 pub use instantiated::mnt4_298;

r1cs-std/src/test_constraint_system.rs

@@ -132,7 +132,10 @@ impl<ConstraintF: Field> TestConstraintSystem<ConstraintF> {
 
 fn compute_path(ns: &[String], this: String) -> String {
     if this.chars().any(|a| a == '/') {
-        panic!(format!("'/' is not allowed in namespace names. Error in namespace name: {:?}", this));
+        panic!(format!(
+            "'/' is not allowed in namespace names. Error in namespace name: {:?}",
+            this
+        ));
     }
 
     let mut name = String::new();