Use elliptic_curve::CurveGroup (#1262)

daxpedda · web-flow · commit 87f34c257f14 · 2025-06-14T07:32:32.000-06:00
diff --git a/ed448-goldilocks/src/curve/edwards/extended.rs b/ed448-goldilocks/src/curve/edwards/extended.rs
@@ -11,10 +11,10 @@ use crate::curve::twedwards::extended::ExtendedPoint as TwistedExtendedPoint;
 use crate::field::{FieldElement, Scalar};
 use crate::*;
 use elliptic_curve::{
-    Error,
+    CurveGroup, Error,
     array::{Array, typenum::Unsigned},
     consts::{U28, U84},
-    group::{Curve, Group, GroupEncoding, cofactor::CofactorGroup, prime::PrimeGroup},
+    group::{Group, GroupEncoding, cofactor::CofactorGroup, prime::PrimeGroup},
     hash2curve::{ExpandMsg, ExpandMsgXof, Expander, FromOkm},
     ops::LinearCombination,
     point::NonIdentity,
@@ -512,7 +512,7 @@ impl<const N: usize> LinearCombination<[(EdwardsPoint, Scalar); N]> for EdwardsP
 
 impl LinearCombination<[(EdwardsPoint, Scalar)]> for EdwardsPoint {}
 
-impl Curve for EdwardsPoint {
+impl CurveGroup for EdwardsPoint {
     type AffineRepr = AffinePoint;
 
     fn to_affine(&self) -> AffinePoint {
diff --git a/ed448-goldilocks/src/decaf/ops.rs b/ed448-goldilocks/src/decaf/ops.rs
@@ -4,7 +4,7 @@ use core::{
     iter::Sum,
     ops::{Add, AddAssign, Mul, MulAssign, Neg, Sub, SubAssign},
 };
-use elliptic_curve::group::Curve;
+use elliptic_curve::CurveGroup;
 
 use super::DecafPoint;
 
diff --git a/ed448-goldilocks/src/decaf/points.rs b/ed448-goldilocks/src/decaf/points.rs
@@ -4,10 +4,10 @@ use crate::field::FieldElement;
 use crate::*;
 
 use elliptic_curve::{
-    Error, Group,
+    CurveGroup, Error, Group,
     array::{Array, typenum::Unsigned},
     consts::{U32, U56, U84},
-    group::{Curve, GroupEncoding, cofactor::CofactorGroup, prime::PrimeGroup},
+    group::{GroupEncoding, cofactor::CofactorGroup, prime::PrimeGroup},
     hash2curve::{ExpandMsg, Expander, FromOkm},
     ops::LinearCombination,
     point::NonIdentity,
@@ -237,7 +237,7 @@ impl<const N: usize> LinearCombination<[(DecafPoint, Scalar); N]> for DecafPoint
 
 impl LinearCombination<[(DecafPoint, Scalar)]> for DecafPoint {}
 
-impl Curve for DecafPoint {
+impl CurveGroup for DecafPoint {
     type AffineRepr = DecafAffinePoint;
 
     fn to_affine(&self) -> Self::AffineRepr {
diff --git a/k256/src/arithmetic/projective.rs b/k256/src/arithmetic/projective.rs
@@ -9,9 +9,9 @@ use core::{
     ops::{Add, AddAssign, Neg, Sub, SubAssign},
 };
 use elliptic_curve::{
-    BatchNormalize, Error, Result,
+    BatchNormalize, CurveGroup, Error, Result,
     group::{
-        Curve, Group, GroupEncoding,
+        Group, GroupEncoding,
         ff::Field,
         prime::{PrimeCurve, PrimeCurveAffine, PrimeGroup},
     },
@@ -257,10 +257,10 @@ impl From<AffinePoint> for ProjectivePoint {
 }
 
 impl<const N: usize> BatchNormalize<[ProjectivePoint; N]> for ProjectivePoint {
-    type Output = [<Self as Curve>::AffineRepr; N];
+    type Output = [<Self as CurveGroup>::AffineRepr; N];
 
     #[inline]
-    fn batch_normalize(points: &[Self; N]) -> [<Self as Curve>::AffineRepr; N] {
+    fn batch_normalize(points: &[Self; N]) -> [<Self as CurveGroup>::AffineRepr; N] {
         let zs = [FieldElement::ONE; N];
         let mut affine_points = [AffinePoint::IDENTITY; N];
         batch_normalize_generic(points, zs, &mut affine_points);
@@ -270,10 +270,10 @@ impl<const N: usize> BatchNormalize<[ProjectivePoint; N]> for ProjectivePoint {
 
 #[cfg(feature = "alloc")]
 impl BatchNormalize<[ProjectivePoint]> for ProjectivePoint {
-    type Output = Vec<<Self as Curve>::AffineRepr>;
+    type Output = Vec<<Self as CurveGroup>::AffineRepr>;
 
     #[inline]
-    fn batch_normalize(points: &[Self]) -> Vec<<Self as Curve>::AffineRepr> {
+    fn batch_normalize(points: &[Self]) -> Vec<<Self as CurveGroup>::AffineRepr> {
         let zs = vec![FieldElement::ONE; points.len()];
         let mut affine_points = vec![AffinePoint::IDENTITY; points.len()];
         batch_normalize_generic(points, zs, &mut affine_points);
@@ -454,7 +454,7 @@ impl GroupEncoding for ProjectivePoint {
 
 impl PrimeGroup for ProjectivePoint {}
 
-impl Curve for ProjectivePoint {
+impl CurveGroup for ProjectivePoint {
     type AffineRepr = AffinePoint;
 
     fn to_affine(&self) -> AffinePoint {
@@ -698,9 +698,9 @@ mod tests {
         Scalar,
         test_vectors::group::{ADD_TEST_VECTORS, MUL_TEST_VECTORS},
     };
-    use elliptic_curve::Field;
+    use elliptic_curve::BatchNormalize;
     use elliptic_curve::group::{ff::PrimeField, prime::PrimeCurveAffine};
-    use elliptic_curve::{BatchNormalize, group};
+    use elliptic_curve::{CurveGroup, Field};
     use rand_core::{OsRng, TryRngCore};
 
     #[cfg(feature = "alloc")]
@@ -737,7 +737,7 @@ mod tests {
             expected
         );
 
-        <ProjectivePoint as group::Curve>::batch_normalize(&[g, h], &mut res);
+        <ProjectivePoint as CurveGroup>::batch_normalize(&[g, h], &mut res);
         assert_eq!(res, expected);
 
         let mut res = [AffinePoint::IDENTITY; 3];
@@ -753,7 +753,7 @@ mod tests {
             expected
         );
 
-        <ProjectivePoint as group::Curve>::batch_normalize(
+        <ProjectivePoint as CurveGroup>::batch_normalize(
             &[g, ProjectivePoint::IDENTITY, non_normalized_identity],
             &mut res,
         );
@@ -774,7 +774,7 @@ mod tests {
             <ProjectivePoint as BatchNormalize<_>>::batch_normalize(scalars.as_slice());
         assert_eq!(res, expected);
 
-        <ProjectivePoint as group::Curve>::batch_normalize(&[g, h], res.as_mut());
+        <ProjectivePoint as CurveGroup>::batch_normalize(&[g, h], res.as_mut());
         assert_eq!(res.to_vec(), expected);
 
         let expected = vec![g.to_affine(), AffinePoint::IDENTITY];
@@ -783,7 +783,7 @@ mod tests {
 
         assert_eq!(res, expected);
 
-        <ProjectivePoint as group::Curve>::batch_normalize(
+        <ProjectivePoint as CurveGroup>::batch_normalize(
             &[g, ProjectivePoint::IDENTITY],
             res.as_mut(),
         );
diff --git a/primeorder/src/projective.rs b/primeorder/src/projective.rs
@@ -9,11 +9,12 @@ use core::{
     ops::{Add, AddAssign, Mul, MulAssign, Neg, Sub, SubAssign},
 };
 use elliptic_curve::{
-    BatchNormalize, Error, FieldBytes, FieldBytesSize, PrimeField, PublicKey, Result, Scalar,
+    BatchNormalize, CurveGroup, Error, FieldBytes, FieldBytesSize, PrimeField, PublicKey, Result,
+    Scalar,
     array::ArraySize,
     bigint::ArrayEncoding,
     group::{
-        Curve, Group, GroupEncoding,
+        Group, GroupEncoding,
         prime::{PrimeCurve, PrimeGroup},
     },
     ops::{BatchInvert, LinearCombination},
@@ -308,7 +309,7 @@ where
     }
 }
 
-impl<C> Curve for ProjectivePoint<C>
+impl<C> CurveGroup for ProjectivePoint<C>
 where
     Self: Double,
     C: PrimeCurveParams,
@@ -333,10 +334,10 @@ where
     Self: Double,
     C: PrimeCurveParams,
 {
-    type Output = [<Self as Curve>::AffineRepr; N];
+    type Output = [<Self as CurveGroup>::AffineRepr; N];
 
     #[inline]
-    fn batch_normalize(points: &[Self; N]) -> [<Self as Curve>::AffineRepr; N] {
+    fn batch_normalize(points: &[Self; N]) -> [<Self as CurveGroup>::AffineRepr; N] {
         let zs = [C::FieldElement::ONE; N];
         let mut affine_points = [C::AffinePoint::IDENTITY; N];
         batch_normalize_generic(points, zs, &mut affine_points);
@@ -350,10 +351,10 @@ where
     Self: Double,
     C: PrimeCurveParams,
 {
-    type Output = Vec<<Self as Curve>::AffineRepr>;
+    type Output = Vec<<Self as CurveGroup>::AffineRepr>;
 
     #[inline]
-    fn batch_normalize(points: &[Self]) -> Vec<<Self as Curve>::AffineRepr> {
+    fn batch_normalize(points: &[Self]) -> Vec<<Self as CurveGroup>::AffineRepr> {
         let mut zs = vec![C::FieldElement::ONE; points.len()];
         let mut affine_points = vec![AffinePoint::IDENTITY; points.len()];
         batch_normalize_generic(points, zs.as_mut_slice(), &mut affine_points);
