update

Koukyosyumei · Nov 5, 2024 · e49680e · e49680e
1 parent 60fa7ac
commit e49680e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 21 deletions.
diff --git a/myzkp/src/modules/curve.rs b/myzkp/src/modules/curve.rs
@@ -6,19 +6,19 @@ use std::ops::{Add, Mul, Neg, Sub};
 
 use crate::modules::field::Field;
 
-pub trait EllipticCurve<F: Field>: Debug + Clone + PartialEq {
-    fn get_a() -> F;
-    fn get_b() -> F;
+pub trait EllipticCurve: Debug + Clone + PartialEq {
+    fn get_a() -> BigInt;
+    fn get_b() -> BigInt;
 }
 
 #[derive(Debug, Clone, PartialEq)]
-pub struct EllipticCurvePoint<F: Field, E: EllipticCurve<F>> {
+pub struct EllipticCurvePoint<F: Field, E: EllipticCurve> {
     pub x: Option<F>,
     pub y: Option<F>,
     _phantom: PhantomData<E>,
 }
 
-impl<F: Field, E: EllipticCurve<F>> EllipticCurvePoint<F, E> {
+impl<F: Field, E: EllipticCurve> EllipticCurvePoint<F, E> {
     fn new(x: F, y: F) -> Self {
         // let a = E::get_a();
         // let b = E::get_b();
@@ -51,7 +51,7 @@ impl<F: Field, E: EllipticCurve<F>> EllipticCurvePoint<F, E> {
     }
 
     pub fn line_slope(&self, other: Self) -> F {
-        let a = E::get_a();
+        let a = F::from_value(E::get_a());
         // let b = E::get_b();
 
         let x1 = self.x.clone().unwrap();
@@ -67,7 +67,7 @@ impl<F: Field, E: EllipticCurve<F>> EllipticCurvePoint<F, E> {
     }
 }
 
-impl<F: Field, E: EllipticCurve<F>> Add for EllipticCurvePoint<F, E> {
+impl<F: Field, E: EllipticCurve> Add for EllipticCurvePoint<F, E> {
     type Output = Self;
 
     fn add(self, other: Self) -> Self {
@@ -115,7 +115,7 @@ impl<F: Field, E: EllipticCurve<F>> Add for EllipticCurvePoint<F, E> {
     }
 }
 
-impl<F: Field, E: EllipticCurve<F>> Mul<BigInt> for EllipticCurvePoint<F, E> {
+impl<F: Field, E: EllipticCurve> Mul<BigInt> for EllipticCurvePoint<F, E> {
     type Output = Self;
 
     fn mul(self, scalar: BigInt) -> Self {
@@ -140,7 +140,7 @@ impl<F: Field, E: EllipticCurve<F>> Mul<BigInt> for EllipticCurvePoint<F, E> {
     }
 }
 
-impl<F: Field, E: EllipticCurve<F>> Neg for EllipticCurvePoint<F, E> {
+impl<F: Field, E: EllipticCurve> Neg for EllipticCurvePoint<F, E> {
     type Output = Self;
     fn neg(self) -> Self {
         if self.is_point_at_infinity() {
@@ -151,14 +151,14 @@ impl<F: Field, E: EllipticCurve<F>> Neg for EllipticCurvePoint<F, E> {
     }
 }
 
-impl<F: Field, E: EllipticCurve<F>> Sub for EllipticCurvePoint<F, E> {
+impl<F: Field, E: EllipticCurve> Sub for EllipticCurvePoint<F, E> {
     type Output = Self;
     fn sub(self, other: Self) -> Self {
         self + (-other)
     }
 }
 
-pub fn get_lambda<F: Field, E: EllipticCurve<F>>(
+pub fn get_lambda<F: Field, E: EllipticCurve>(
     p: EllipticCurvePoint<F, E>,
     q: EllipticCurvePoint<F, E>,
     r: EllipticCurvePoint<F, E>,
@@ -179,7 +179,7 @@ pub fn get_lambda<F: Field, E: EllipticCurve<F>>(
     return numerator / denominator;
 }
 
-pub fn miller<F: Field, E: EllipticCurve<F>>(
+pub fn miller<F: Field, E: EllipticCurve>(
     p: EllipticCurvePoint<F, E>,
     q: EllipticCurvePoint<F, E>,
     m: BigInt,
@@ -203,7 +203,7 @@ pub fn miller<F: Field, E: EllipticCurve<F>>(
     f
 }
 
-pub fn weil_pairing<F: Field, E: EllipticCurve<F>>(
+pub fn weil_pairing<F: Field, E: EllipticCurve>(
     p: EllipticCurvePoint<F, E>,
     q: EllipticCurvePoint<F, E>,
     m: BigInt,
@@ -234,12 +234,12 @@ mod tests {
 
         #[derive(Debug, Clone, PartialEq)]
         struct CurveA30B34;
-        impl EllipticCurve<FiniteFieldElement<Mod631>> for CurveA30B34 {
-            fn get_a() -> FiniteFieldElement<Mod631> {
-                FiniteFieldElement::<Mod631>::from_value(30_i64)
+        impl EllipticCurve for CurveA30B34 {
+            fn get_a() -> BigInt {
+                30_i64.to_bigint().unwrap()
             }
-            fn get_b() -> FiniteFieldElement<Mod631> {
-                FiniteFieldElement::<Mod631>::from_value(34_i64)
+            fn get_b() -> BigInt {
+                34_i64.to_bigint().unwrap()
             }
         }
 

diff --git a/myzkp/src/modules/polynomial.rs b/myzkp/src/modules/polynomial.rs
@@ -1,9 +1,7 @@
 use std::fmt;
 use std::ops::{Add, Div, Mul, Neg, Rem, Sub};
 
-use crate::modules::curve;
 use crate::modules::curve::{EllipticCurve, EllipticCurvePoint};
-use crate::modules::field;
 use crate::modules::field::Field;
 
 /// Polynomial struct representing a polynomial over Field.
@@ -299,7 +297,7 @@ impl<F: Field> Rem for Polynomial<F> {
 }
 
 impl<F: Field> Polynomial<F> {
-    pub fn eval_with_powers_on_curve<E: EllipticCurve<F>>(
+    pub fn eval_with_powers_on_curve<E: EllipticCurve>(
         &self,
         powers: &[EllipticCurvePoint<F, E>],
     ) -> EllipticCurvePoint<F, E> {