Change most assert_except into assert.

src/algebra/curves/alt_bn128/alt_bn128_g1.cpp

@@ -6,7 +6,6 @@
  *****************************************************************************/
 
 #include "algebra/curves/alt_bn128/alt_bn128_g1.hpp"
-#include "common/assert_except.hpp"
 
 namespace libsnark {
 
@@ -257,7 +256,7 @@ alt_bn128_G1 alt_bn128_G1::add(const alt_bn128_G1 &other) const
 alt_bn128_G1 alt_bn128_G1::mixed_add(const alt_bn128_G1 &other) const
 {
 #ifdef DEBUG
-    assert_except(other.is_special());
+    assert(other.is_special());
 #endif
 
     // handle special cases having to do with O

src/algebra/curves/alt_bn128/alt_bn128_g2.cpp

@@ -6,7 +6,6 @@
  *****************************************************************************/
 
 #include "algebra/curves/alt_bn128/alt_bn128_g2.hpp"
-#include "common/assert_except.hpp"
 
 namespace libsnark {
 
@@ -267,7 +266,7 @@ alt_bn128_G2 alt_bn128_G2::add(const alt_bn128_G2 &other) const
 alt_bn128_G2 alt_bn128_G2::mixed_add(const alt_bn128_G2 &other) const
 {
 #ifdef DEBUG
-    assert_except(other.is_special());
+    assert(other.is_special());
 #endif
 
     // handle special cases having to do with O

src/algebra/evaluation_domain/domains/basic_radix2_domain.tcc

@@ -15,16 +15,15 @@
 #define BASIC_RADIX2_DOMAIN_TCC_
 
 #include "algebra/evaluation_domain/domains/basic_radix2_domain_aux.hpp"
-#include "common/assert_except.hpp"
 
 namespace libsnark {
 
 template<typename FieldT>
 basic_radix2_domain<FieldT>::basic_radix2_domain(const size_t m) : evaluation_domain<FieldT>(m)
 {
-    assert_except(m > 1);
+    assert(m > 1);
     const size_t logm = log2(m);
-    assert_except(logm <= (FieldT::s));
+    assert(logm <= (FieldT::s));
 
     omega = get_root_of_unity<FieldT>(m);
 }
@@ -33,7 +32,7 @@ template<typename FieldT>
 void basic_radix2_domain<FieldT>::FFT(std::vector<FieldT> &a)
 {
     enter_block("Execute FFT");
-    assert_except(a.size() == this->m);
+    assert(a.size() == this->m);
     _basic_radix2_FFT(a, omega);
     leave_block("Execute FFT");
 }
@@ -42,7 +41,7 @@ template<typename FieldT>
 void basic_radix2_domain<FieldT>::iFFT(std::vector<FieldT> &a)
 {
     enter_block("Execute inverse FFT");
-    assert_except(a.size() == this->m);
+    assert(a.size() == this->m);
     _basic_radix2_FFT(a, omega.inverse());
 
     const FieldT sconst = FieldT(a.size()).inverse();
@@ -92,7 +91,7 @@ FieldT basic_radix2_domain<FieldT>::compute_Z(const FieldT &t)
 template<typename FieldT>
 void basic_radix2_domain<FieldT>::add_poly_Z(const FieldT &coeff, std::vector<FieldT> &H)
 {
-    assert_except(H.size() == this->m+1);
+    assert(H.size() == this->m+1);
     H[this->m] += coeff;
     H[0] -= coeff;
 }

src/algebra/evaluation_domain/domains/basic_radix2_domain_aux.tcc

@@ -21,7 +21,6 @@
 #include "algebra/fields/field_utils.hpp"
 #include "common/profiling.hpp"
 #include "common/utils.hpp"
-#include "common/assert_except.hpp"
 
 namespace libsnark {
 
@@ -39,7 +38,7 @@ template<typename FieldT>
 void _basic_serial_radix2_FFT(std::vector<FieldT> &a, const FieldT &omega)
 {
     const size_t n = a.size(), logn = log2(n);
-    assert_except(n == (1u << logn));
+    assert(n == (1u << logn));
 
     /* swapping in place (from Storer's book) */
     for (size_t k = 0; k < n; ++k)
@@ -79,7 +78,7 @@ void _basic_parallel_radix2_FFT_inner(std::vector<FieldT> &a, const FieldT &omeg
 
     const size_t m = a.size();
     const size_t log_m = log2(m);
-    assert_except(m == 1ul<<log_m);
+    assert(m == 1ul<<log_m);
 
     if (log_m < log_cpus)
     {
@@ -190,7 +189,7 @@ std::vector<FieldT> _basic_radix2_lagrange_coeffs(const size_t m, const FieldT &
         return std::vector<FieldT>(1, FieldT::one());
     }
 
-    assert_except(m == (1u << log2(m)));
+    assert(m == (1u << log2(m)));
 
     const FieldT omega = get_root_of_unity<FieldT>(m);