Sync with the recent changes in ark-algebra on pairing and testing (#116)

* Fix another typo in the Jubjub curve comment

* fix

* progress

* get_point_from_x_unchecked

* fix

* soft link

* Fix Bandersnatch

* Fix Edwards form of Bandersnatch

* Actually fix ed_on_bls12_381_bandersnatch/src/curves/mod.rs

* fix

* fix

* curve-benches

* fix the last mul_by_a; fmt

Co-authored-by: onewayfunc <onewayfunc@gmail.com>
Co-authored-by: Pratyush Mishra <pratyushmishra@berkeley.edu>

curve-benches/benches/bls12_377.rs

@@ -1,11 +1,12 @@
-use ark_curve_benches::*;
+use ark_algebra_bench_templates::*;
 use ark_std::ops::{AddAssign, MulAssign, SubAssign};
 
 use ark_bls12_377::{
     fq::Fq, fq2::Fq2, fr::Fr, Bls12_377, Fq12, G1Affine, G1Projective as G1, G2Affine,
     G2Projective as G2,
 };
-use ark_ec::{PairingEngine, ProjectiveCurve};
+use ark_ec::bls12::{G1Prepared, G2Prepared};
+use ark_ec::{CurveGroup, Group};
 use ark_ff::{
     biginteger::{BigInteger256 as FrRepr, BigInteger384 as FqRepr},
     BigInteger, Field, PrimeField, UniformRand,

curve-benches/benches/bls12_381.rs

@@ -1,11 +1,12 @@
-use ark_curve_benches::*;
+use ark_algebra_bench_templates::*;
 use ark_std::ops::{AddAssign, MulAssign, SubAssign};
 
 use ark_bls12_381::{
     fq::Fq, fq2::Fq2, fr::Fr, Bls12_381, Fq12, G1Affine, G1Projective as G1, G2Affine,
     G2Projective as G2,
 };
-use ark_ec::{PairingEngine, ProjectiveCurve};
+use ark_ec::bls12::{G1Prepared, G2Prepared};
+use ark_ec::{CurveGroup, Group};
 use ark_ff::{
     biginteger::{BigInteger256 as FrRepr, BigInteger384 as FqRepr},
     BigInteger, Field, PrimeField, UniformRand,

curve-benches/benches/bn254.rs

@@ -1,11 +1,14 @@
-use ark_curve_benches::*;
+use ark_algebra_bench_templates::*;
 use ark_std::ops::{AddAssign, MulAssign, SubAssign};
 
 use ark_bn254::{
     fq::Fq, fq2::Fq2, fr::Fr, Bn254, Fq12, G1Affine, G1Projective as G1, G2Affine,
     G2Projective as G2,
 };
-use ark_ec::{PairingEngine, ProjectiveCurve};
+use ark_ec::{
+    bn::{G1Prepared, G2Prepared},
+    CurveGroup, Group,
+};
 use ark_ff::{biginteger::BigInteger256 as Repr, BigInteger, Field, PrimeField, UniformRand};
 
 mod g1 {

curve-benches/benches/bw6_761.rs

@@ -1,11 +1,14 @@
-use ark_curve_benches::*;
+use ark_algebra_bench_templates::*;
 use ark_std::ops::{AddAssign, MulAssign, SubAssign};
 
 use ark_bw6_761::{
     fq::Fq, fq3::Fq3, fr::Fr, Fq6, G1Affine, G1Projective as G1, G2Affine, G2Projective as G2,
     BW6_761,
 };
-use ark_ec::{PairingEngine, ProjectiveCurve};
+use ark_ec::{
+    bw6::{G1Prepared, G2Prepared},
+    CurveGroup, Group,
+};
 use ark_ff::{
     biginteger::{BigInteger384 as FrRepr, BigInteger768 as FqRepr},
     BigInteger, Field, PrimeField, UniformRand,

curve-benches/benches/cp6_782.rs

@@ -1,11 +1,11 @@
-use ark_curve_benches::*;
+use ark_algebra_bench_templates::*;
 use ark_std::ops::{AddAssign, MulAssign, SubAssign};
 
 use ark_cp6_782::{
-    fq::Fq, fq3::Fq3, fr::Fr, Fq6, G1Affine, G1Projective as G1, G2Affine, G2Projective as G2,
-    CP6_782,
+    fq::Fq, fq3::Fq3, fr::Fr, Fq6, G1Affine, G1Prepared, G1Projective as G1, G2Affine, G2Prepared,
+    G2Projective as G2, CP6_782,
 };
-use ark_ec::{PairingEngine, ProjectiveCurve};
+use ark_ec::{CurveGroup, Group};
 use ark_ff::{
     biginteger::{BigInteger384 as FrRepr, BigInteger832 as FqRepr},
     BigInteger, Field, PrimeField, UniformRand,

curve-benches/benches/ed_on_bls12_381.rs

@@ -1,7 +1,7 @@
-use ark_curve_benches::*;
+use ark_algebra_bench_templates::*;
 use ark_std::ops::{AddAssign, MulAssign, SubAssign};
 
-use ark_ec::ProjectiveCurve;
+use ark_ec::{CurveGroup, Group};
 use ark_ed_on_bls12_381::{fq::Fq, fr::Fr, EdwardsAffine as GAffine, EdwardsProjective as G};
 use ark_ff::{biginteger::BigInteger256 as Repr, BigInteger, Field, PrimeField, UniformRand};
 

curve-benches/benches/mnt4_298.rs

@@ -1,7 +1,10 @@
-use ark_curve_benches::*;
+use ark_algebra_bench_templates::*;
 use ark_std::ops::{AddAssign, MulAssign, SubAssign};
 
-use ark_ec::{PairingEngine, ProjectiveCurve};
+use ark_ec::{
+    mnt4::{G1Prepared, G2Prepared},
+    CurveGroup, Group,
+};
 use ark_ff::{biginteger::BigInteger320 as FqRepr, BigInteger, Field, PrimeField, UniformRand};
 use ark_mnt4_298::{
     fq::Fq, fq2::Fq2, fr::Fr, Fq4, G1Affine, G1Projective as G1, G2Affine, G2Projective as G2,

curve-benches/benches/mnt4_753.rs

@@ -1,7 +1,10 @@
-use ark_curve_benches::*;
+use ark_algebra_bench_templates::*;
 use ark_std::ops::{AddAssign, MulAssign, SubAssign};
 
-use ark_ec::{PairingEngine, ProjectiveCurve};
+use ark_ec::{
+    mnt4::{G1Prepared, G2Prepared},
+    CurveGroup, Group,
+};
 use ark_ff::{biginteger::BigInteger768 as FqRepr, BigInteger, Field, PrimeField, UniformRand};
 use ark_mnt4_753::{
     fq::Fq, fq2::Fq2, fr::Fr, Fq4, G1Affine, G1Projective as G1, G2Affine, G2Projective as G2,

curve-benches/benches/mnt6_298.rs

@@ -1,7 +1,10 @@
-use ark_curve_benches::*;
+use ark_algebra_bench_templates::*;
 use ark_std::ops::{AddAssign, MulAssign, SubAssign};
 
-use ark_ec::{PairingEngine, ProjectiveCurve};
+use ark_ec::{
+    mnt6::{G1Prepared, G2Prepared},
+    CurveGroup, Group,
+};
 use ark_ff::{biginteger::BigInteger320 as FqRepr, BigInteger, Field, PrimeField, UniformRand};
 use ark_mnt6_298::{
     fq::Fq, fq3::Fq3, fr::Fr, Fq6, G1Affine, G1Projective as G1, G2Affine, G2Projective as G2,

curve-benches/benches/mnt6_753.rs

@@ -1,7 +1,10 @@
-use ark_curve_benches::*;
+use ark_algebra_bench_templates::*;
 use ark_std::ops::{AddAssign, MulAssign, SubAssign};
 
-use ark_ec::{PairingEngine, ProjectiveCurve};
+use ark_ec::{
+    mnt6::{G1Prepared, G2Prepared},
+    CurveGroup, Group,
+};
 use ark_ff::{biginteger::BigInteger768 as FqRepr, BigInteger, Field, PrimeField, UniformRand};
 use ark_mnt6_753::{
     fq::Fq, fq3::Fq3, fr::Fr, Fq6, G1Affine, G1Projective as G1, G2Affine, G2Projective as G2,

curve-benches/benches/pallas.rs

@@ -1,7 +1,7 @@
-use ark_curve_benches::*;
+use ark_algebra_bench_templates::*;
 use ark_std::ops::{AddAssign, MulAssign, SubAssign};
 
-use ark_ec::ProjectiveCurve;
+use ark_ec::{CurveGroup, Group};
 use ark_ff::{biginteger::BigInteger256 as Repr, BigInteger, Field, PrimeField, UniformRand};
 use ark_pallas::{fq::Fq, fr::Fr, Affine as GAffine, Projective as G};
 

curve-benches/benches/vesta.rs

@@ -1,7 +1,7 @@
-use ark_curve_benches::*;
+use ark_algebra_bench_templates::*;
 use ark_std::ops::{AddAssign, MulAssign, SubAssign};
 
-use ark_ec::ProjectiveCurve;
+use ark_ec::{CurveGroup, Group};
 use ark_ff::{biginteger::BigInteger256 as Repr, BigInteger, Field, PrimeField, UniformRand};
 use ark_vesta::{fq::Fq, fr::Fr, Affine as GAffine, Projective as G};