Synchronize with parallel-crypto3 sources

NilFoundation · Sep 12, 2024 · 246955a · 246955a
1 parent e1ac7ce
commit 246955a
Show file tree

Hide file tree

Showing 30 changed files with 216 additions and 577 deletions.
diff --git a/libs/containers/CMakeLists.txt b/libs/containers/CMakeLists.txt
@@ -57,7 +57,6 @@ target_include_directories(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} INTER
 
 cm_deploy(TARGETS ${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} INCLUDE include NAMESPACE ${CMAKE_WORKSPACE_NAME}::)
 
-include(CMTest)
 cm_add_test_subdirectory(test)
 
 if (BUILD_EXAMPLES)

diff --git a/libs/marshalling/zk/test/kzg_commitment.cpp b/libs/marshalling/zk/test/kzg_commitment.cpp
@@ -25,7 +25,6 @@
 // SOFTWARE.
 //---------------------------------------------------------------------------//
 
-#include "nil/crypto3/zk/commitments/batched_commitment.hpp"
 #define BOOST_TEST_MODULE crypto3_marshalling_kzg_commitment_test
 
 #include <boost/test/unit_test.hpp>
@@ -53,7 +52,8 @@
 #include <nil/crypto3/algebra/fields/arithmetic_params/mnt6.hpp>
 
 #include <nil/crypto3/algebra/curves/bls12.hpp>
-#include <nil/crypto3/algebra/pairing/bls12.hpp> 
+#include <nil/crypto3/algebra/pairing/bls12.hpp>
+#include <nil/crypto3/algebra/fields/arithmetic_params/bls12.hpp>
 
 /*
 #include <nil/crypto3/algebra/curves/alt_bn128.hpp>
@@ -75,6 +75,7 @@
 #include <nil/crypto3/zk/commitments/polynomial/kzg.hpp>
 #include <nil/crypto3/zk/commitments/polynomial/kzg_v2.hpp>
 #include <nil/crypto3/marshalling/zk/types/commitments/kzg.hpp>
+#include <nil/crypto3/zk/commitments/batched_commitment.hpp>
 
 #include <nil/crypto3/zk/snark/arithmetization/plonk/params.hpp>
 #include <nil/crypto3/zk/snark/systems/plonk/placeholder/params.hpp>

diff --git a/libs/math/include/nil/crypto3/math/algorithms/make_evaluation_domain.hpp b/libs/math/include/nil/crypto3/math/algorithms/make_evaluation_domain.hpp
@@ -26,8 +26,6 @@
 #ifndef CRYPTO3_MATH_MAKE_EVALUATION_DOMAIN_HPP
 #define CRYPTO3_MATH_MAKE_EVALUATION_DOMAIN_HPP
 
-#include <nil/crypto3/algebra/fields/arithmetic_params/bls12.hpp>
-
 #include <nil/crypto3/math/domains/evaluation_domain.hpp>
 #include <nil/crypto3/math/domains/arithmetic_sequence_domain.hpp>
 #include <nil/crypto3/math/domains/basic_radix2_domain.hpp>

diff --git a/libs/math/include/nil/crypto3/math/domains/basic_radix2_domain.hpp b/libs/math/include/nil/crypto3/math/domains/basic_radix2_domain.hpp
@@ -28,8 +28,6 @@
 
 #include <vector>
 
-#include <nil/crypto3/algebra/fields/arithmetic_params/bls12.hpp>
-
 #include <nil/crypto3/math/detail/field_utils.hpp>
 
 #include <nil/crypto3/math/domains/evaluation_domain.hpp>

diff --git a/libs/math/include/nil/crypto3/math/domains/extended_radix2_domain.hpp b/libs/math/include/nil/crypto3/math/domains/extended_radix2_domain.hpp
@@ -28,8 +28,6 @@
 
 #include <vector>
 
-#include <nil/crypto3/algebra/fields/arithmetic_params/bls12.hpp>
-
 #include <nil/crypto3/math/domains/evaluation_domain.hpp>
 #include <nil/crypto3/math/domains/basic_radix2_domain.hpp>
 #include <nil/crypto3/math/domains/detail/basic_radix2_domain_aux.hpp>

diff --git a/libs/math/include/nil/crypto3/math/polynomial/basic_operations.hpp b/libs/math/include/nil/crypto3/math/polynomial/basic_operations.hpp
@@ -308,7 +308,6 @@ namespace nil {
              */
             template<typename Range>
             void division(Range &q, Range &r, const Range &a, const Range &b) {
-
                 typedef
                 typename std::iterator_traits<decltype(std::begin(std::declval<Range>()))>::value_type value_type;
 

diff --git a/libs/math/include/nil/crypto3/math/polynomial/basis_change.hpp b/libs/math/include/nil/crypto3/math/polynomial/basis_change.hpp
diff --git a/libs/math/include/nil/crypto3/math/polynomial/evaluate.hpp b/libs/math/include/nil/crypto3/math/polynomial/evaluate.hpp
-Original file line number
+Diff line change
@@ Expand Up / @@ -308,7 +308,6 @@ namespace nil { @@
                  */
                 template<typename Range>
                 void division(Range &q, Range &r, const Range &a, const Range &b) {
                     typedef
                     typename std::iterator_traits<decltype(std::begin(std::declval<Range>()))>::value_type value_type;
@@ Expand Down @@