Revert "feat: make AffineRepr::xy() more flexible (arkworks-rs#593)"

This reverts commit 0dd47b3.

CHANGELOG.md

@@ -4,8 +4,6 @@
 
 ### Breaking changes
 
-- [\#593](https://github.com/arkworks-rs/algebra/pull/593) (`ark-ec`) Change `AffineRepr::xy()` to return owned values.
-
 ### Features
 
 ### Improvements

ec/src/hashing/curve_maps/wb/mod.rs

@@ -53,10 +53,10 @@ where
                 let y_num = DensePolynomial::from_coefficients_slice(self.y_map_numerator);
                 let y_den = DensePolynomial::from_coefficients_slice(self.y_map_denominator);
 
-                let mut v: [BaseField<Domain>; 2] = [x_den.evaluate(&x), y_den.evaluate(&x)];
+                let mut v: [BaseField<Domain>; 2] = [x_den.evaluate(x), y_den.evaluate(x)];
                 batch_inversion(&mut v);
-                let img_x = x_num.evaluate(&x) * v[0];
-                let img_y = (y_num.evaluate(&x) * y) * v[1];
+                let img_x = x_num.evaluate(x) * v[0];
+                let img_y = (y_num.evaluate(x) * y) * v[1];
                 Ok(Affine::<Codomain>::new_unchecked(img_x, img_y))
             },
             None => Ok(Affine::identity()),

ec/src/lib.rs

@@ -205,15 +205,15 @@ pub trait AffineRepr:
         + MulAssign<Self::ScalarField>; // needed due to https://github.com/rust-lang/rust/issues/69640
 
     /// Returns the x and y coordinates of this affine point.
-    fn xy(&self) -> Option<(Self::BaseField, Self::BaseField)>;
+    fn xy(&self) -> Option<(&Self::BaseField, &Self::BaseField)>;
 
     /// Returns the x coordinate of this affine point.
-    fn x(&self) -> Option<Self::BaseField> {
+    fn x(&self) -> Option<&Self::BaseField> {
         self.xy().map(|(x, _)| x)
     }
 
     /// Returns the y coordinate of this affine point.
-    fn y(&self) -> Option<Self::BaseField> {
+    fn y(&self) -> Option<&Self::BaseField> {
         self.xy().map(|(_, y)| y)
     }
 

ec/src/models/bls12/g2.rs

@@ -57,7 +57,7 @@ impl<P: Bls12Config> From<G2Affine<P>> for G2Prepared<P> {
             ell_coeffs: vec![],
             infinity: true,
         };
-        q.xy().map_or(zero, |(q_x, q_y)| {
+        q.xy().map_or(zero, |(&q_x, &q_y)| {
             let mut ell_coeffs = vec![];
             let mut r = G2HomProjective::<P> {
                 x: q_x,
@@ -133,7 +133,7 @@ impl<P: Bls12Config> G2HomProjective<P> {
     }
 
     fn add_in_place(&mut self, q: &G2Affine<P>) -> EllCoeff<P> {
-        let (qx, qy) = q.xy().unwrap();
+        let (&qx, &qy) = q.xy().unwrap();
         // Formula for line function when working with
         // homogeneous projective coordinates.
         let theta = self.y - &(qy * &self.z);

ec/src/models/bls12/mod.rs

@@ -178,13 +178,13 @@ impl<P: Bls12Config> Bls12<P> {
 
         match P::TWIST_TYPE {
             TwistType::M => {
-                c2.mul_assign_by_fp(&py);
-                c1.mul_assign_by_fp(&px);
+                c2.mul_assign_by_fp(py);
+                c1.mul_assign_by_fp(px);
                 f.mul_by_014(&c0, &c1, &c2);
             },
             TwistType::D => {
-                c0.mul_assign_by_fp(&py);
-                c1.mul_assign_by_fp(&px);
+                c0.mul_assign_by_fp(py);
+                c1.mul_assign_by_fp(px);
                 f.mul_by_034(&c0, &c1, &c2);
             },
         }

ec/src/models/short_weierstrass/affine.rs

@@ -205,8 +205,8 @@ impl<P: SWCurveConfig> AffineRepr for Affine<P> {
     type ScalarField = P::ScalarField;
     type Group = Projective<P>;
 
-    fn xy(&self) -> Option<(Self::BaseField, Self::BaseField)> {
-        (!self.infinity).then(|| (self.x, self.y))
+    fn xy(&self) -> Option<(&Self::BaseField, &Self::BaseField)> {
+        (!self.infinity).then(|| (&self.x, &self.y))
     }
 
     #[inline]

ec/src/models/short_weierstrass/group.rs

@@ -333,7 +333,7 @@ impl<P: SWCurveConfig, T: Borrow<Affine<P>>> AddAssign<T> for Projective<P> {
     /// Using <http://www.hyperelliptic.org/EFD/g1p/auto-shortw-jacobian-0.html#addition-madd-2007-bl>
     fn add_assign(&mut self, other: T) {
         let other = other.borrow();
-        if let Some((other_x, other_y)) = other.xy() {
+        if let Some((&other_x, &other_y)) = other.xy() {
             if self.is_zero() {
                 self.x = other_x;
                 self.y = other_y;
@@ -564,7 +564,7 @@ impl<P: SWCurveConfig, T: Borrow<P::ScalarField>> Mul<T> for Projective<P> {
 impl<P: SWCurveConfig> From<Affine<P>> for Projective<P> {
     #[inline]
     fn from(p: Affine<P>) -> Projective<P> {
-        p.xy().map_or(Projective::zero(), |(x, y)| Self {
+        p.xy().map_or(Projective::zero(), |(&x, &y)| Self {
             x,
             y,
             z: P::BaseField::one(),

ec/src/models/twisted_edwards/affine.rs

@@ -166,8 +166,8 @@ impl<P: TECurveConfig> AffineRepr for Affine<P> {
     type ScalarField = P::ScalarField;
     type Group = Projective<P>;
 
-    fn xy(&self) -> Option<(Self::BaseField, Self::BaseField)> {
-        (!self.is_zero()).then(|| (self.x, self.y))
+    fn xy(&self) -> Option<(&Self::BaseField, &Self::BaseField)> {
+        (!self.is_zero()).then(|| (&self.x, &self.y))
     }
 
     fn generator() -> Self {