Merge pull request #64 from kroma-network/refac/refactor-math

refac: refactor math
kroma-network · Sep 26, 2023 · 0e26c04 · 0e26c04
2 parents 4569add + 829209e
commit 0e26c04
Show file tree

Hide file tree

Showing 23 changed files with 16 additions and 414 deletions.
diff --git a/tachyon/math/base/BUILD.bazel b/tachyon/math/base/BUILD.bazel
@@ -64,11 +64,6 @@ tachyon_cc_library(
     deps = [":semigroups"],
 )
 
-tachyon_cc_library(
-    name = "identities",
-    hdrs = ["identities.h"],
-)
-
 tachyon_cc_library(
     name = "rings",
     hdrs = ["rings.h"],

diff --git a/tachyon/math/base/gmp/BUILD.bazel b/tachyon/math/base/gmp/BUILD.bazel
@@ -20,16 +20,6 @@ tachyon_cc_library(
     ],
 )
 
-tachyon_cc_library(
-    name = "gmp_identities",
-    hdrs = ["gmp_identities.h"],
-    deps = [
-        "//tachyon/base:no_destructor",
-        "//tachyon/math/base:identities",
-        "@local_config_gmp//:gmp",
-    ],
-)
-
 tachyon_cc_library(
     name = "gmp_util",
     srcs = ["gmp_util.cc"],
@@ -56,11 +46,9 @@ tachyon_cc_test(
     name = "gmp_unittests",
     size = "small",
     srcs = [
-        "gmp_identities_unittest.cc",
         "gmp_util_unittest.cc",
     ],
     deps = [
-        ":gmp_identities",
         ":gmp_util",
         "//tachyon/build:build_config",
     ],

diff --git a/tachyon/math/base/gmp/gmp_identities.h b/tachyon/math/base/gmp/gmp_identities.h
diff --git a/tachyon/math/base/gmp/gmp_identities_unittest.cc b/tachyon/math/base/gmp/gmp_identities_unittest.cc
diff --git a/tachyon/math/base/identities.h b/tachyon/math/base/identities.h
diff --git a/tachyon/math/elliptic_curves/BUILD.bazel b/tachyon/math/elliptic_curves/BUILD.bazel
@@ -14,8 +14,5 @@ tachyon_cc_library(
         "projective_point.h",
         "semigroups.h",
     ],
-    deps = [
-        "//tachyon/base:no_destructor",
-        "//tachyon/math/base:identities",
-    ],
+    deps = ["//tachyon/base:no_destructor"],
 )
diff --git a/tachyon/math/elliptic_curves/affine_point.h b/tachyon/math/elliptic_curves/affine_point.h
@@ -20,32 +20,6 @@ JacobianPoint<Curve> operator*(const ScalarField& v,
   return point * v;
 }
 
-template <typename Curve>
-class MultiplicativeIdentity<AffinePoint<Curve>> {
- public:
-  using P = AffinePoint<Curve>;
-
-  static const P& One() {
-    static base::NoDestructor<P> one(P::One());
-    return *one;
-  }
-
-  constexpr static bool IsOne(const P& value) { return value.IsOne(); }
-};
-
-template <typename Curve>
-class AdditiveIdentity<AffinePoint<Curve>> {
- public:
-  using P = AffinePoint<Curve>;
-
-  static const P& Zero() {
-    static base::NoDestructor<P> zero(P::Zero());
-    return *zero;
-  }
-
-  constexpr static bool IsZero(const P& value) { return value.IsZero(); }
-};
-
 template <typename Curve>
 struct PointConversions<AffinePoint<Curve>, AffinePoint<Curve>> {
   constexpr static const AffinePoint<Curve>& Convert(

diff --git a/tachyon/math/elliptic_curves/jacobian_point.h b/tachyon/math/elliptic_curves/jacobian_point.h
@@ -4,7 +4,6 @@
 #include <ostream>
 
 #include "tachyon/base/no_destructor.h"
-#include "tachyon/math/base/identities.h"
 #include "tachyon/math/elliptic_curves/point_conversions_forward.h"
 
 namespace tachyon::math {
@@ -23,32 +22,6 @@ JacobianPoint<Curve> operator*(const ScalarField& v,
   return point * v;
 }
 
-template <typename Curve>
-class MultiplicativeIdentity<JacobianPoint<Curve>> {
- public:
-  using P = JacobianPoint<Curve>;
-
-  static const P& One() {
-    static base::NoDestructor<P> one(P::One());
-    return *one;
-  }
-
-  constexpr static bool IsOne(const P& value) { return value.IsOne(); }
-};
-
-template <typename Curve>
-class AdditiveIdentity<JacobianPoint<Curve>> {
- public:
-  using P = JacobianPoint<Curve>;
-
-  static const P& Zero() {
-    static base::NoDestructor<P> zero(P::Zero());
-    return *zero;
-  }
-
-  constexpr static bool IsZero(const P& value) { return value.IsZero(); }
-};
-
 template <typename Curve>
 struct PointConversions<JacobianPoint<Curve>, JacobianPoint<Curve>> {
   constexpr static const JacobianPoint<Curve>& Convert(

diff --git a/tachyon/math/elliptic_curves/msm/BUILD.bazel b/tachyon/math/elliptic_curves/msm/BUILD.bazel
@@ -15,7 +15,6 @@ tachyon_cc_library(
         "//tachyon/base:static_storage",
         "//tachyon/math/base:bit_iterator",
         "//tachyon/math/base/gmp:bit_traits",
-        "//tachyon/math/base/gmp:gmp_identities",
         "//tachyon/math/base/gmp:signed_value",
         "//tachyon/math/elliptic_curves:points",
         "//tachyon/math/matrix:gmp_num_traits",

diff --git a/tachyon/math/elliptic_curves/msm/glv.h b/tachyon/math/elliptic_curves/msm/glv.h
@@ -4,7 +4,6 @@
 #include "tachyon/base/static_storage.h"
 #include "tachyon/math/base/bit_iterator.h"
 #include "tachyon/math/base/gmp/bit_traits.h"
-#include "tachyon/math/base/gmp/gmp_identities.h"
 #include "tachyon/math/base/gmp/signed_value.h"
 #include "tachyon/math/elliptic_curves/affine_point.h"
 #include "tachyon/math/elliptic_curves/jacobian_point.h"

diff --git a/tachyon/math/elliptic_curves/point_xyzz.h b/tachyon/math/elliptic_curves/point_xyzz.h
@@ -4,7 +4,6 @@
 #include <ostream>
 
 #include "tachyon/base/no_destructor.h"
-#include "tachyon/math/base/identities.h"
 #include "tachyon/math/elliptic_curves/point_conversions_forward.h"
 
 namespace tachyon::math {
@@ -23,32 +22,6 @@ PointXYZZ<Curve> operator*(const ScalarField& v,
   return point * v;
 }
 
-template <typename Curve>
-class MultiplicativeIdentity<PointXYZZ<Curve>> {
- public:
-  using P = PointXYZZ<Curve>;
-
-  static const P& One() {
-    static base::NoDestructor<P> one(P::One());
-    return *one;
-  }
-
-  constexpr static bool IsOne(const P& value) { return value.IsOne(); }
-};
-
-template <typename Curve>
-class AdditiveIdentity<PointXYZZ<Curve>> {
- public:
-  using P = PointXYZZ<Curve>;
-
-  static const P& Zero() {
-    static base::NoDestructor<P> zero(P::Zero());
-    return *zero;
-  }
-
-  constexpr static bool IsZero(const P& value) { return value.IsZero(); }
-};
-
 template <typename Curve>
 struct PointConversions<PointXYZZ<Curve>, PointXYZZ<Curve>> {
   constexpr static const PointXYZZ<Curve>& Convert(

diff --git a/tachyon/math/elliptic_curves/projective_point.h b/tachyon/math/elliptic_curves/projective_point.h
@@ -4,7 +4,6 @@
 #include <ostream>
 
 #include "tachyon/base/no_destructor.h"
-#include "tachyon/math/base/identities.h"
 #include "tachyon/math/elliptic_curves/point_conversions_forward.h"
 
 namespace tachyon::math {
@@ -24,32 +23,6 @@ ProjectivePoint<Curve> operator*(const ScalarField& v,
   return point * v;
 }
 
-template <typename Curve>
-class MultiplicativeIdentity<ProjectivePoint<Curve>> {
- public:
-  using P = ProjectivePoint<Curve>;
-
-  static const P& One() {
-    static base::NoDestructor<P> one(P::One());
-    return *one;
-  }
-
-  constexpr static bool IsOne(const P& value) { return value.IsOne(); }
-};
-
-template <typename Curve>
-class AdditiveIdentity<ProjectivePoint<Curve>> {
- public:
-  using P = ProjectivePoint<Curve>;
-
-  static const P& Zero() {
-    static base::NoDestructor<P> zero(P::Zero());
-    return *zero;
-  }
-
-  constexpr static bool IsZero(const P& value) { return value.IsZero(); }
-};
-
 template <typename Curve>
 struct PointConversions<ProjectivePoint<Curve>, ProjectivePoint<Curve>> {
   constexpr static const ProjectivePoint<Curve>& Convert(

diff --git a/tachyon/math/finite_fields/BUILD.bazel b/tachyon/math/finite_fields/BUILD.bazel
@@ -67,7 +67,6 @@ tachyon_cc_library(
         "//tachyon/base:no_destructor",
         "//tachyon/base/strings:string_util",
         "//tachyon/math/base:field",
-        "//tachyon/math/base:identities",
         "//tachyon/math/base/gmp:gmp_util",
     ],
 )
@@ -83,7 +82,6 @@ tachyon_cc_library(
         "//tachyon/base/containers:adapters",
         "//tachyon/base/strings:string_util",
         "//tachyon/math/base:arithmetics",
-        "//tachyon/math/base:identities",
         "//tachyon/math/base/gmp:gmp_util",
         "@com_google_googletest//:gtest_prod",
     ],

diff --git a/tachyon/math/finite_fields/prime_field.h b/tachyon/math/finite_fields/prime_field.h
@@ -12,7 +12,6 @@
 #include "tachyon/math/base/arithmetics.h"
 #include "tachyon/math/base/big_int.h"
 #include "tachyon/math/base/gmp/gmp_util.h"
-#include "tachyon/math/base/identities.h"
 #include "tachyon/math/finite_fields/modulus.h"
 #include "tachyon/math/finite_fields/prime_field_base.h"
 #include "tachyon/math/finite_fields/prime_field_forward.h"
@@ -297,32 +296,6 @@ std::ostream& operator<<(std::ostream& os, const PrimeField<Config>& f) {
   return os << f.ToString();
 }
 
-template <typename Config>
-class MultiplicativeIdentity<PrimeField<Config>> {
- public:
-  using F = PrimeField<Config>;
-
-  static const F& One() {
-    static F one(F::One());
-    return one;
-  }
-
-  constexpr static bool IsOne(const F& value) { return value.IsOne(); }
-};
-
-template <typename Config>
-class AdditiveIdentity<PrimeField<Config>> {
- public:
-  using F = PrimeField<Config>;
-
-  static const F& Zero() {
-    static F zero(F::Zero());
-    return zero;
-  }
-
-  constexpr static bool IsZero(const F& value) { return value.IsZero(); }
-};
-
 }  // namespace tachyon::math
 
 #endif  // TACHYON_MATH_FINITE_FIELDS_PRIME_FIELD_H_