clean prover. Moved to rapidsnark

iden3 · Dec 14, 2020 · e1d9700 · e1d9700
1 parent 9aee793
commit e1d9700
Show file tree

Hide file tree

Showing 27 changed files with 52 additions and 1,903 deletions.
diff --git a/benchmark/multiexp_g1.cpp b/benchmark/multiexp_g1.cpp
@@ -1,11 +1,12 @@
+#ifndef COUNT_OPS
 #define COUNT_OPS
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
 #include "alt_bn128.hpp"
 #include <time.h>
 
-
 using namespace AltBn128;
 
 __uint128_t g_lehmer64_state = 0xAAAAAAAAAAAAAAAALL;

diff --git a/benchmark/multiexp_g2.cpp b/benchmark/multiexp_g2.cpp
@@ -1,4 +1,6 @@
+#ifndef COUNT_OPS
 #define COUNT_OPS
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/c/curve.hpp b/c/curve.hpp
@@ -1,9 +1,7 @@
 #include <string>
 
 #include "exp.hpp"
-// #include "multiexp.hpp"
-#include "multiexp2.hpp"
-#include "par_multiexp2.hpp"
+#include "multiexp.hpp"
 
 template <typename BaseField>
 class Curve {
@@ -117,11 +115,6 @@ class Curve {
         nafMulByScalar<Curve<BaseField>, PointAffine, Point>(*this, r, base, scalar, scalarSize);
     }
 
-    void multiMulByScalar_old(Point &r, PointAffine *bases, uint8_t* scalars, unsigned int scalarSize, unsigned int n) {
-        MultByScalar::fastMultiMulByScalar<Curve<BaseField>, Point, PointAffine>(*this, r, bases, scalars, scalarSize, n);
-        // MultByScalar::nafMultiMulByScalar<Curve<BaseField>, Point, PointAffine>(*this, r, bases, scalars, scalarSize, n);
-    }
-
     void multiMulByScalar(Point &r, PointAffine *bases, uint8_t* scalars, unsigned int scalarSize, unsigned int n, unsigned int nThreads=0) {
         ParallelMultiexp<Curve<BaseField>> pm(*this);
         pm.multiexp(r, bases, scalars, scalarSize, n);

diff --git a/c/div.cpp b/c/div.cpp
diff --git a/c/groth16.cpp b/c/groth16.cpp