diff --git a/src/plonk/lookup/prover.rs b/src/plonk/lookup/prover.rs index 9025cc3..2ee207d 100644 --- a/src/plonk/lookup/prover.rs +++ b/src/plonk/lookup/prover.rs @@ -344,13 +344,10 @@ impl<'a, C: CurveAffine> Committed<'a, C> { theta: ChallengeTheta, beta: ChallengeBeta, gamma: ChallengeGamma, - ) -> Result< - ( - Constructed, - impl Iterator> + 'a, - ), - Error, - > { + ) -> ( + Constructed, + impl Iterator> + 'a, + ) { let permuted = self.permuted; let expressions = iter::empty() @@ -417,7 +414,7 @@ impl<'a, C: CurveAffine> Committed<'a, C> { * &(permuted.permuted_input_coset.clone() - &permuted.permuted_input_inv_coset), )); - Ok(( + ( Constructed { permuted_input_poly: permuted.permuted_input_poly, permuted_input_blind: permuted.permuted_input_blind, @@ -427,7 +424,7 @@ impl<'a, C: CurveAffine> Committed<'a, C> { product_blind: self.product_blind, }, expressions, - )) + ) } } diff --git a/src/plonk/permutation/prover.rs b/src/plonk/permutation/prover.rs index 5af58e8..fb75a0a 100644 --- a/src/plonk/permutation/prover.rs +++ b/src/plonk/permutation/prover.rs @@ -141,13 +141,10 @@ impl Committed { advice_cosets: &'a [Polynomial], beta: ChallengeBeta, gamma: ChallengeGamma, - ) -> Result< - ( - Constructed, - impl Iterator> + 'a, - ), - Error, - > { + ) -> ( + Constructed, + impl Iterator> + 'a, + ) { let domain = &pk.vk.domain; let expressions = iter::empty() @@ -197,13 +194,13 @@ impl Committed { left - &right })); - Ok(( + ( Constructed { permutation_product_poly: self.permutation_product_poly, permutation_product_blind: self.permutation_product_blind, }, expressions, - )) + ) } } diff --git a/src/plonk/prover.rs b/src/plonk/prover.rs index 3f2db38..a7f1118 100644 --- a/src/plonk/prover.rs +++ b/src/plonk/prover.rs @@ -208,24 +208,24 @@ pub fn create_proof, ConcreteCircuit: Circ // Evaluate the h(X) polynomial's constraint system expressions for the permutation constraints, if any. let (permutations, permutation_expressions): (Vec<_>, Vec<_>) = { - let tmp = permutations + let tmp: Vec<_> = permutations .into_iter() .zip(pk.vk.cs.permutations.iter()) .zip(pk.permutations.iter()) .map(|((p, argument), pkey)| { p.construct(pk, argument, pkey, &advice_cosets, beta, gamma) }) - .collect::, _>>()?; + .collect(); tmp.into_iter().unzip() }; // Evaluate the h(X) polynomial's constraint system expressions for the lookup constraints, if any. let (lookups, lookup_expressions): (Vec<_>, Vec<_>) = { - let tmp = lookups + let tmp: Vec<_> = lookups .into_iter() .map(|p| p.construct(pk, theta, beta, gamma)) - .collect::, _>>()?; + .collect(); tmp.into_iter().unzip() };