Move random_test_initializer to separate file

NilFoundation · May 8, 2024 · d469024 · d469024
1 parent b33e0e8
commit d469024
Show file tree

Hide file tree

Showing 3 changed files with 213 additions and 255 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -61,100 +61,6 @@ if(UNIX AND BUILD_WITH_CCACHE)
     endif(CCACHE_FOUND)
 endif()
 
-list(APPEND ${CURRENT_PROJECT_NAME}_PUBLIC_HEADERS
-     include/nil/crypto3/zk/snark/accumulators/snark.hpp
-
-     include/nil/crypto3/zk/snark/detail/accumulation_vector.hpp
-     include/nil/crypto3/zk/snark/detail/set_commitment.hpp
-     include/nil/crypto3/zk/snark/detail/sparse_vector.hpp
-
-     include/nil/crypto3/zk/snark/commitments/knowledge_commitment_multiexp.hpp
-     include/nil/crypto3/zk/snark/commitments/knowledge_commitment.hpp
-
-     include/nil/crypto3/zk/snark/systems/pcd/r1cs_pcd/compliance_predicate/compliance_predicate.hpp
-     include/nil/crypto3/zk/snark/systems/pcd/r1cs_pcd/compliance_predicate/cp_handler.hpp
-
-     include/nil/crypto3/zk/snark/systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/mp_pcd_circuits.hpp
-     include/nil/crypto3/zk/snark/systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd.hpp
-     include/nil/crypto3/zk/snark/systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd_params.hpp
-
-     include/nil/crypto3/zk/snark/systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd.hpp
-     include/nil/crypto3/zk/snark/systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd_params.hpp
-     include/nil/crypto3/zk/snark/systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/sp_pcd_circuits.hpp
-     include/nil/crypto3/zk/snark/systems/pcd/r1cs_pcd/ppzkpcd_compliance_predicate.hpp
-     include/nil/crypto3/zk/snark/systems/pcd/r1cs_pcd/r1cs_pcd_params.hpp
-
-     include/nil/crypto3/zk/snark/systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark.hpp
-     include/nil/crypto3/zk/snark/systems/ppzkadsnark/r1cs_ppzkadsnark/prf.hpp
-     include/nil/crypto3/zk/snark/systems/ppzkadsnark/r1cs_ppzkadsnark/signature.hpp
-     include/nil/crypto3/zk/snark/systems/detail/ppzkadsnark/r1cs_ppzkadsnark/basic_policy.hpp
-
-     include/nil/crypto3/zk/snark/systems/ppzksnark/bacs_ppzksnark.hpp
-     include/nil/crypto3/zk/snark/systems/detail/ppzksnark/bacs_ppzksnark/basic_policy.hpp
-
-     include/nil/crypto3/zk/snark/systems/ppzksnark/r1cs_gg_ppzksnark.hpp
-     include/nil/crypto3/zk/snark/systems/detail/ppzksnark/r1cs_gg_ppzksnark/basic_policy.hpp
-
-     include/nil/crypto3/zk/snark/systems/ppzksnark/r1cs_ppzksnark.hpp
-     include/nil/crypto3/zk/snark/systems/detail/ppzksnark/r1cs_ppzksnark/basic_policy.hpp
-
-     include/nil/crypto3/zk/snark/systems/ppzksnark/r1cs_se_ppzksnark.hpp
-     include/nil/crypto3/zk/snark/systems/detail/ppzksnark/r1cs_se_ppzksnark/basic_policy.hpp
-
-     include/nil/crypto3/zk/snark/systems/ppzksnark/tbcs_ppzksnark.hpp
-     include/nil/crypto3/zk/snark/systems/detail/ppzksnark/tbcs_ppzksnark/basic_policy.hpp
-
-     include/nil/crypto3/zk/snark/systems/ppzksnark/uscs_ppzksnark.hpp
-     include/nil/crypto3/zk/snark/systems/detail/ppzksnark/uscs_ppzksnark/basic_policy.hpp
-
-     include/nil/crypto3/zk/snark/reductions/bacs_to_r1cs.hpp
-
-     include/nil/crypto3/zk/snark/reductions/r1cs_to_qap.hpp
-
-     include/nil/crypto3/zk/snark/reductions/r1cs_to_sap.hpp
-
-     include/nil/crypto3/zk/snark/reductions/tbcs_to_uscs.hpp
-
-     include/nil/crypto3/zk/snark/reductions/uscs_to_ssp.hpp
-
-     include/nil/crypto3/zk/snark/arithmetization/arithmetic_programs/qap.hpp
-
-     include/nil/crypto3/zk/snark/arithmetization/arithmetic_programs/sap.hpp
-
-     include/nil/crypto3/zk/snark/arithmetization/arithmetic_programs/ssp.hpp
-
-     include/nil/crypto3/zk/snark/arithmetization/circuit_satisfaction_problems/bacs.hpp
-
-     include/nil/crypto3/zk/snark/arithmetization/circuit_satisfaction_problems/tbcs.hpp
-
-     include/nil/crypto3/zk/snark/arithmetization/constraint_satisfaction_problems/r1cs.hpp
-
-     include/nil/crypto3/zk/snark/arithmetization/constraint_satisfaction_problems/uscs.hpp
-
-     include/nil/crypto3/zk/snark/arithmetization/ram_computations/memory/delegated_ra_memory.hpp
-     include/nil/crypto3/zk/snark/arithmetization/ram_computations/memory/memory_interface.hpp
-     include/nil/crypto3/zk/snark/arithmetization/ram_computations/memory/memory_store_trace.hpp
-     include/nil/crypto3/zk/snark/arithmetization/ram_computations/memory/ra_memory.hpp
-
-     include/nil/crypto3/zk/snark/arithmetization/ram_computations/rams/fooram/fooram_aux.hpp
-     include/nil/crypto3/zk/snark/arithmetization/ram_computations/rams/fooram/fooram_params.hpp
-
-     include/nil/crypto3/zk/snark/arithmetization/ram_computations/rams/tinyram/tinyram_aux.hpp
-     include/nil/crypto3/zk/snark/arithmetization/ram_computations/rams/tinyram/tinyram_params.hpp
-     include/nil/crypto3/zk/snark/arithmetization/ram_computations/rams/ram_params.hpp
-     include/nil/crypto3/zk/snark/arithmetization/variable.hpp
-     include/nil/crypto3/zk/snark/routing/as_waksman.hpp
-     include/nil/crypto3/zk/snark/routing/benes.hpp
-     include/nil/crypto3/zk/snark/constraint_profiling.hpp
-     include/nil/crypto3/zk/snark/integer_permutation.hpp
-     include/nil/crypto3/zk/snark/merkle_tree.hpp)
-
-list(APPEND ${CURRENT_PROJECT_NAME}_UNGROUPED_SOURCES)
-
-list(APPEND ${CURRENT_PROJECT_NAME}_HEADERS ${${CURRENT_PROJECT_NAME}_PUBLIC_HEADERS})
-
-list(APPEND ${CURRENT_PROJECT_NAME}_SOURCES ${${CURRENT_PROJECT_NAME}_UNGROUPED_SOURCES})
-
 cm_setup_version(VERSION 0.1.0 PREFIX ${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME})
 
 add_library(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} INTERFACE)
@@ -178,7 +84,6 @@ target_link_libraries(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} INTERFACE
                       ${CMAKE_WORKSPACE_NAME}::hash
                       ${CMAKE_WORKSPACE_NAME}::multiprecision
                       ${CMAKE_WORKSPACE_NAME}::containers)
-                    #   marshalling::crypto3_zk)
 
 cm_deploy(TARGETS ${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME}
           INCLUDE include

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -10,6 +10,10 @@ include(CMTest)
 
 cm_find_package(Boost REQUIRED COMPONENTS unit_test_framework)
 
+target_include_directories(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} INTERFACE
+    "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
+    "$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>")
+
 cm_test_link_libraries(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME}
 
                        ${CMAKE_WORKSPACE_NAME}::algebra