ark-curves-cherry-picked · arnaucube's git mirror

Format

Pratyush Mishra pratyushmishra@berkeley.edu

Mon, 16 Aug 2021 18:11:57 -0700

commit

6805e05b5003876e226f6fbe62856686d832b3d3

parent

ac58f8f92da0a4a5ae6e9adb3514380ddd2ee1e6

6 files changed, 31 insertions(+), 45 deletions(-)

jump to

bls12_377/src/constraints/curves.rs

curve-constraint-tests/src/lib.rs

mnt4_298/src/constraints/curves.rs

mnt4_753/src/constraints/curves.rs

mnt6_298/src/constraints/curves.rs

mnt6_753/src/constraints/curves.rs

M bls12_377/src/constraints/curves.rs → bls12_377/src/constraints/curves.rs

@@ -16,12 +16,8 @@
 #[test]
 fn test() {
     use ark_ec::models::bls12::Bls12Parameters;
-    ark_curve_constraint_tests::curves::sw_test::<
-        <Parameters as Bls12Parameters>::G1Parameters,
-    >()
-    .unwrap();
-    ark_curve_constraint_tests::curves::sw_test::<
-        <Parameters as Bls12Parameters>::G2Parameters,
-    >()
-    .unwrap();
+    ark_curve_constraint_tests::curves::sw_test::<<Parameters as Bls12Parameters>::G1Parameters>()
+        .unwrap();
+    ark_curve_constraint_tests::curves::sw_test::<<Parameters as Bls12Parameters>::G2Parameters>()
+        .unwrap();
 }

M curve-constraint-tests/src/lib.rs → curve-constraint-tests/src/lib.rs

@@ -231,7 +231,11 @@ }
 }
 
 pub mod curves {
-    use ark_ec::{ModelParameters, ProjectiveCurve, short_weierstrass_jacobian::GroupProjective as SWProjective, twisted_edwards_extended::GroupProjective as TEProjective};
+    use ark_ec::{
+        short_weierstrass_jacobian::GroupProjective as SWProjective,
+        twisted_edwards_extended::GroupProjective as TEProjective, ModelParameters,
+        ProjectiveCurve,
+    };
     use ark_ff::{BitIteratorLE, Field, FpParameters, One, PrimeField};
     use ark_relations::r1cs::{ConstraintSystem, SynthesisError};
     use ark_std::{test_rng, vec::Vec, UniformRand};
@@ -257,10 +261,12 @@
             let mut rng = test_rng();
             let a_native = C::rand(&mut rng);
             let b_native = C::rand(&mut rng);
-            let a = C::Var::new_variable(ark_relations::ns!(cs, "generate_a"), || Ok(a_native), mode)
-                .unwrap();
-            let b = C::Var::new_variable(ark_relations::ns!(cs, "generate_b"), || Ok(b_native), mode)
-                .unwrap();
+            let a =
+                C::Var::new_variable(ark_relations::ns!(cs, "generate_a"), || Ok(a_native), mode)
+                    .unwrap();
+            let b =
+                C::Var::new_variable(ark_relations::ns!(cs, "generate_b"), || Ok(b_native), mode)
+                    .unwrap();
 
             let zero = C::Var::zero();
             assert_eq!(zero.value()?, zero.value()?);

M mnt4_298/src/constraints/curves.rs → mnt4_298/src/constraints/curves.rs

@@ -16,12 +16,8 @@
 #[test]
 fn test() {
     use ark_ec::models::mnt4::MNT4Parameters;
-    ark_curve_constraint_tests::curves::sw_test::<
-        <Parameters as MNT4Parameters>::G1Parameters,
-    >()
-    .unwrap();
-    ark_curve_constraint_tests::curves::sw_test::<
-        <Parameters as MNT4Parameters>::G2Parameters,
-    >()
-    .unwrap();
+    ark_curve_constraint_tests::curves::sw_test::<<Parameters as MNT4Parameters>::G1Parameters>()
+        .unwrap();
+    ark_curve_constraint_tests::curves::sw_test::<<Parameters as MNT4Parameters>::G2Parameters>()
+        .unwrap();
 }

M mnt4_753/src/constraints/curves.rs → mnt4_753/src/constraints/curves.rs

@@ -16,12 +16,8 @@
 #[test]
 fn test() {
     use ark_ec::models::mnt4::MNT4Parameters;
-    ark_curve_constraint_tests::curves::sw_test::<
-        <Parameters as MNT4Parameters>::G1Parameters,
-    >()
-    .unwrap();
-    ark_curve_constraint_tests::curves::sw_test::<
-        <Parameters as MNT4Parameters>::G2Parameters,
-    >()
-    .unwrap();
+    ark_curve_constraint_tests::curves::sw_test::<<Parameters as MNT4Parameters>::G1Parameters>()
+        .unwrap();
+    ark_curve_constraint_tests::curves::sw_test::<<Parameters as MNT4Parameters>::G2Parameters>()
+        .unwrap();
 }

M mnt6_298/src/constraints/curves.rs → mnt6_298/src/constraints/curves.rs

@@ -16,12 +16,8 @@
 #[test]
 fn test() {
     use ark_ec::models::mnt6::MNT6Parameters;
-    ark_curve_constraint_tests::curves::sw_test::<
-        <Parameters as MNT6Parameters>::G1Parameters,
-    >()
-    .unwrap();
-    ark_curve_constraint_tests::curves::sw_test::<
-        <Parameters as MNT6Parameters>::G2Parameters,
-    >()
-    .unwrap();
+    ark_curve_constraint_tests::curves::sw_test::<<Parameters as MNT6Parameters>::G1Parameters>()
+        .unwrap();
+    ark_curve_constraint_tests::curves::sw_test::<<Parameters as MNT6Parameters>::G2Parameters>()
+        .unwrap();
 }

M mnt6_753/src/constraints/curves.rs → mnt6_753/src/constraints/curves.rs

@@ -16,12 +16,8 @@
 #[test]
 fn test() {
     use ark_ec::models::mnt6::MNT6Parameters;
-    ark_curve_constraint_tests::curves::sw_test::<
-        <Parameters as MNT6Parameters>::G1Parameters,
-    >()
-    .unwrap();
-    ark_curve_constraint_tests::curves::sw_test::<
-        <Parameters as MNT6Parameters>::G2Parameters,
-    >()
-    .unwrap();
+    ark_curve_constraint_tests::curves::sw_test::<<Parameters as MNT6Parameters>::G1Parameters>()
+        .unwrap();
+    ark_curve_constraint_tests::curves::sw_test::<<Parameters as MNT6Parameters>::G2Parameters>()
+        .unwrap();
 }