Apply suggestions from code review

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

src/ipa_pc/mod.rs

@@ -1035,28 +1035,28 @@ mod tests {
 
     use super::InnerProductArgPC;
     use ark_ec::AffineCurve;
-    use ark_ed_on_bls12_381::EdwardsAffine;
+    use ark_ed_on_bls12_381::{EdwardsAffine, Fr};
     use ark_ff::UniformRand;
     use ark_poly::{univariate::DensePolynomial as DensePoly, UVPolynomial};
     use blake2::Blake2s;
 
-    type UniPoly = DensePoly<<EdwardsAffine as AffineCurve>::ScalarField>;
+    type UniPoly = DensePoly<ark_ed_on_bls12_381::Fr>;
     type PC<E, D, P> = InnerProductArgPC<E, D, P>;
     type PC_JJB2S = PC<EdwardsAffine, Blake2s, UniPoly>;
 
-    fn rand_poly<A: AffineCurve>(
+    fn rand_poly<F: PrimeField>(
         degree: usize,
         _: Option<usize>,
         rng: &mut rand::prelude::StdRng,
-    ) -> DensePoly<A::ScalarField> {
-        DensePoly::<A::ScalarField>::rand(degree, rng)
+    ) -> DensePoly<F> {
+        DensePoly::rand(degree, rng)
     }
 
-    fn rand_point<A: AffineCurve>(
+    fn rand_point<F: Field>(
         _: Option<usize>,
         rng: &mut rand::prelude::StdRng,
-    ) -> A::ScalarField {
-        A::ScalarField::rand(rng)
+    ) -> F {
+        F::rand(rng)
     }
 
     #[test]
@@ -1064,8 +1064,8 @@ mod tests {
         use crate::tests::*;
         single_poly_test::<_, _, PC_JJB2S>(
             None,
-            rand_poly::<EdwardsAffine>,
-            rand_point::<EdwardsAffine>,
+            rand_poly::<Fr>,
+            rand_point::<Fr>,
         )
         .expect("test failed for ed_on_bls12_381-blake2s");
     }
@@ -1074,8 +1074,8 @@ mod tests {
     fn quadratic_poly_degree_bound_multiple_queries_test() {
         use crate::tests::*;
         quadratic_poly_degree_bound_multiple_queries_test::<_, _, PC_JJB2S>(
-            rand_poly::<EdwardsAffine>,
-            rand_point::<EdwardsAffine>,
+            rand_poly::<Fr>,
+            rand_point::<Fr>,
         )
         .expect("test failed for ed_on_bls12_381-blake2s");
     }
@@ -1084,8 +1084,8 @@ mod tests {
     fn linear_poly_degree_bound_test() {
         use crate::tests::*;
         linear_poly_degree_bound_test::<_, _, PC_JJB2S>(
-            rand_poly::<EdwardsAffine>,
-            rand_point::<EdwardsAffine>,
+            rand_poly::<Fr>,
+            rand_point::<Fr>,
         )
         .expect("test failed for ed_on_bls12_381-blake2s");
     }
@@ -1094,8 +1094,8 @@ mod tests {
     fn single_poly_degree_bound_test() {
         use crate::tests::*;
         single_poly_degree_bound_test::<_, _, PC_JJB2S>(
-            rand_poly::<EdwardsAffine>,
-            rand_point::<EdwardsAffine>,
+            rand_poly::<Fr>,
+            rand_point::<Fr>,
         )
         .expect("test failed for ed_on_bls12_381-blake2s");
     }
@@ -1104,8 +1104,8 @@ mod tests {
     fn single_poly_degree_bound_multiple_queries_test() {
         use crate::tests::*;
         single_poly_degree_bound_multiple_queries_test::<_, _, PC_JJB2S>(
-            rand_poly::<EdwardsAffine>,
-            rand_point::<EdwardsAffine>,
+            rand_poly::<Fr>,
+            rand_point::<Fr>,
         )
         .expect("test failed for ed_on_bls12_381-blake2s");
     }
@@ -1114,8 +1114,8 @@ mod tests {
     fn two_polys_degree_bound_single_query_test() {
         use crate::tests::*;
         two_polys_degree_bound_single_query_test::<_, _, PC_JJB2S>(
-            rand_poly::<EdwardsAffine>,
-            rand_point::<EdwardsAffine>,
+            rand_poly::<Fr>,
+            rand_point::<Fr>,
         )
         .expect("test failed for ed_on_bls12_381-blake2s");
     }

src/kzg10/data_structures.rs

@@ -212,7 +212,7 @@ impl<E: PairingEngine> PreparedCommitment<E> {
     PartialEq(bound = ""),
     Eq(bound = "")
 )]
-pub struct Randomness<E: PairingEngine, P: UVPolynomial<E::Fr>> {
+pub struct Randomness<F: PrimeField, P: UVPolynomial<F>> {
     /// For KZG10, the commitment randomness is a random polynomial.
     pub blinding_polynomial: P,
     _engine: PhantomData<E>,