diff --git a/src/curve/curve_multiplication.rs b/src/curve/curve_multiplication.rs index 83c444d8..eb5bade1 100644 --- a/src/curve/curve_multiplication.rs +++ b/src/curve/curve_multiplication.rs @@ -1,7 +1,6 @@ use std::ops::Mul; -use crate::curve::curve_summation::affine_multisummation_batch_inversion; -use crate::curve::curve_types::{AffinePoint, Curve, CurveScalar, ProjectivePoint}; +use crate::curve::curve_types::{Curve, CurveScalar, ProjectivePoint}; use crate::field::field_types::Field; const WINDOW_BITS: usize = 4; diff --git a/src/curve/curve_summation.rs b/src/curve/curve_summation.rs index 8f347eda..c67bc026 100644 --- a/src/curve/curve_summation.rs +++ b/src/curve/curve_summation.rs @@ -152,7 +152,7 @@ pub fn affine_multisummation_batch_inversion( // This is the doubling case. let mut numerator = x1.square().triple(); if C::A.is_nonzero() { - numerator = numerator + C::A; + numerator += C::A; } let quotient = numerator * inverse; let x3 = quotient.square() - x1.double(); diff --git a/src/curve/curve_types.rs b/src/curve/curve_types.rs index c9a04ab2..ef1f6186 100644 --- a/src/curve/curve_types.rs +++ b/src/curve/curve_types.rs @@ -183,7 +183,7 @@ impl ProjectivePoint { let zz = z.square(); let mut w = xx.triple(); if C::A.is_nonzero() { - w = w + C::A * zz; + w += C::A * zz; } let s = y.double() * z; let r = y * s; diff --git a/src/gadgets/curve.rs b/src/gadgets/curve.rs index e5602c5f..f7c5eaaf 100644 --- a/src/gadgets/curve.rs +++ b/src/gadgets/curve.rs @@ -134,7 +134,7 @@ impl, const D: usize> CircuitBuilder { ) -> AffinePointTarget { let one = self.constant_nonnative(C::BaseField::ONE); - let bits = self.split_nonnative_to_bits(&n); + let bits = self.split_nonnative_to_bits(n); let bits_as_base: Vec> = bits.iter().map(|b| self.bool_to_nonnative(b)).collect(); @@ -173,9 +173,8 @@ impl, const D: usize> CircuitBuilder { } } +#[cfg(test)] mod tests { - use std::ops::{Mul, Neg}; - use anyhow::Result; use crate::curve::curve_types::{AffinePoint, Curve, CurveScalar}; diff --git a/src/gadgets/nonnative.rs b/src/gadgets/nonnative.rs index 9ee50f3a..56d717e3 100644 --- a/src/gadgets/nonnative.rs +++ b/src/gadgets/nonnative.rs @@ -1,6 +1,6 @@ use std::marker::PhantomData; -use num::{BigUint, One, Zero}; +use num::{BigUint, Zero}; use crate::field::field_types::RichField; use crate::field::{extension_field::Extendable, field_types::Field}; @@ -115,7 +115,7 @@ impl, const D: usize> CircuitBuilder { _phantom: PhantomData, }); - let product = self.mul_nonnative(&x, &inv); + let product = self.mul_nonnative(x, &inv); let one = self.constant_nonnative(FF::ONE); self.connect_nonnative(&product, &one);