Rename to ed_on

r1cs-std/Cargo.toml

@@ -36,15 +36,15 @@ algebra = { path = "../algebra", default-features = false, features = [ "bls12_3
 [features]
 default = ["std"]
 full = [ 
-  "bls12_377", "edwards_on_bls12_381", "edwards_on_bls12_377", "edwards_on_cp6_782", 
-  "edwards_on_bw6_761", "mnt4_298", "mnt4_753", "mnt6_298", "mnt6_753" 
+  "bls12_377", "ed_on_bls12_381", "ed_on_bls12_377", "ed_on_cp6_782", 
+  "ed_on_bw6_761", "mnt4_298", "mnt4_753", "mnt6_298", "mnt6_753" 
 ]
 
 bls12_377 = [ "algebra/bls12_377" ]
-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" ]
-edwards_on_bw6_761 = [ "algebra/edwards_on_bw6_761", "algebra/edwards_on_cp6_782" ]
+ed_on_bls12_381 = [ "algebra/ed_on_bls12_381" ]
+ed_on_bls12_377 = [ "algebra/ed_on_bls12_377" ]
+ed_on_cp6_782 = [ "algebra/ed_on_cp6_782" ]
+ed_on_bw6_761 = [ "algebra/ed_on_bw6_761", "algebra/ed_on_cp6_782" ]
 mnt4_298 = [ "algebra/mnt4_298" ]
 mnt4_753 = [ "algebra/mnt4_753" ]
 mnt6_298 = [ "algebra/mnt6_298" ]

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

@@ -1,7 +1,7 @@
 use crate::groups::curves::twisted_edwards::AffineGadget;
-use algebra::edwards_on_cp6_782::*;
+use algebra::ed_on_bls12_377::*;
 
-use crate::edwards_on_cp6_782::FqGadget;
+use crate::ed_on_bls12_377::FqGadget;
 
 pub type EdwardsGadget = AffineGadget<EdwardsParameters, Fq, FqGadget>;
 

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

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

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

@@ -1,7 +1,7 @@
 use crate::groups::curves::twisted_edwards::AffineGadget;
-use algebra::edwards_on_bls12_381::*;
+use algebra::ed_on_bls12_381::*;
 
-use crate::edwards_on_bls12_381::FqGadget;
+use crate::ed_on_bls12_381::FqGadget;
 
 pub type EdwardsGadget = AffineGadget<EdwardsParameters, Fq, FqGadget>;
 

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

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

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

@@ -1,7 +1,7 @@
 use crate::groups::curves::twisted_edwards::AffineGadget;
-use algebra::edwards_on_bls12_377::*;
+use algebra::ed_on_cp6_782::*;
 
-use crate::edwards_on_bls12_377::FqGadget;
+use crate::ed_on_cp6_782::FqGadget;
 
 pub type EdwardsGadget = AffineGadget<EdwardsParameters, Fq, FqGadget>;
 

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

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

r1cs-std/src/instantiated/ed_on_bw6_761/mod.rs

@@ -0,0 +1 @@
+pub use crate::instantiated::ed_on_cp6_782::*;

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

@@ -1,7 +1,7 @@
 use crate::groups::curves::twisted_edwards::AffineGadget;
-use algebra::edwards_on_cp6_782::*;
+use algebra::ed_on_cp6_782::*;
 
-use crate::instantiated::edwards_on_cp6_782::FqGadget;
+use crate::instantiated::ed_on_cp6_782::FqGadget;
 
 pub type EdwardsGadget = AffineGadget<EdwardsParameters, Fq, FqGadget>;
 

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

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

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

@@ -1,8 +0,0 @@
-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_bw6_761/mod.rs

@@ -1 +0,0 @@
-pub use crate::instantiated::edwards_on_cp6_782::*;

r1cs-std/src/instantiated/mod.rs

@@ -1,20 +1,20 @@
 #[cfg(feature = "bls12_377")]
 pub mod bls12_377;
 
-#[cfg(feature = "edwards_on_bls12_377")]
-pub mod edwards_on_bls12_377;
+#[cfg(feature = "ed_on_bls12_377")]
+pub mod ed_on_bls12_377;
 
-#[cfg(feature = "edwards_on_cp6_782")]
-pub mod edwards_on_cp6_782;
+#[cfg(feature = "ed_on_cp6_782")]
+pub mod ed_on_cp6_782;
 
-#[cfg(all(not(feature = "edwards_on_cp6_782"), feature = "edwards_on_bw6_761"))]
-pub(crate) mod edwards_on_cp6_782;
+#[cfg(all(not(feature = "ed_on_cp6_782"), feature = "ed_on_bw6_761"))]
+pub(crate) mod ed_on_cp6_782;
 
-#[cfg(feature = "edwards_on_bw6_761")]
-pub mod edwards_on_bw6_761;
+#[cfg(feature = "ed_on_bw6_761")]
+pub mod ed_on_bw6_761;
 
-#[cfg(feature = "edwards_on_bls12_381")]
-pub mod edwards_on_bls12_381;
+#[cfg(feature = "ed_on_bls12_381")]
+pub mod ed_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_on_bls12_377")]
-pub use instantiated::edwards_on_bls12_377;
+#[cfg(feature = "ed_on_bls12_377")]
+pub use instantiated::ed_on_bls12_377;
 
-#[cfg(feature = "edwards_on_cp6_782")]
-pub use instantiated::edwards_on_cp6_782;
+#[cfg(feature = "ed_on_cp6_782")]
+pub use instantiated::ed_on_cp6_782;
 
-#[cfg(feature = "edwards_on_bls12_381")]
-pub use instantiated::edwards_on_bls12_381;
+#[cfg(feature = "ed_on_bls12_381")]
+pub use instantiated::ed_on_bls12_381;
 
 #[cfg(feature = "mnt4_298")]
 pub use instantiated::mnt4_298;