Add CurveError

crates/starknet-types-core/src/curve/affine_point.rs

@@ -1,14 +1,15 @@
+use crate::curve::curve_errors::CurveError;
 use crate::felt::Felt;
 use lambdaworks_math::cyclic_group::IsGroup;
 use lambdaworks_math::elliptic_curve::short_weierstrass::curves::stark_curve::StarkCurve;
 use lambdaworks_math::elliptic_curve::short_weierstrass::point::ShortWeierstrassProjectivePoint;
-use lambdaworks_math::elliptic_curve::traits::{EllipticCurveError, FromAffine};
+use lambdaworks_math::elliptic_curve::traits::FromAffine;
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct AffinePoint(pub(crate) ShortWeierstrassProjectivePoint<StarkCurve>);
 
 impl AffinePoint {
-    pub fn new(x: Felt, y: Felt) -> Result<AffinePoint, EllipticCurveError> {
+    pub fn new(x: Felt, y: Felt) -> Result<AffinePoint, CurveError> {
         Ok(Self(ShortWeierstrassProjectivePoint::from_affine(
             x.0, y.0,
         )?))

crates/starknet-types-core/src/curve/curve_errors.rs

@@ -0,0 +1,13 @@
+use core::fmt::Debug;
+use lambdaworks_math::elliptic_curve::traits::EllipticCurveError;
+
+#[derive(Debug, PartialEq, Eq)]
+pub enum CurveError {
+    EllipticCurveError(EllipticCurveError),
+}
+
+impl From<EllipticCurveError> for CurveError {
+    fn from(error: EllipticCurveError) -> CurveError {
+        CurveError::EllipticCurveError(error)
+    }
+}

crates/starknet-types-core/src/curve/mod.rs

@@ -1,2 +1,3 @@
 pub mod affine_point;
+pub mod curve_errors;
 pub mod projective_point;

crates/starknet-types-core/src/curve/projective_point.rs

@@ -1,13 +1,13 @@
+use crate::curve::affine_point::AffinePoint;
+use crate::curve::curve_errors::CurveError;
 use crate::felt::Felt;
 use core::ops;
 use lambdaworks_math::cyclic_group::IsGroup;
 use lambdaworks_math::elliptic_curve::short_weierstrass::curves::stark_curve::StarkCurve;
 use lambdaworks_math::elliptic_curve::short_weierstrass::point::ShortWeierstrassProjectivePoint;
+use lambdaworks_math::elliptic_curve::traits::EllipticCurveError::InvalidPoint;
 use lambdaworks_math::unsigned_integer::traits::IsUnsignedInteger;
 
-use crate::curve::affine_point::AffinePoint;
-use lambdaworks_math::elliptic_curve::traits::EllipticCurveError;
-
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct ProjectivePoint(pub(crate) ShortWeierstrassProjectivePoint<StarkCurve>);
 
@@ -23,9 +23,9 @@ impl ProjectivePoint {
     /// Creates the same point in affine coordinates. That is,
     /// returns [x / z: y / z: 1] where `self` is [x: y: z].
     /// Panics if `self` is the point at infinity.
-    pub fn to_affine(&self) -> Result<AffinePoint, EllipticCurveError> {
+    pub fn to_affine(&self) -> Result<AffinePoint, CurveError> {
         if self.z() == Felt::ZERO {
-            return Err(EllipticCurveError::InvalidPoint);
+            return Err(CurveError::EllipticCurveError(InvalidPoint));
         }
         Ok(AffinePoint(self.0.to_affine()))
     }
@@ -92,7 +92,10 @@ mod test {
             ProjectivePoint::new(Felt::from(0), Felt::from(1), Felt::from(0))
         );
 
-        assert_eq!(identity.to_affine(), Err(EllipticCurveError::InvalidPoint));
+        assert_eq!(
+            identity.to_affine(),
+            Err(CurveError::EllipticCurveError(InvalidPoint))
+        );
     }
 
     #[test]