From a6c5b8bb1d28f08ca879da86982c47cb40b57eb4 Mon Sep 17 00:00:00 2001 From: Aleksejs Popovs Date: Tue, 20 Jun 2017 17:22:43 -0400 Subject: [PATCH 1/4] Add missing include. --- .../gadgets/cpu_checkers/tinyram/components/alu_arithmetic.tcc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_arithmetic.tcc b/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_arithmetic.tcc index c22a8c10..c1e7df32 100644 --- a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_arithmetic.tcc +++ b/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_arithmetic.tcc @@ -14,6 +14,8 @@ #ifndef ALU_ARITHMETIC_TCC_ #define ALU_ARITHMETIC_TCC_ +#include + #include "common/profiling.hpp" #include "common/utils.hpp" From 1168f90357dc953d90b63312643673d1b79cbef9 Mon Sep 17 00:00:00 2001 From: Aleksejs Popovs Date: Tue, 20 Jun 2017 20:37:26 -0400 Subject: [PATCH 2/4] Use system-style includes for libff/libfqfft. This removes the need to add their source roots to our include path and makes includes clearer and less ambiguous. --- CMakeLists.txt | 5 ++--- src/common/data_structures/merkle_tree.hpp | 2 +- src/common/data_structures/merkle_tree.tcc | 4 ++-- src/common/data_structures/set_commitment.cpp | 2 +- src/common/data_structures/set_commitment.hpp | 2 +- src/common/data_structures/sparse_vector.tcc | 2 +- src/common/default_types/bacs_ppzksnark_pp.hpp | 2 +- src/common/default_types/r1cs_gg_ppzksnark_pp.hpp | 2 +- src/common/default_types/r1cs_ppzkpcd_pp.hpp | 4 ++-- src/common/default_types/r1cs_ppzksnark_pp.hpp | 2 +- src/common/default_types/tbcs_ppzksnark_pp.hpp | 2 +- src/common/default_types/uscs_ppzksnark_pp.hpp | 2 +- src/common/libsnark_serialization.hpp | 2 +- .../routing_algorithms/as_waksman_routing_algorithm.hpp | 2 +- src/common/routing_algorithms/benes_routing_algorithm.hpp | 2 +- .../profiling/profile_routing_algorithms.cpp | 2 +- .../routing_algorithms/tests/test_routing_algorithms.cpp | 2 +- src/gadgetlib1/constraint_profiling.cpp | 2 +- src/gadgetlib1/gadgets/basic_gadgets.tcc | 4 ++-- .../gadgets/cpu_checkers/fooram/examples/test_fooram.cpp | 2 +- .../gadgets/cpu_checkers/fooram/fooram_cpu_checker.hpp | 2 +- .../cpu_checkers/tinyram/components/alu_arithmetic.tcc | 4 ++-- .../cpu_checkers/tinyram/components/alu_control_flow.tcc | 2 +- .../gadgets/cpu_checkers/tinyram/tinyram_cpu_checker.tcc | 2 +- src/gadgetlib1/gadgets/curves/weierstrass_g2_gadget.tcc | 2 +- src/gadgetlib1/gadgets/fields/exponentiation_gadget.hpp | 4 ++-- .../gadgets/hashes/knapsack/knapsack_gadget.tcc | 4 ++-- .../hashes/knapsack/tests/test_knapsack_gadget.cpp | 8 ++++---- .../gadgets/hashes/sha256/tests/test_sha256_gadget.cpp | 6 +++--- .../merkle_tree/tests/test_merkle_tree_gadgets.cpp | 8 ++++---- src/gadgetlib1/gadgets/pairing/mnt_pairing_params.hpp | 4 ++-- .../gadgets/pairing/weierstrass_miller_loop.tcc | 2 +- .../gadgets/routing/as_waksman_routing_gadget.tcc | 2 +- src/gadgetlib1/gadgets/routing/benes_routing_gadget.tcc | 2 +- .../gadgets/routing/profiling/profile_routing_gadgets.cpp | 4 ++-- .../set_commitment/tests/test_set_commitment_gadget.cpp | 8 ++++---- .../tests/test_r1cs_ppzksnark_verifier_gadget.cpp | 6 +++--- src/gadgetlib1/pb_variable.hpp | 2 +- src/gadgetlib1/pb_variable.tcc | 2 +- src/gadgetlib1/protoboard.hpp | 2 +- src/gadgetlib1/protoboard.tcc | 2 +- src/gadgetlib2/examples/simple_example.hpp | 2 +- src/gadgetlib2/infrastructure.hpp | 2 +- src/gadgetlib2/integration.hpp | 2 +- src/gadgetlib2/pp.hpp | 2 +- src/knowledge_commitment/knowledge_commitment.hpp | 2 +- src/reductions/r1cs_to_qap/r1cs_to_qap.tcc | 6 +++--- .../ram_to_r1cs/examples/demo_arithmetization.cpp | 2 +- .../ram_to_r1cs/gadgets/ram_universal_gadget.tcc | 6 +++--- src/reductions/tbcs_to_uscs/tbcs_to_uscs.tcc | 2 +- src/reductions/uscs_to_ssp/uscs_to_ssp.tcc | 6 +++--- src/relations/arithmetic_programs/qap/qap.hpp | 2 +- src/relations/arithmetic_programs/qap/qap.tcc | 8 ++++---- src/relations/arithmetic_programs/qap/tests/test_qap.cpp | 8 ++++---- src/relations/arithmetic_programs/ssp/ssp.hpp | 2 +- src/relations/arithmetic_programs/ssp/ssp.tcc | 8 ++++---- src/relations/arithmetic_programs/ssp/tests/test_ssp.cpp | 8 ++++---- src/relations/circuit_satisfaction_problems/bacs/bacs.tcc | 4 ++-- .../bacs/examples/bacs_examples.tcc | 2 +- .../tbcs/examples/tbcs_examples.cpp | 2 +- src/relations/circuit_satisfaction_problems/tbcs/tbcs.cpp | 2 +- src/relations/circuit_satisfaction_problems/tbcs/tbcs.hpp | 2 +- .../r1cs/examples/r1cs_examples.tcc | 2 +- .../constraint_satisfaction_problems/r1cs/r1cs.tcc | 6 +++--- .../uscs/examples/uscs_examples.tcc | 2 +- .../constraint_satisfaction_problems/uscs/uscs.tcc | 6 +++--- .../ram_computations/memory/delegated_ra_memory.tcc | 4 ++-- src/relations/ram_computations/rams/fooram/fooram_aux.cpp | 2 +- src/relations/ram_computations/rams/fooram/fooram_aux.hpp | 2 +- .../ram_computations/rams/tinyram/tinyram_aux.cpp | 4 ++-- .../ram_computations/rams/tinyram/tinyram_aux.hpp | 2 +- src/relations/variable.tcc | 2 +- .../compliance_predicate/compliance_predicate.tcc | 2 +- .../pcd/r1cs_pcd/ppzkpcd_compliance_predicate.hpp | 2 +- .../pcd/r1cs_pcd/r1cs_mp_ppzkpcd/mp_pcd_circuits.tcc | 2 +- .../pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd.tcc | 4 ++-- .../r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd_params.hpp | 2 +- .../pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd.tcc | 4 ++-- .../r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd_params.hpp | 2 +- .../pcd/r1cs_pcd/r1cs_sp_ppzkpcd/sp_pcd_circuits.tcc | 2 +- .../r1cs_ppzkadsnark/examples/demo_r1cs_ppzkadsnark.cpp | 2 +- .../r1cs_ppzkadsnark/examples/run_r1cs_ppzkadsnark.tcc | 2 +- .../ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark.hpp | 2 +- .../ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark.tcc | 6 +++--- .../bacs_ppzksnark/examples/run_bacs_ppzksnark.tcc | 2 +- .../bacs_ppzksnark/profiling/profile_bacs_ppzksnark.cpp | 2 +- .../bacs_ppzksnark/tests/test_bacs_ppzksnark.cpp | 2 +- .../r1cs_gg_ppzksnark/examples/run_r1cs_gg_ppzksnark.tcc | 2 +- .../profiling/profile_r1cs_gg_ppzksnark.cpp | 4 ++-- .../ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark.hpp | 2 +- .../ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark.tcc | 6 +++--- .../r1cs_gg_ppzksnark/tests/test_r1cs_gg_ppzksnark.cpp | 4 ++-- .../r1cs_ppzksnark/examples/run_r1cs_ppzksnark.hpp | 2 +- .../r1cs_ppzksnark/examples/run_r1cs_ppzksnark.tcc | 2 +- .../r1cs_ppzksnark/profiling/profile_r1cs_ppzksnark.cpp | 4 ++-- .../ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp | 2 +- .../ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.tcc | 6 +++--- .../r1cs_ppzksnark/tests/test_r1cs_ppzksnark.cpp | 4 ++-- .../ram_ppzksnark/examples/demo_ram_ppzksnark.cpp | 2 +- .../ram_ppzksnark/examples/run_ram_ppzksnark.tcc | 2 +- .../ram_ppzksnark/profiling/profile_ram_ppzksnark.cpp | 2 +- .../ppzksnark/ram_ppzksnark/ram_ppzksnark.tcc | 2 +- .../ppzksnark/ram_ppzksnark/tests/test_ram_ppzksnark.cpp | 2 +- .../tbcs_ppzksnark/examples/run_tbcs_ppzksnark.tcc | 2 +- .../tbcs_ppzksnark/profiling/profile_tbcs_ppzksnark.cpp | 4 ++-- .../tbcs_ppzksnark/tests/test_tbcs_ppzksnark.cpp | 2 +- .../uscs_ppzksnark/examples/run_uscs_ppzksnark.tcc | 2 +- .../uscs_ppzksnark/profiling/profile_uscs_ppzksnark.cpp | 4 ++-- .../uscs_ppzksnark/tests/test_uscs_ppzksnark.cpp | 4 ++-- .../ppzksnark/uscs_ppzksnark/uscs_ppzksnark.hpp | 2 +- .../ppzksnark/uscs_ppzksnark/uscs_ppzksnark.tcc | 6 +++--- .../zksnark/ram_zksnark/examples/run_ram_zksnark.tcc | 2 +- src/zk_proof_systems/zksnark/ram_zksnark/ram_zksnark.tcc | 2 +- 113 files changed, 177 insertions(+), 178 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 85313e54..e7876a33 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -143,12 +143,11 @@ INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIR} ) # libfqfft find_path(LIBFQFFT_INCLUDE_DIR NAMES libfqfft) -set(LIBFQFFT_DIRECTORY ${LIBFQFFT_INCLUDE_DIR}/libfqfft) -include_directories(${LIBFQFFT_DIRECTORY}) +include_directories(${LIBFQFFT_INCLUDE_DIR}) # libff find_path(LIBFF_INCLUDE_DIR NAMES libff) -include_directories(${LIBFF_INCLUDE_DIR}/libff) +include_directories(${LIBFF_INCLUDE_DIR}) find_library(LIBFF_LIBRARIES NAMES ff libff) add_definitions( diff --git a/src/common/data_structures/merkle_tree.hpp b/src/common/data_structures/merkle_tree.hpp index 46787ee7..7c0edc7a 100644 --- a/src/common/data_structures/merkle_tree.hpp +++ b/src/common/data_structures/merkle_tree.hpp @@ -14,7 +14,7 @@ #include #include -#include "common/utils.hpp" +#include namespace libsnark { diff --git a/src/common/data_structures/merkle_tree.tcc b/src/common/data_structures/merkle_tree.tcc index ca666488..b91801e7 100644 --- a/src/common/data_structures/merkle_tree.tcc +++ b/src/common/data_structures/merkle_tree.tcc @@ -16,8 +16,8 @@ #include -#include "common/profiling.hpp" -#include "common/utils.hpp" +#include +#include namespace libsnark { diff --git a/src/common/data_structures/set_commitment.cpp b/src/common/data_structures/set_commitment.cpp index a62f4606..56ab3f20 100644 --- a/src/common/data_structures/set_commitment.cpp +++ b/src/common/data_structures/set_commitment.cpp @@ -6,7 +6,7 @@ *****************************************************************************/ #include "common/data_structures/set_commitment.hpp" -#include "common/serialization.hpp" +#include namespace libsnark { diff --git a/src/common/data_structures/set_commitment.hpp b/src/common/data_structures/set_commitment.hpp index d84cb87d..72b8ff41 100644 --- a/src/common/data_structures/set_commitment.hpp +++ b/src/common/data_structures/set_commitment.hpp @@ -12,7 +12,7 @@ #ifndef SET_COMMITMENT_HPP_ #define SET_COMMITMENT_HPP_ -#include "common/utils.hpp" +#include #include "common/data_structures/merkle_tree.hpp" #include "gadgetlib1/gadgets/hashes/hash_io.hpp" // TODO: the current structure is suboptimal diff --git a/src/common/data_structures/sparse_vector.tcc b/src/common/data_structures/sparse_vector.tcc index e418aeb4..2f85e950 100644 --- a/src/common/data_structures/sparse_vector.tcc +++ b/src/common/data_structures/sparse_vector.tcc @@ -14,7 +14,7 @@ #ifndef SPARSE_VECTOR_TCC_ #define SPARSE_VECTOR_TCC_ -#include "algebra/scalar_multiplication/multiexp.hpp" +#include #include diff --git a/src/common/default_types/bacs_ppzksnark_pp.hpp b/src/common/default_types/bacs_ppzksnark_pp.hpp index 73cb959d..c59fa471 100644 --- a/src/common/default_types/bacs_ppzksnark_pp.hpp +++ b/src/common/default_types/bacs_ppzksnark_pp.hpp @@ -14,7 +14,7 @@ #ifndef BACS_PPZKSNARK_PP_HPP_ #define BACS_PPZKSNARK_PP_HPP_ -#include "common/default_types/ec_pp.hpp" +#include namespace libsnark { typedef libff::default_ec_pp default_bacs_ppzksnark_pp; diff --git a/src/common/default_types/r1cs_gg_ppzksnark_pp.hpp b/src/common/default_types/r1cs_gg_ppzksnark_pp.hpp index 8ffb8d77..498f2f91 100644 --- a/src/common/default_types/r1cs_gg_ppzksnark_pp.hpp +++ b/src/common/default_types/r1cs_gg_ppzksnark_pp.hpp @@ -13,7 +13,7 @@ #ifndef R1CS_GG_PPZKSNARK_PP_HPP_ #define R1CS_GG_PPZKSNARK_PP_HPP_ -#include "common/default_types/ec_pp.hpp" +#include namespace libsnark { typedef libff::default_ec_pp default_r1cs_gg_ppzksnark_pp; diff --git a/src/common/default_types/r1cs_ppzkpcd_pp.hpp b/src/common/default_types/r1cs_ppzkpcd_pp.hpp index ea93377a..26be7571 100644 --- a/src/common/default_types/r1cs_ppzkpcd_pp.hpp +++ b/src/common/default_types/r1cs_ppzkpcd_pp.hpp @@ -14,8 +14,8 @@ /*********************** Define default PCD cycle ***************************/ -#include "algebra/curves/mnt/mnt4/mnt4_pp.hpp" -#include "algebra/curves/mnt/mnt6/mnt6_pp.hpp" +#include +#include namespace libsnark { diff --git a/src/common/default_types/r1cs_ppzksnark_pp.hpp b/src/common/default_types/r1cs_ppzksnark_pp.hpp index df47d0e3..2c9e6460 100644 --- a/src/common/default_types/r1cs_ppzksnark_pp.hpp +++ b/src/common/default_types/r1cs_ppzksnark_pp.hpp @@ -13,7 +13,7 @@ #ifndef R1CS_PPZKSNARK_PP_HPP_ #define R1CS_PPZKSNARK_PP_HPP_ -#include "common/default_types/ec_pp.hpp" +#include namespace libsnark { typedef libff::default_ec_pp default_r1cs_ppzksnark_pp; diff --git a/src/common/default_types/tbcs_ppzksnark_pp.hpp b/src/common/default_types/tbcs_ppzksnark_pp.hpp index 421ea44a..dbb6af71 100644 --- a/src/common/default_types/tbcs_ppzksnark_pp.hpp +++ b/src/common/default_types/tbcs_ppzksnark_pp.hpp @@ -14,7 +14,7 @@ #ifndef TBCS_PPZKSNARK_PP_HPP_ #define TBCS_PPZKSNARK_PP_HPP_ -#include "common/default_types/ec_pp.hpp" +#include namespace libsnark { typedef libff::default_ec_pp default_tbcs_ppzksnark_pp; diff --git a/src/common/default_types/uscs_ppzksnark_pp.hpp b/src/common/default_types/uscs_ppzksnark_pp.hpp index f2b0d219..39b4ea65 100644 --- a/src/common/default_types/uscs_ppzksnark_pp.hpp +++ b/src/common/default_types/uscs_ppzksnark_pp.hpp @@ -14,7 +14,7 @@ #ifndef USCS_PPZKSNARK_PP_HPP_ #define USCS_PPZKSNARK_PP_HPP_ -#include "common/default_types/ec_pp.hpp" +#include namespace libsnark { typedef libff::default_ec_pp default_uscs_ppzksnark_pp; diff --git a/src/common/libsnark_serialization.hpp b/src/common/libsnark_serialization.hpp index a54af836..5126eb0f 100644 --- a/src/common/libsnark_serialization.hpp +++ b/src/common/libsnark_serialization.hpp @@ -12,7 +12,7 @@ #ifndef LIBSNARK_SERIALIZATION_HPP_ #define LIBSNARK_SERIALIZATION_HPP_ -#include "common/serialization.hpp" +#include namespace libsnark { using libff::consume_newline; diff --git a/src/common/routing_algorithms/as_waksman_routing_algorithm.hpp b/src/common/routing_algorithms/as_waksman_routing_algorithm.hpp index 073bda16..fb7991a9 100644 --- a/src/common/routing_algorithms/as_waksman_routing_algorithm.hpp +++ b/src/common/routing_algorithms/as_waksman_routing_algorithm.hpp @@ -42,7 +42,7 @@ #include #include -#include "common/utils.hpp" +#include #include "common/data_structures/integer_permutation.hpp" namespace libsnark { diff --git a/src/common/routing_algorithms/benes_routing_algorithm.hpp b/src/common/routing_algorithms/benes_routing_algorithm.hpp index 4f3f0fd8..41897e07 100644 --- a/src/common/routing_algorithms/benes_routing_algorithm.hpp +++ b/src/common/routing_algorithms/benes_routing_algorithm.hpp @@ -28,7 +28,7 @@ #include #include "common/data_structures/integer_permutation.hpp" -#include "common/utils.hpp" +#include namespace libsnark { diff --git a/src/common/routing_algorithms/profiling/profile_routing_algorithms.cpp b/src/common/routing_algorithms/profiling/profile_routing_algorithms.cpp index e139a690..dd78acd4 100644 --- a/src/common/routing_algorithms/profiling/profile_routing_algorithms.cpp +++ b/src/common/routing_algorithms/profiling/profile_routing_algorithms.cpp @@ -11,7 +11,7 @@ #include -#include "common/profiling.hpp" +#include #include "common/routing_algorithms/as_waksman_routing_algorithm.hpp" #include "common/routing_algorithms/benes_routing_algorithm.hpp" diff --git a/src/common/routing_algorithms/tests/test_routing_algorithms.cpp b/src/common/routing_algorithms/tests/test_routing_algorithms.cpp index e637c5d8..5bb19e16 100644 --- a/src/common/routing_algorithms/tests/test_routing_algorithms.cpp +++ b/src/common/routing_algorithms/tests/test_routing_algorithms.cpp @@ -11,7 +11,7 @@ #include -#include "common/profiling.hpp" +#include #include "common/routing_algorithms/benes_routing_algorithm.hpp" #include "common/routing_algorithms/as_waksman_routing_algorithm.hpp" diff --git a/src/gadgetlib1/constraint_profiling.cpp b/src/gadgetlib1/constraint_profiling.cpp index 706c244d..96ac6794 100644 --- a/src/gadgetlib1/constraint_profiling.cpp +++ b/src/gadgetlib1/constraint_profiling.cpp @@ -12,7 +12,7 @@ *****************************************************************************/ #include "gadgetlib1/constraint_profiling.hpp" -#include "common/profiling.hpp" +#include namespace libsnark { diff --git a/src/gadgetlib1/gadgets/basic_gadgets.tcc b/src/gadgetlib1/gadgets/basic_gadgets.tcc index b49c29b2..fdda31f3 100644 --- a/src/gadgetlib1/gadgets/basic_gadgets.tcc +++ b/src/gadgetlib1/gadgets/basic_gadgets.tcc @@ -8,8 +8,8 @@ #ifndef BASIC_GADGETS_TCC_ #define BASIC_GADGETS_TCC_ -#include "common/profiling.hpp" -#include "common/utils.hpp" +#include +#include namespace libsnark { diff --git a/src/gadgetlib1/gadgets/cpu_checkers/fooram/examples/test_fooram.cpp b/src/gadgetlib1/gadgets/cpu_checkers/fooram/examples/test_fooram.cpp index 3b0beb03..30b8c9f2 100644 --- a/src/gadgetlib1/gadgets/cpu_checkers/fooram/examples/test_fooram.cpp +++ b/src/gadgetlib1/gadgets/cpu_checkers/fooram/examples/test_fooram.cpp @@ -6,7 +6,7 @@ *****************************************************************************/ #include "common/default_types/r1cs_ppzksnark_pp.hpp" #include "common/default_types/r1cs_ppzkpcd_pp.hpp" -#include "common/utils.hpp" +#include #include "zk_proof_systems/zksnark/ram_zksnark/examples/run_ram_zksnark.hpp" #include "zk_proof_systems/ppzksnark/ram_ppzksnark/examples/run_ram_ppzksnark.hpp" diff --git a/src/gadgetlib1/gadgets/cpu_checkers/fooram/fooram_cpu_checker.hpp b/src/gadgetlib1/gadgets/cpu_checkers/fooram/fooram_cpu_checker.hpp index d12198f4..f2791b6e 100644 --- a/src/gadgetlib1/gadgets/cpu_checkers/fooram/fooram_cpu_checker.hpp +++ b/src/gadgetlib1/gadgets/cpu_checkers/fooram/fooram_cpu_checker.hpp @@ -28,7 +28,7 @@ #include #include -#include "common/serialization.hpp" +#include #include "gadgetlib1/gadget.hpp" #include "gadgetlib1/gadgets/basic_gadgets.hpp" #include "gadgetlib1/gadgets/cpu_checkers/fooram/components/fooram_protoboard.hpp" diff --git a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_arithmetic.tcc b/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_arithmetic.tcc index c1e7df32..a8172146 100644 --- a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_arithmetic.tcc +++ b/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_arithmetic.tcc @@ -16,8 +16,8 @@ #include -#include "common/profiling.hpp" -#include "common/utils.hpp" +#include +#include namespace libsnark { diff --git a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_control_flow.tcc b/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_control_flow.tcc index 614b29de..7bb83f25 100644 --- a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_control_flow.tcc +++ b/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_control_flow.tcc @@ -14,7 +14,7 @@ #ifndef ALU_CONTROL_FLOW_TCC_ #define ALU_CONTROL_FLOW_TCC_ -#include "common/profiling.hpp" +#include namespace libsnark { diff --git a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/tinyram_cpu_checker.tcc b/src/gadgetlib1/gadgets/cpu_checkers/tinyram/tinyram_cpu_checker.tcc index 446ec8b6..736f365f 100644 --- a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/tinyram_cpu_checker.tcc +++ b/src/gadgetlib1/gadgets/cpu_checkers/tinyram/tinyram_cpu_checker.tcc @@ -14,7 +14,7 @@ #ifndef TINYRAM_CPU_CHECKER_TCC_ #define TINYRAM_CPU_CHECKER_TCC_ -#include "algebra/fields/field_utils.hpp" +#include namespace libsnark { diff --git a/src/gadgetlib1/gadgets/curves/weierstrass_g2_gadget.tcc b/src/gadgetlib1/gadgets/curves/weierstrass_g2_gadget.tcc index cf4f193f..6342da7d 100644 --- a/src/gadgetlib1/gadgets/curves/weierstrass_g2_gadget.tcc +++ b/src/gadgetlib1/gadgets/curves/weierstrass_g2_gadget.tcc @@ -14,7 +14,7 @@ #ifndef WEIERSTRASS_G2_GADGET_TCC_ #define WEIERSTRASS_G2_GADGET_TCC_ -#include "algebra/scalar_multiplication/wnaf.hpp" +#include namespace libsnark { diff --git a/src/gadgetlib1/gadgets/fields/exponentiation_gadget.hpp b/src/gadgetlib1/gadgets/fields/exponentiation_gadget.hpp index 6ac84082..9a5e8413 100644 --- a/src/gadgetlib1/gadgets/fields/exponentiation_gadget.hpp +++ b/src/gadgetlib1/gadgets/fields/exponentiation_gadget.hpp @@ -14,8 +14,8 @@ #include #include -#include "algebra/fields/bigint.hpp" -#include "algebra/scalar_multiplication/wnaf.hpp" +#include +#include #include "gadgetlib1/gadget.hpp" namespace libsnark { diff --git a/src/gadgetlib1/gadgets/hashes/knapsack/knapsack_gadget.tcc b/src/gadgetlib1/gadgets/hashes/knapsack/knapsack_gadget.tcc index cc279104..e9512464 100644 --- a/src/gadgetlib1/gadgets/hashes/knapsack/knapsack_gadget.tcc +++ b/src/gadgetlib1/gadgets/hashes/knapsack/knapsack_gadget.tcc @@ -14,8 +14,8 @@ #ifndef KNAPSACK_GADGET_TCC_ #define KNAPSACK_GADGET_TCC_ -#include "algebra/fields/field_utils.hpp" -#include "common/rng.hpp" +#include +#include namespace libsnark { diff --git a/src/gadgetlib1/gadgets/hashes/knapsack/tests/test_knapsack_gadget.cpp b/src/gadgetlib1/gadgets/hashes/knapsack/tests/test_knapsack_gadget.cpp index be30fea4..9aaeaeb0 100644 --- a/src/gadgetlib1/gadgets/hashes/knapsack/tests/test_knapsack_gadget.cpp +++ b/src/gadgetlib1/gadgets/hashes/knapsack/tests/test_knapsack_gadget.cpp @@ -6,11 +6,11 @@ *****************************************************************************/ #ifdef CURVE_BN128 -#include "algebra/curves/bn128/bn128_pp.hpp" +#include #endif -#include "algebra/curves/edwards/edwards_pp.hpp" -#include "algebra/curves/mnt/mnt4/mnt4_pp.hpp" -#include "algebra/curves/mnt/mnt6/mnt6_pp.hpp" +#include +#include +#include #include "gadgetlib1/gadgets/hashes/knapsack/knapsack_gadget.hpp" namespace libsnark { diff --git a/src/gadgetlib1/gadgets/hashes/sha256/tests/test_sha256_gadget.cpp b/src/gadgetlib1/gadgets/hashes/sha256/tests/test_sha256_gadget.cpp index 90d55876..5046f3a6 100644 --- a/src/gadgetlib1/gadgets/hashes/sha256/tests/test_sha256_gadget.cpp +++ b/src/gadgetlib1/gadgets/hashes/sha256/tests/test_sha256_gadget.cpp @@ -5,9 +5,9 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include "common/default_types/ec_pp.hpp" -#include "common/utils.hpp" -#include "common/profiling.hpp" +#include +#include +#include #include "gadgetlib1/gadgets/hashes/sha256/sha256_gadget.hpp" using namespace libsnark; diff --git a/src/gadgetlib1/gadgets/merkle_tree/tests/test_merkle_tree_gadgets.cpp b/src/gadgetlib1/gadgets/merkle_tree/tests/test_merkle_tree_gadgets.cpp index 5b8915e5..30399c6e 100644 --- a/src/gadgetlib1/gadgets/merkle_tree/tests/test_merkle_tree_gadgets.cpp +++ b/src/gadgetlib1/gadgets/merkle_tree/tests/test_merkle_tree_gadgets.cpp @@ -6,11 +6,11 @@ *****************************************************************************/ #ifdef CURVE_BN128 -#include "algebra/curves/bn128/bn128_pp.hpp" +#include #endif -#include "algebra/curves/edwards/edwards_pp.hpp" -#include "algebra/curves/mnt/mnt4/mnt4_pp.hpp" -#include "algebra/curves/mnt/mnt6/mnt6_pp.hpp" +#include +#include +#include #include "gadgetlib1/gadgets/merkle_tree/merkle_tree_check_read_gadget.hpp" #include "gadgetlib1/gadgets/merkle_tree/merkle_tree_check_update_gadget.hpp" #include "gadgetlib1/gadgets/hashes/sha256/sha256_gadget.hpp" diff --git a/src/gadgetlib1/gadgets/pairing/mnt_pairing_params.hpp b/src/gadgetlib1/gadgets/pairing/mnt_pairing_params.hpp index 13434b36..f521952f 100644 --- a/src/gadgetlib1/gadgets/pairing/mnt_pairing_params.hpp +++ b/src/gadgetlib1/gadgets/pairing/mnt_pairing_params.hpp @@ -16,8 +16,8 @@ #ifndef MNT_PAIRING_PARAMS_HPP_ #define MNT_PAIRING_PARAMS_HPP_ -#include "algebra/curves/mnt/mnt4/mnt4_pp.hpp" -#include "algebra/curves/mnt/mnt6/mnt6_pp.hpp" +#include +#include #include "gadgetlib1/gadgets/pairing/pairing_params.hpp" #include "gadgetlib1/gadgets/fields/fp2_gadgets.hpp" #include "gadgetlib1/gadgets/fields/fp4_gadgets.hpp" diff --git a/src/gadgetlib1/gadgets/pairing/weierstrass_miller_loop.tcc b/src/gadgetlib1/gadgets/pairing/weierstrass_miller_loop.tcc index 348c20ef..e1b49b8d 100644 --- a/src/gadgetlib1/gadgets/pairing/weierstrass_miller_loop.tcc +++ b/src/gadgetlib1/gadgets/pairing/weierstrass_miller_loop.tcc @@ -14,7 +14,7 @@ #ifndef WEIERSTRASS_MILLER_LOOP_TCC_ #define WEIERSTRASS_MILLER_LOOP_TCC_ -#include "algebra/scalar_multiplication/wnaf.hpp" +#include #include "gadgetlib1/constraint_profiling.hpp" #include "gadgetlib1/gadgets/basic_gadgets.hpp" diff --git a/src/gadgetlib1/gadgets/routing/as_waksman_routing_gadget.tcc b/src/gadgetlib1/gadgets/routing/as_waksman_routing_gadget.tcc index 5cd592ab..cb7eb6be 100644 --- a/src/gadgetlib1/gadgets/routing/as_waksman_routing_gadget.tcc +++ b/src/gadgetlib1/gadgets/routing/as_waksman_routing_gadget.tcc @@ -17,7 +17,7 @@ #include #include "common/routing_algorithms/as_waksman_routing_algorithm.hpp" -#include "common/profiling.hpp" +#include namespace libsnark { diff --git a/src/gadgetlib1/gadgets/routing/benes_routing_gadget.tcc b/src/gadgetlib1/gadgets/routing/benes_routing_gadget.tcc index 32de7109..1ec9c789 100644 --- a/src/gadgetlib1/gadgets/routing/benes_routing_gadget.tcc +++ b/src/gadgetlib1/gadgets/routing/benes_routing_gadget.tcc @@ -14,7 +14,7 @@ #ifndef BENES_ROUTING_GADGET_TCC_ #define BENES_ROUTING_GADGET_TCC_ -#include "common/profiling.hpp" +#include #include diff --git a/src/gadgetlib1/gadgets/routing/profiling/profile_routing_gadgets.cpp b/src/gadgetlib1/gadgets/routing/profiling/profile_routing_gadgets.cpp index f2371007..45b6d650 100644 --- a/src/gadgetlib1/gadgets/routing/profiling/profile_routing_gadgets.cpp +++ b/src/gadgetlib1/gadgets/routing/profiling/profile_routing_gadgets.cpp @@ -11,8 +11,8 @@ #include -#include "common/default_types/ec_pp.hpp" -#include "common/profiling.hpp" +#include +#include #include "gadgetlib1/gadgets/routing/benes_routing_gadget.hpp" #include "gadgetlib1/gadgets/routing/as_waksman_routing_gadget.hpp" diff --git a/src/gadgetlib1/gadgets/set_commitment/tests/test_set_commitment_gadget.cpp b/src/gadgetlib1/gadgets/set_commitment/tests/test_set_commitment_gadget.cpp index 12f7875b..f8fccfc9 100644 --- a/src/gadgetlib1/gadgets/set_commitment/tests/test_set_commitment_gadget.cpp +++ b/src/gadgetlib1/gadgets/set_commitment/tests/test_set_commitment_gadget.cpp @@ -6,11 +6,11 @@ *****************************************************************************/ #ifdef CURVE_BN128 -#include "algebra/curves/bn128/bn128_pp.hpp" +#include #endif -#include "algebra/curves/edwards/edwards_pp.hpp" -#include "algebra/curves/mnt/mnt4/mnt4_pp.hpp" -#include "algebra/curves/mnt/mnt6/mnt6_pp.hpp" +#include +#include +#include #include "gadgetlib1/gadgets/set_commitment/set_commitment_gadget.hpp" #include "gadgetlib1/gadgets/hashes/sha256/sha256_gadget.hpp" diff --git a/src/gadgetlib1/gadgets/verifiers/tests/test_r1cs_ppzksnark_verifier_gadget.cpp b/src/gadgetlib1/gadgets/verifiers/tests/test_r1cs_ppzksnark_verifier_gadget.cpp index 69bd9f3a..6cf947e6 100644 --- a/src/gadgetlib1/gadgets/verifiers/tests/test_r1cs_ppzksnark_verifier_gadget.cpp +++ b/src/gadgetlib1/gadgets/verifiers/tests/test_r1cs_ppzksnark_verifier_gadget.cpp @@ -4,9 +4,9 @@ * and contributors (see AUTHORS). * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include "algebra/curves/mnt/mnt4/mnt4_pp.hpp" -#include "algebra/curves/mnt/mnt6/mnt6_pp.hpp" -#include "algebra/fields/field_utils.hpp" +#include +#include +#include #include "gadgetlib1/gadgets/fields/fp2_gadgets.hpp" #include "gadgetlib1/gadgets/fields/fp3_gadgets.hpp" #include "gadgetlib1/gadgets/fields/fp4_gadgets.hpp" diff --git a/src/gadgetlib1/pb_variable.hpp b/src/gadgetlib1/pb_variable.hpp index fcdd4580..d4406bbb 100644 --- a/src/gadgetlib1/pb_variable.hpp +++ b/src/gadgetlib1/pb_variable.hpp @@ -11,7 +11,7 @@ #include #include #include -#include "common/utils.hpp" +#include #include "relations/variable.hpp" namespace libsnark { diff --git a/src/gadgetlib1/pb_variable.tcc b/src/gadgetlib1/pb_variable.tcc index 71a5c5ab..705dda3a 100644 --- a/src/gadgetlib1/pb_variable.tcc +++ b/src/gadgetlib1/pb_variable.tcc @@ -9,7 +9,7 @@ #define PB_VARIABLE_TCC_ #include #include "gadgetlib1/protoboard.hpp" -#include "common/utils.hpp" +#include namespace libsnark { diff --git a/src/gadgetlib1/protoboard.hpp b/src/gadgetlib1/protoboard.hpp index a9c30b46..411120a6 100644 --- a/src/gadgetlib1/protoboard.hpp +++ b/src/gadgetlib1/protoboard.hpp @@ -15,7 +15,7 @@ #include #include "gadgetlib1/pb_variable.hpp" #include "relations/constraint_satisfaction_problems/r1cs/r1cs.hpp" -#include "common/utils.hpp" +#include namespace libsnark { diff --git a/src/gadgetlib1/protoboard.tcc b/src/gadgetlib1/protoboard.tcc index 6278e5a5..1f0e6c0e 100644 --- a/src/gadgetlib1/protoboard.tcc +++ b/src/gadgetlib1/protoboard.tcc @@ -10,7 +10,7 @@ #include #include -#include "common/profiling.hpp" +#include namespace libsnark { diff --git a/src/gadgetlib2/examples/simple_example.hpp b/src/gadgetlib2/examples/simple_example.hpp index 113953ee..25e6d0c8 100644 --- a/src/gadgetlib2/examples/simple_example.hpp +++ b/src/gadgetlib2/examples/simple_example.hpp @@ -8,7 +8,7 @@ #ifndef SIMPLE_EXAMPLE_HPP_ #define SIMPLE_EXAMPLE_HPP_ -#include "common/default_types/ec_pp.hpp" +#include #include "relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp" namespace libsnark { diff --git a/src/gadgetlib2/infrastructure.hpp b/src/gadgetlib2/infrastructure.hpp index 40801d9e..077ea221 100644 --- a/src/gadgetlib2/infrastructure.hpp +++ b/src/gadgetlib2/infrastructure.hpp @@ -12,7 +12,7 @@ #include #include #include -#include "common/utils.hpp" +#include #ifndef __infrastructure_HPP #define __infrastructure_HPP diff --git a/src/gadgetlib2/integration.hpp b/src/gadgetlib2/integration.hpp index bcaf634a..730212ca 100644 --- a/src/gadgetlib2/integration.hpp +++ b/src/gadgetlib2/integration.hpp @@ -8,7 +8,7 @@ #ifndef INTEGRATION_HPP_ #define INTEGRATION_HPP_ -#include "common/default_types/ec_pp.hpp" +#include #include "relations/constraint_satisfaction_problems/r1cs/r1cs.hpp" #include "gadgetlib2/protoboard.hpp" diff --git a/src/gadgetlib2/pp.hpp b/src/gadgetlib2/pp.hpp index a1a27f6a..16f692c2 100644 --- a/src/gadgetlib2/pp.hpp +++ b/src/gadgetlib2/pp.hpp @@ -10,7 +10,7 @@ #ifndef LIBSNARK_GADGETLIB2_INCLUDE_GADGETLIB2_PP_HPP_ #define LIBSNARK_GADGETLIB2_INCLUDE_GADGETLIB2_PP_HPP_ -#include "common/default_types/ec_pp.hpp" +#include #include #include diff --git a/src/knowledge_commitment/knowledge_commitment.hpp b/src/knowledge_commitment/knowledge_commitment.hpp index 005c7023..9bac87aa 100644 --- a/src/knowledge_commitment/knowledge_commitment.hpp +++ b/src/knowledge_commitment/knowledge_commitment.hpp @@ -14,7 +14,7 @@ #ifndef KNOWLEDGE_COMMITMENT_HPP_ #define KNOWLEDGE_COMMITMENT_HPP_ -#include "algebra/fields/fp.hpp" +#include #include "common/data_structures/sparse_vector.hpp" namespace libsnark { diff --git a/src/reductions/r1cs_to_qap/r1cs_to_qap.tcc b/src/reductions/r1cs_to_qap/r1cs_to_qap.tcc index 0aafe2be..0a94a5ef 100644 --- a/src/reductions/r1cs_to_qap/r1cs_to_qap.tcc +++ b/src/reductions/r1cs_to_qap/r1cs_to_qap.tcc @@ -14,9 +14,9 @@ #ifndef R1CS_TO_QAP_TCC_ #define R1CS_TO_QAP_TCC_ -#include "common/profiling.hpp" -#include "common/utils.hpp" -#include "evaluation_domain/evaluation_domain.hpp" +#include +#include +#include namespace libsnark { diff --git a/src/reductions/ram_to_r1cs/examples/demo_arithmetization.cpp b/src/reductions/ram_to_r1cs/examples/demo_arithmetization.cpp index 7aa594ba..5c578cc2 100644 --- a/src/reductions/ram_to_r1cs/examples/demo_arithmetization.cpp +++ b/src/reductions/ram_to_r1cs/examples/demo_arithmetization.cpp @@ -14,7 +14,7 @@ #endif #include "common/default_types/tinyram_ppzksnark_pp.hpp" -#include "common/profiling.hpp" +#include #include "reductions/ram_to_r1cs/ram_to_r1cs.hpp" #include "relations/ram_computations/rams/tinyram/tinyram_params.hpp" #include "zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark.hpp" diff --git a/src/reductions/ram_to_r1cs/gadgets/ram_universal_gadget.tcc b/src/reductions/ram_to_r1cs/gadgets/ram_universal_gadget.tcc index 02e04ec6..3fa25eda 100644 --- a/src/reductions/ram_to_r1cs/gadgets/ram_universal_gadget.tcc +++ b/src/reductions/ram_to_r1cs/gadgets/ram_universal_gadget.tcc @@ -15,9 +15,9 @@ #define RAM_UNIVERSAL_GADGET_TCC_ #include "common/data_structures/integer_permutation.hpp" -#include "common/profiling.hpp" -#include "common/utils.hpp" -#include "algebra/fields/field_utils.hpp" +#include +#include +#include #include "relations/ram_computations/memory/ra_memory.hpp" namespace libsnark { diff --git a/src/reductions/tbcs_to_uscs/tbcs_to_uscs.tcc b/src/reductions/tbcs_to_uscs/tbcs_to_uscs.tcc index 5ee657b6..7c4935a6 100644 --- a/src/reductions/tbcs_to_uscs/tbcs_to_uscs.tcc +++ b/src/reductions/tbcs_to_uscs/tbcs_to_uscs.tcc @@ -14,7 +14,7 @@ See tbcs_to_uscs.hpp . #ifndef TBCS_TO_USCS_TCC_ #define TBCS_TO_USCS_TCC_ -#include "algebra/fields/field_utils.hpp" +#include namespace libsnark { diff --git a/src/reductions/uscs_to_ssp/uscs_to_ssp.tcc b/src/reductions/uscs_to_ssp/uscs_to_ssp.tcc index bb17164f..9c0999eb 100644 --- a/src/reductions/uscs_to_ssp/uscs_to_ssp.tcc +++ b/src/reductions/uscs_to_ssp/uscs_to_ssp.tcc @@ -14,9 +14,9 @@ #ifndef USCS_TO_SSP_TCC_ #define USCS_TO_SSP_TCC_ -#include "common/profiling.hpp" -#include "common/utils.hpp" -#include "evaluation_domain/evaluation_domain.hpp" +#include +#include +#include namespace libsnark { diff --git a/src/relations/arithmetic_programs/qap/qap.hpp b/src/relations/arithmetic_programs/qap/qap.hpp index 77818daf..adcf4355 100644 --- a/src/relations/arithmetic_programs/qap/qap.hpp +++ b/src/relations/arithmetic_programs/qap/qap.hpp @@ -22,7 +22,7 @@ #ifndef QAP_HPP_ #define QAP_HPP_ -#include "evaluation_domain/evaluation_domain.hpp" +#include namespace libsnark { diff --git a/src/relations/arithmetic_programs/qap/qap.tcc b/src/relations/arithmetic_programs/qap/qap.tcc index 4c6cfdc5..d9ec255d 100644 --- a/src/relations/arithmetic_programs/qap/qap.tcc +++ b/src/relations/arithmetic_programs/qap/qap.tcc @@ -14,10 +14,10 @@ See qap.hpp . #ifndef QAP_TCC_ #define QAP_TCC_ -#include "common/profiling.hpp" -#include "common/utils.hpp" -#include "evaluation_domain/evaluation_domain.hpp" -#include "algebra/scalar_multiplication/multiexp.hpp" +#include +#include +#include +#include namespace libsnark { diff --git a/src/relations/arithmetic_programs/qap/tests/test_qap.cpp b/src/relations/arithmetic_programs/qap/tests/test_qap.cpp index 987a8b5c..1421c00d 100644 --- a/src/relations/arithmetic_programs/qap/tests/test_qap.cpp +++ b/src/relations/arithmetic_programs/qap/tests/test_qap.cpp @@ -10,10 +10,10 @@ #include #include -#include "algebra/curves/mnt/mnt6/mnt6_pp.hpp" -#include "algebra/fields/field_utils.hpp" -#include "common/profiling.hpp" -#include "common/utils.hpp" +#include +#include +#include +#include #include "reductions/r1cs_to_qap/r1cs_to_qap.hpp" #include "relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp" diff --git a/src/relations/arithmetic_programs/ssp/ssp.hpp b/src/relations/arithmetic_programs/ssp/ssp.hpp index 5f13cad2..f2fe9758 100644 --- a/src/relations/arithmetic_programs/ssp/ssp.hpp +++ b/src/relations/arithmetic_programs/ssp/ssp.hpp @@ -22,7 +22,7 @@ #ifndef SSP_HPP_ #define SSP_HPP_ -#include "evaluation_domain/evaluation_domain.hpp" +#include namespace libsnark { diff --git a/src/relations/arithmetic_programs/ssp/ssp.tcc b/src/relations/arithmetic_programs/ssp/ssp.tcc index ea33cb50..9157c085 100644 --- a/src/relations/arithmetic_programs/ssp/ssp.tcc +++ b/src/relations/arithmetic_programs/ssp/ssp.tcc @@ -14,10 +14,10 @@ #ifndef SSP_TCC_ #define SSP_TCC_ -#include "common/profiling.hpp" -#include "common/utils.hpp" -#include "evaluation_domain/evaluation_domain.hpp" -#include "algebra/scalar_multiplication/multiexp.hpp" +#include +#include +#include +#include namespace libsnark { diff --git a/src/relations/arithmetic_programs/ssp/tests/test_ssp.cpp b/src/relations/arithmetic_programs/ssp/tests/test_ssp.cpp index 5a3a61f1..d7a403f2 100644 --- a/src/relations/arithmetic_programs/ssp/tests/test_ssp.cpp +++ b/src/relations/arithmetic_programs/ssp/tests/test_ssp.cpp @@ -10,10 +10,10 @@ #include #include -#include "algebra/curves/mnt/mnt6/mnt6_pp.hpp" -#include "algebra/fields/field_utils.hpp" -#include "common/profiling.hpp" -#include "common/utils.hpp" +#include +#include +#include +#include #include "reductions/uscs_to_ssp/uscs_to_ssp.hpp" #include "relations/constraint_satisfaction_problems/uscs/examples/uscs_examples.hpp" diff --git a/src/relations/circuit_satisfaction_problems/bacs/bacs.tcc b/src/relations/circuit_satisfaction_problems/bacs/bacs.tcc index 9012135d..a6bcf74c 100644 --- a/src/relations/circuit_satisfaction_problems/bacs/bacs.tcc +++ b/src/relations/circuit_satisfaction_problems/bacs/bacs.tcc @@ -20,8 +20,8 @@ #define BACS_TCC_ #include -#include "common/profiling.hpp" -#include "common/utils.hpp" +#include +#include namespace libsnark { diff --git a/src/relations/circuit_satisfaction_problems/bacs/examples/bacs_examples.tcc b/src/relations/circuit_satisfaction_problems/bacs/examples/bacs_examples.tcc index d4fca1f4..da499a7f 100644 --- a/src/relations/circuit_satisfaction_problems/bacs/examples/bacs_examples.tcc +++ b/src/relations/circuit_satisfaction_problems/bacs/examples/bacs_examples.tcc @@ -17,7 +17,7 @@ #include -#include "common/utils.hpp" +#include namespace libsnark { diff --git a/src/relations/circuit_satisfaction_problems/tbcs/examples/tbcs_examples.cpp b/src/relations/circuit_satisfaction_problems/tbcs/examples/tbcs_examples.cpp index c8e703ef..1b5ab1dc 100644 --- a/src/relations/circuit_satisfaction_problems/tbcs/examples/tbcs_examples.cpp +++ b/src/relations/circuit_satisfaction_problems/tbcs/examples/tbcs_examples.cpp @@ -16,7 +16,7 @@ #include -#include "common/utils.hpp" +#include namespace libsnark { diff --git a/src/relations/circuit_satisfaction_problems/tbcs/tbcs.cpp b/src/relations/circuit_satisfaction_problems/tbcs/tbcs.cpp index 2e63af20..a6945fd3 100644 --- a/src/relations/circuit_satisfaction_problems/tbcs/tbcs.cpp +++ b/src/relations/circuit_satisfaction_problems/tbcs/tbcs.cpp @@ -17,7 +17,7 @@ #include "relations/circuit_satisfaction_problems/tbcs/tbcs.hpp" #include -#include "common/utils.hpp" +#include namespace libsnark { diff --git a/src/relations/circuit_satisfaction_problems/tbcs/tbcs.hpp b/src/relations/circuit_satisfaction_problems/tbcs/tbcs.hpp index cc1f96f5..dc7d2aed 100644 --- a/src/relations/circuit_satisfaction_problems/tbcs/tbcs.hpp +++ b/src/relations/circuit_satisfaction_problems/tbcs/tbcs.hpp @@ -17,7 +17,7 @@ #ifndef TBCS_HPP_ #define TBCS_HPP_ -#include "common/profiling.hpp" +#include #include "relations/variable.hpp" namespace libsnark { diff --git a/src/relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.tcc b/src/relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.tcc index f7c2386f..576bb08a 100644 --- a/src/relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.tcc +++ b/src/relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.tcc @@ -17,7 +17,7 @@ #include -#include "common/utils.hpp" +#include namespace libsnark { diff --git a/src/relations/constraint_satisfaction_problems/r1cs/r1cs.tcc b/src/relations/constraint_satisfaction_problems/r1cs/r1cs.tcc index 41fc87d1..f0684784 100644 --- a/src/relations/constraint_satisfaction_problems/r1cs/r1cs.tcc +++ b/src/relations/constraint_satisfaction_problems/r1cs/r1cs.tcc @@ -20,9 +20,9 @@ #include #include #include -#include "common/utils.hpp" -#include "common/profiling.hpp" -#include "algebra/fields/bigint.hpp" +#include +#include +#include namespace libsnark { diff --git a/src/relations/constraint_satisfaction_problems/uscs/examples/uscs_examples.tcc b/src/relations/constraint_satisfaction_problems/uscs/examples/uscs_examples.tcc index bc2ebcbf..99bd753f 100644 --- a/src/relations/constraint_satisfaction_problems/uscs/examples/uscs_examples.tcc +++ b/src/relations/constraint_satisfaction_problems/uscs/examples/uscs_examples.tcc @@ -17,7 +17,7 @@ #include -#include "common/utils.hpp" +#include namespace libsnark { diff --git a/src/relations/constraint_satisfaction_problems/uscs/uscs.tcc b/src/relations/constraint_satisfaction_problems/uscs/uscs.tcc index 10cc839b..3f730477 100644 --- a/src/relations/constraint_satisfaction_problems/uscs/uscs.tcc +++ b/src/relations/constraint_satisfaction_problems/uscs/uscs.tcc @@ -20,9 +20,9 @@ #include #include #include -#include "common/utils.hpp" -#include "common/profiling.hpp" -#include "algebra/fields/bigint.hpp" +#include +#include +#include namespace libsnark { diff --git a/src/relations/ram_computations/memory/delegated_ra_memory.tcc b/src/relations/ram_computations/memory/delegated_ra_memory.tcc index 536eed14..e00c5638 100644 --- a/src/relations/ram_computations/memory/delegated_ra_memory.tcc +++ b/src/relations/ram_computations/memory/delegated_ra_memory.tcc @@ -16,8 +16,8 @@ #include -#include "common/profiling.hpp" -#include "common/utils.hpp" +#include +#include namespace libsnark { diff --git a/src/relations/ram_computations/rams/fooram/fooram_aux.cpp b/src/relations/ram_computations/rams/fooram/fooram_aux.cpp index 599f57e0..c557ca4b 100644 --- a/src/relations/ram_computations/rams/fooram/fooram_aux.cpp +++ b/src/relations/ram_computations/rams/fooram/fooram_aux.cpp @@ -13,7 +13,7 @@ #include "relations/ram_computations/rams/fooram/fooram_aux.hpp" -#include "common/serialization.hpp" +#include namespace libsnark { diff --git a/src/relations/ram_computations/rams/fooram/fooram_aux.hpp b/src/relations/ram_computations/rams/fooram/fooram_aux.hpp index 495cc96d..dfee38c5 100644 --- a/src/relations/ram_computations/rams/fooram/fooram_aux.hpp +++ b/src/relations/ram_computations/rams/fooram/fooram_aux.hpp @@ -15,7 +15,7 @@ #include #include -#include "common/utils.hpp" +#include #include "relations/ram_computations/memory/memory_interface.hpp" namespace libsnark { diff --git a/src/relations/ram_computations/rams/tinyram/tinyram_aux.cpp b/src/relations/ram_computations/rams/tinyram/tinyram_aux.cpp index deceecbe..411e7be2 100644 --- a/src/relations/ram_computations/rams/tinyram/tinyram_aux.cpp +++ b/src/relations/ram_computations/rams/tinyram/tinyram_aux.cpp @@ -15,9 +15,9 @@ #include #include -#include "common/profiling.hpp" +#include #include "relations/ram_computations/rams/tinyram/tinyram_aux.hpp" -#include "common/utils.hpp" +#include namespace libsnark { diff --git a/src/relations/ram_computations/rams/tinyram/tinyram_aux.hpp b/src/relations/ram_computations/rams/tinyram/tinyram_aux.hpp index 169f22ee..fd0ec7d5 100644 --- a/src/relations/ram_computations/rams/tinyram/tinyram_aux.hpp +++ b/src/relations/ram_computations/rams/tinyram/tinyram_aux.hpp @@ -16,7 +16,7 @@ #include #include -#include "common/utils.hpp" +#include #include "relations/constraint_satisfaction_problems/r1cs/r1cs.hpp" #include "relations/ram_computations/memory/memory_interface.hpp" #include "relations/ram_computations/rams/ram_params.hpp" diff --git a/src/relations/variable.tcc b/src/relations/variable.tcc index a4760079..6fae8271 100644 --- a/src/relations/variable.tcc +++ b/src/relations/variable.tcc @@ -20,7 +20,7 @@ #include #include -#include "algebra/fields/bigint.hpp" +#include namespace libsnark { diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/compliance_predicate.tcc b/src/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/compliance_predicate.tcc index c881775e..75d08441 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/compliance_predicate.tcc +++ b/src/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/compliance_predicate.tcc @@ -14,7 +14,7 @@ #ifndef COMPLIANCE_PREDICATE_TCC_ #define COMPLIANCE_PREDICATE_TCC_ -#include "common/utils.hpp" +#include #include "zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd_params.hpp" namespace libsnark { diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/ppzkpcd_compliance_predicate.hpp b/src/zk_proof_systems/pcd/r1cs_pcd/ppzkpcd_compliance_predicate.hpp index 5489f9d9..354601f9 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/ppzkpcd_compliance_predicate.hpp +++ b/src/zk_proof_systems/pcd/r1cs_pcd/ppzkpcd_compliance_predicate.hpp @@ -12,7 +12,7 @@ #ifndef PPZKPCD_COMPLIANCE_PREDICATE_HPP_ #define PPZKPCD_COMPLIANCE_PREDICATE_HPP_ -#include "algebra/curves/public_params.hpp" +#include #include "zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/compliance_predicate.hpp" namespace libsnark { diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/mp_pcd_circuits.tcc b/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/mp_pcd_circuits.tcc index 13bd8f91..7f6f029a 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/mp_pcd_circuits.tcc +++ b/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/mp_pcd_circuits.tcc @@ -16,7 +16,7 @@ #define MP_PCD_CIRCUITS_TCC_ #include -#include "common/utils.hpp" +#include #include "gadgetlib1/constraint_profiling.hpp" namespace libsnark { diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd.tcc b/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd.tcc index 7cf96574..df4ec3d4 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd.tcc +++ b/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd.tcc @@ -18,8 +18,8 @@ #include #include -#include "common/profiling.hpp" -#include "common/utils.hpp" +#include +#include #include "common/libsnark_serialization.hpp" #include "zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/mp_pcd_circuits.hpp" diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd_params.hpp b/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd_params.hpp index a4df73b2..bdefd7c4 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd_params.hpp +++ b/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd_params.hpp @@ -12,7 +12,7 @@ #ifndef R1CS_MP_PPZKPCD_PARAMS_HPP_ #define R1CS_MP_PPZKPCD_PARAMS_HPP_ -#include "algebra/curves/public_params.hpp" +#include #include "zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/compliance_predicate.hpp" #include "zk_proof_systems/pcd/r1cs_pcd/r1cs_pcd_params.hpp" diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd.tcc b/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd.tcc index 98bdc24d..bf500b62 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd.tcc +++ b/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd.tcc @@ -18,8 +18,8 @@ #include #include -#include "common/profiling.hpp" -#include "common/utils.hpp" +#include +#include #include "zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/sp_pcd_circuits.hpp" namespace libsnark { diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd_params.hpp b/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd_params.hpp index 14d1ce78..1f3ae212 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd_params.hpp +++ b/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd_params.hpp @@ -12,7 +12,7 @@ #ifndef R1CS_SP_PPZKPCD_PARAMS_HPP_ #define R1CS_SP_PPZKPCD_PARAMS_HPP_ -#include "algebra/curves/public_params.hpp" +#include #include "zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/compliance_predicate.hpp" #include "zk_proof_systems/pcd/r1cs_pcd/r1cs_pcd_params.hpp" diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/sp_pcd_circuits.tcc b/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/sp_pcd_circuits.tcc index 23991c98..471423f5 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/sp_pcd_circuits.tcc +++ b/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/sp_pcd_circuits.tcc @@ -15,7 +15,7 @@ #ifndef SP_PCD_CIRCUITS_TCC_ #define SP_PCD_CIRCUITS_TCC_ -#include "common/utils.hpp" +#include #include "gadgetlib1/constraint_profiling.hpp" namespace libsnark { diff --git a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/demo_r1cs_ppzkadsnark.cpp b/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/demo_r1cs_ppzkadsnark.cpp index 0bc2b433..41a4562d 100644 --- a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/demo_r1cs_ppzkadsnark.cpp +++ b/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/demo_r1cs_ppzkadsnark.cpp @@ -11,7 +11,7 @@ #include #include "common/default_types/r1cs_ppzkadsnark_pp.hpp" -#include "common/profiling.hpp" +#include #include "zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/run_r1cs_ppzkadsnark.hpp" using namespace libsnark; diff --git a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/run_r1cs_ppzkadsnark.tcc b/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/run_r1cs_ppzkadsnark.tcc index 11881c53..12927a12 100644 --- a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/run_r1cs_ppzkadsnark.tcc +++ b/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/run_r1cs_ppzkadsnark.tcc @@ -22,7 +22,7 @@ #include #include -#include "common/profiling.hpp" +#include namespace libsnark { diff --git a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark.hpp b/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark.hpp index 53481790..b7f53f25 100644 --- a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark.hpp +++ b/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark.hpp @@ -45,7 +45,7 @@ IEEE Symposium on Security and Privacy 2015, #include -#include "algebra/curves/public_params.hpp" +#include #include "common/data_structures/accumulation_vector.hpp" #include "knowledge_commitment/knowledge_commitment.hpp" #include "relations/constraint_satisfaction_problems/r1cs/r1cs.hpp" diff --git a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark.tcc b/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark.tcc index a06fe7e6..a3d9aa06 100644 --- a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark.tcc +++ b/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark.tcc @@ -20,9 +20,9 @@ See r1cs_ppzkadsnark.hpp . #include #include -#include "common/profiling.hpp" -#include "common/utils.hpp" -#include "algebra/scalar_multiplication/multiexp.hpp" +#include +#include +#include #include "knowledge_commitment/kc_multiexp.hpp" #include "reductions/r1cs_to_qap/r1cs_to_qap.hpp" diff --git a/src/zk_proof_systems/ppzksnark/bacs_ppzksnark/examples/run_bacs_ppzksnark.tcc b/src/zk_proof_systems/ppzksnark/bacs_ppzksnark/examples/run_bacs_ppzksnark.tcc index 09c00759..e63520f6 100644 --- a/src/zk_proof_systems/ppzksnark/bacs_ppzksnark/examples/run_bacs_ppzksnark.tcc +++ b/src/zk_proof_systems/ppzksnark/bacs_ppzksnark/examples/run_bacs_ppzksnark.tcc @@ -19,7 +19,7 @@ #include -#include "common/profiling.hpp" +#include namespace libsnark { diff --git a/src/zk_proof_systems/ppzksnark/bacs_ppzksnark/profiling/profile_bacs_ppzksnark.cpp b/src/zk_proof_systems/ppzksnark/bacs_ppzksnark/profiling/profile_bacs_ppzksnark.cpp index 9b350b6f..025aeaa6 100644 --- a/src/zk_proof_systems/ppzksnark/bacs_ppzksnark/profiling/profile_bacs_ppzksnark.cpp +++ b/src/zk_proof_systems/ppzksnark/bacs_ppzksnark/profiling/profile_bacs_ppzksnark.cpp @@ -20,7 +20,7 @@ #include #include "common/default_types/bacs_ppzksnark_pp.hpp" -#include "common/profiling.hpp" +#include #include "relations/circuit_satisfaction_problems/bacs/examples/bacs_examples.hpp" #include "zk_proof_systems/ppzksnark/bacs_ppzksnark/examples/run_bacs_ppzksnark.hpp" diff --git a/src/zk_proof_systems/ppzksnark/bacs_ppzksnark/tests/test_bacs_ppzksnark.cpp b/src/zk_proof_systems/ppzksnark/bacs_ppzksnark/tests/test_bacs_ppzksnark.cpp index 9b9194c9..95c009c5 100644 --- a/src/zk_proof_systems/ppzksnark/bacs_ppzksnark/tests/test_bacs_ppzksnark.cpp +++ b/src/zk_proof_systems/ppzksnark/bacs_ppzksnark/tests/test_bacs_ppzksnark.cpp @@ -12,7 +12,7 @@ #include #include "common/default_types/bacs_ppzksnark_pp.hpp" -#include "common/profiling.hpp" +#include #include "relations/circuit_satisfaction_problems/bacs/examples/bacs_examples.hpp" #include "zk_proof_systems/ppzksnark/bacs_ppzksnark/examples/run_bacs_ppzksnark.hpp" diff --git a/src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/examples/run_r1cs_gg_ppzksnark.tcc b/src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/examples/run_r1cs_gg_ppzksnark.tcc index c54c0a02..13cc01e7 100644 --- a/src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/examples/run_r1cs_gg_ppzksnark.tcc +++ b/src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/examples/run_r1cs_gg_ppzksnark.tcc @@ -20,7 +20,7 @@ #include #include -#include "common/profiling.hpp" +#include namespace libsnark { diff --git a/src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/profiling/profile_r1cs_gg_ppzksnark.cpp b/src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/profiling/profile_r1cs_gg_ppzksnark.cpp index 656b1813..93d6365b 100644 --- a/src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/profiling/profile_r1cs_gg_ppzksnark.cpp +++ b/src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/profiling/profile_r1cs_gg_ppzksnark.cpp @@ -26,8 +26,8 @@ #include #include "common/default_types/r1cs_gg_ppzksnark_pp.hpp" -#include "common/profiling.hpp" -#include "common/utils.hpp" +#include +#include #include "relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp" #include "zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/examples/run_r1cs_gg_ppzksnark.hpp" diff --git a/src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark.hpp b/src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark.hpp index 64e4fa21..b7b63dc8 100644 --- a/src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark.hpp +++ b/src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark.hpp @@ -43,7 +43,7 @@ The implementation instantiates the protocol of \[Gro16]. #include -#include "algebra/curves/public_params.hpp" +#include #include "common/data_structures/accumulation_vector.hpp" #include "knowledge_commitment/knowledge_commitment.hpp" #include "relations/constraint_satisfaction_problems/r1cs/r1cs.hpp" diff --git a/src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark.tcc b/src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark.tcc index ff50855c..cc619400 100644 --- a/src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark.tcc +++ b/src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark.tcc @@ -20,9 +20,9 @@ See r1cs_gg_ppzksnark.hpp . #include #include -#include "common/profiling.hpp" -#include "common/utils.hpp" -#include "algebra/scalar_multiplication/multiexp.hpp" +#include +#include +#include #include "knowledge_commitment/kc_multiexp.hpp" #include "reductions/r1cs_to_qap/r1cs_to_qap.hpp" diff --git a/src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/tests/test_r1cs_gg_ppzksnark.cpp b/src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/tests/test_r1cs_gg_ppzksnark.cpp index ae854f7b..5cc2c1aa 100644 --- a/src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/tests/test_r1cs_gg_ppzksnark.cpp +++ b/src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/tests/test_r1cs_gg_ppzksnark.cpp @@ -12,8 +12,8 @@ #include #include "common/default_types/r1cs_gg_ppzksnark_pp.hpp" -#include "common/profiling.hpp" -#include "common/utils.hpp" +#include +#include #include "relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp" #include "zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/examples/run_r1cs_gg_ppzksnark.hpp" diff --git a/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.hpp b/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.hpp index 9ed304a2..c370afec 100644 --- a/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.hpp +++ b/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.hpp @@ -13,7 +13,7 @@ #ifndef RUN_R1CS_PPZKSNARK_HPP_ #define RUN_R1CS_PPZKSNARK_HPP_ -#include "common/default_types/ec_pp.hpp" +#include #include "relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp" namespace libsnark { diff --git a/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.tcc b/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.tcc index 3ca5d993..f4860a1a 100644 --- a/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.tcc +++ b/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.tcc @@ -20,7 +20,7 @@ #include #include -#include "common/profiling.hpp" +#include namespace libsnark { diff --git a/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/profiling/profile_r1cs_ppzksnark.cpp b/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/profiling/profile_r1cs_ppzksnark.cpp index 32a8c80e..ce5e80f2 100644 --- a/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/profiling/profile_r1cs_ppzksnark.cpp +++ b/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/profiling/profile_r1cs_ppzksnark.cpp @@ -26,8 +26,8 @@ #include #include "common/default_types/r1cs_ppzksnark_pp.hpp" -#include "common/profiling.hpp" -#include "common/utils.hpp" +#include +#include #include "relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp" #include "zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.hpp" diff --git a/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp b/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp index d29ce79c..83b4693d 100644 --- a/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp +++ b/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp @@ -48,7 +48,7 @@ #include -#include "algebra/curves/public_params.hpp" +#include #include "common/data_structures/accumulation_vector.hpp" #include "knowledge_commitment/knowledge_commitment.hpp" #include "relations/constraint_satisfaction_problems/r1cs/r1cs.hpp" diff --git a/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.tcc b/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.tcc index ba53811a..984e7d9a 100644 --- a/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.tcc +++ b/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.tcc @@ -20,9 +20,9 @@ See r1cs_ppzksnark.hpp . #include #include -#include "common/profiling.hpp" -#include "common/utils.hpp" -#include "algebra/scalar_multiplication/multiexp.hpp" +#include +#include +#include #include "knowledge_commitment/kc_multiexp.hpp" #include "reductions/r1cs_to_qap/r1cs_to_qap.hpp" diff --git a/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/tests/test_r1cs_ppzksnark.cpp b/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/tests/test_r1cs_ppzksnark.cpp index 067621a5..36dc6f6b 100644 --- a/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/tests/test_r1cs_ppzksnark.cpp +++ b/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/tests/test_r1cs_ppzksnark.cpp @@ -12,8 +12,8 @@ #include #include "common/default_types/r1cs_ppzksnark_pp.hpp" -#include "common/profiling.hpp" -#include "common/utils.hpp" +#include +#include #include "relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp" #include "zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.hpp" diff --git a/src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark.cpp b/src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark.cpp index 5acfcf9c..0aec09f4 100644 --- a/src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark.cpp +++ b/src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark.cpp @@ -14,7 +14,7 @@ #endif #include "common/default_types/tinyram_ppzksnark_pp.hpp" -#include "common/profiling.hpp" +#include #include "reductions/ram_to_r1cs/ram_to_r1cs.hpp" #include "zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark.hpp" #include "relations/ram_computations/rams/tinyram/tinyram_params.hpp" diff --git a/src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/run_ram_ppzksnark.tcc b/src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/run_ram_ppzksnark.tcc index 944ec396..73663541 100644 --- a/src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/run_ram_ppzksnark.tcc +++ b/src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/run_ram_ppzksnark.tcc @@ -19,7 +19,7 @@ #include -#include "common/profiling.hpp" +#include namespace libsnark { diff --git a/src/zk_proof_systems/ppzksnark/ram_ppzksnark/profiling/profile_ram_ppzksnark.cpp b/src/zk_proof_systems/ppzksnark/ram_ppzksnark/profiling/profile_ram_ppzksnark.cpp index 4b47361e..3ddcaa39 100644 --- a/src/zk_proof_systems/ppzksnark/ram_ppzksnark/profiling/profile_ram_ppzksnark.cpp +++ b/src/zk_proof_systems/ppzksnark/ram_ppzksnark/profiling/profile_ram_ppzksnark.cpp @@ -12,7 +12,7 @@ #include #include "common/default_types/ram_ppzksnark_pp.hpp" -#include "common/profiling.hpp" +#include #include "relations/ram_computations/rams/examples/ram_examples.hpp" #include "zk_proof_systems/ppzksnark/ram_ppzksnark/examples/run_ram_ppzksnark.hpp" #include "relations/ram_computations/rams/tinyram/tinyram_params.hpp" diff --git a/src/zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark.tcc b/src/zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark.tcc index 8db5c8bd..f57ab02f 100644 --- a/src/zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark.tcc +++ b/src/zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark.tcc @@ -14,7 +14,7 @@ #ifndef RAM_PPZKSNARK_TCC_ #define RAM_PPZKSNARK_TCC_ -#include "common/profiling.hpp" +#include #include "reductions/ram_to_r1cs/ram_to_r1cs.hpp" namespace libsnark { diff --git a/src/zk_proof_systems/ppzksnark/ram_ppzksnark/tests/test_ram_ppzksnark.cpp b/src/zk_proof_systems/ppzksnark/ram_ppzksnark/tests/test_ram_ppzksnark.cpp index fda212af..f07d4112 100644 --- a/src/zk_proof_systems/ppzksnark/ram_ppzksnark/tests/test_ram_ppzksnark.cpp +++ b/src/zk_proof_systems/ppzksnark/ram_ppzksnark/tests/test_ram_ppzksnark.cpp @@ -11,7 +11,7 @@ #include #include "common/default_types/ram_ppzksnark_pp.hpp" -#include "common/profiling.hpp" +#include #include "relations/ram_computations/rams/examples/ram_examples.hpp" #include "zk_proof_systems/ppzksnark/ram_ppzksnark/examples/run_ram_ppzksnark.hpp" diff --git a/src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/examples/run_tbcs_ppzksnark.tcc b/src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/examples/run_tbcs_ppzksnark.tcc index 1a201257..9b05fe52 100644 --- a/src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/examples/run_tbcs_ppzksnark.tcc +++ b/src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/examples/run_tbcs_ppzksnark.tcc @@ -19,7 +19,7 @@ #include -#include "common/profiling.hpp" +#include namespace libsnark { diff --git a/src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/profiling/profile_tbcs_ppzksnark.cpp b/src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/profiling/profile_tbcs_ppzksnark.cpp index 91ea273b..08a3f9e9 100644 --- a/src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/profiling/profile_tbcs_ppzksnark.cpp +++ b/src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/profiling/profile_tbcs_ppzksnark.cpp @@ -18,8 +18,8 @@ #include #include "common/default_types/tbcs_ppzksnark_pp.hpp" -#include "common/profiling.hpp" -#include "common/utils.hpp" +#include +#include #include "relations/circuit_satisfaction_problems/tbcs/examples/tbcs_examples.hpp" #include "zk_proof_systems/ppzksnark/tbcs_ppzksnark/examples/run_tbcs_ppzksnark.hpp" diff --git a/src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tests/test_tbcs_ppzksnark.cpp b/src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tests/test_tbcs_ppzksnark.cpp index 10510cc1..8d2da46d 100644 --- a/src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tests/test_tbcs_ppzksnark.cpp +++ b/src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tests/test_tbcs_ppzksnark.cpp @@ -12,7 +12,7 @@ #include #include "common/default_types/tbcs_ppzksnark_pp.hpp" -#include "common/profiling.hpp" +#include #include "relations/circuit_satisfaction_problems/tbcs/examples/tbcs_examples.hpp" #include "zk_proof_systems/ppzksnark/tbcs_ppzksnark/examples/run_tbcs_ppzksnark.hpp" diff --git a/src/zk_proof_systems/ppzksnark/uscs_ppzksnark/examples/run_uscs_ppzksnark.tcc b/src/zk_proof_systems/ppzksnark/uscs_ppzksnark/examples/run_uscs_ppzksnark.tcc index 5d3037e8..c891325b 100644 --- a/src/zk_proof_systems/ppzksnark/uscs_ppzksnark/examples/run_uscs_ppzksnark.tcc +++ b/src/zk_proof_systems/ppzksnark/uscs_ppzksnark/examples/run_uscs_ppzksnark.tcc @@ -19,7 +19,7 @@ #include -#include "common/profiling.hpp" +#include namespace libsnark { diff --git a/src/zk_proof_systems/ppzksnark/uscs_ppzksnark/profiling/profile_uscs_ppzksnark.cpp b/src/zk_proof_systems/ppzksnark/uscs_ppzksnark/profiling/profile_uscs_ppzksnark.cpp index c5ecc5d9..fe531b52 100644 --- a/src/zk_proof_systems/ppzksnark/uscs_ppzksnark/profiling/profile_uscs_ppzksnark.cpp +++ b/src/zk_proof_systems/ppzksnark/uscs_ppzksnark/profiling/profile_uscs_ppzksnark.cpp @@ -27,8 +27,8 @@ #include #include "common/default_types/uscs_ppzksnark_pp.hpp" -#include "common/profiling.hpp" -#include "common/utils.hpp" +#include +#include #include "relations/constraint_satisfaction_problems/uscs/examples/uscs_examples.hpp" #include "zk_proof_systems/ppzksnark/uscs_ppzksnark/examples/run_uscs_ppzksnark.hpp" diff --git a/src/zk_proof_systems/ppzksnark/uscs_ppzksnark/tests/test_uscs_ppzksnark.cpp b/src/zk_proof_systems/ppzksnark/uscs_ppzksnark/tests/test_uscs_ppzksnark.cpp index c8e917ce..366288a0 100644 --- a/src/zk_proof_systems/ppzksnark/uscs_ppzksnark/tests/test_uscs_ppzksnark.cpp +++ b/src/zk_proof_systems/ppzksnark/uscs_ppzksnark/tests/test_uscs_ppzksnark.cpp @@ -12,8 +12,8 @@ #include #include "common/default_types/uscs_ppzksnark_pp.hpp" -#include "common/profiling.hpp" -#include "common/utils.hpp" +#include +#include #include "relations/constraint_satisfaction_problems/uscs/examples/uscs_examples.hpp" #include "zk_proof_systems/ppzksnark/uscs_ppzksnark/examples/run_uscs_ppzksnark.hpp" diff --git a/src/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark.hpp b/src/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark.hpp index 9b0f5548..16c600a2 100644 --- a/src/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark.hpp +++ b/src/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark.hpp @@ -48,7 +48,7 @@ #include -#include "algebra/curves/public_params.hpp" +#include #include "common/data_structures/accumulation_vector.hpp" #include "knowledge_commitment/knowledge_commitment.hpp" #include "relations/constraint_satisfaction_problems/uscs/uscs.hpp" diff --git a/src/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark.tcc b/src/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark.tcc index e28c2351..be01cdad 100644 --- a/src/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark.tcc +++ b/src/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark.tcc @@ -19,9 +19,9 @@ #include #include "reductions/uscs_to_ssp/uscs_to_ssp.hpp" -#include "common/profiling.hpp" -#include "common/utils.hpp" -#include "algebra/scalar_multiplication/multiexp.hpp" +#include +#include +#include #include "relations/arithmetic_programs/ssp/ssp.hpp" namespace libsnark { diff --git a/src/zk_proof_systems/zksnark/ram_zksnark/examples/run_ram_zksnark.tcc b/src/zk_proof_systems/zksnark/ram_zksnark/examples/run_ram_zksnark.tcc index 83dfae8d..a4b83e1b 100644 --- a/src/zk_proof_systems/zksnark/ram_zksnark/examples/run_ram_zksnark.tcc +++ b/src/zk_proof_systems/zksnark/ram_zksnark/examples/run_ram_zksnark.tcc @@ -19,7 +19,7 @@ #include -#include "common/profiling.hpp" +#include namespace libsnark { diff --git a/src/zk_proof_systems/zksnark/ram_zksnark/ram_zksnark.tcc b/src/zk_proof_systems/zksnark/ram_zksnark/ram_zksnark.tcc index 9d2b890f..7f92242b 100644 --- a/src/zk_proof_systems/zksnark/ram_zksnark/ram_zksnark.tcc +++ b/src/zk_proof_systems/zksnark/ram_zksnark/ram_zksnark.tcc @@ -14,7 +14,7 @@ #ifndef RAM_ZKSNARK_TCC_ #define RAM_ZKSNARK_TCC_ -#include "common/profiling.hpp" +#include namespace libsnark { From a9f107761766f4324343936d9cde3c760abd62f5 Mon Sep 17 00:00:00 2001 From: Aleksejs Popovs Date: Tue, 20 Jun 2017 20:46:20 -0400 Subject: [PATCH 3/4] Make local includes directory-qualified. This reduces ambiguity and lets other projects include libsnark without having it pollute the project's include path. --- .gitignore | 80 +- CMakeLists.txt | 2 +- README.md | 20 +- doxygen.conf | 1634 ++++++++--------- {src => libsnark}/CMakeLists.txt | 2 - .../data_structures/accumulation_vector.hpp | 4 +- .../data_structures/accumulation_vector.tcc | 0 .../data_structures/integer_permutation.cpp | 2 +- .../data_structures/integer_permutation.hpp | 0 .../common/data_structures/merkle_tree.hpp | 2 +- .../common/data_structures/merkle_tree.tcc | 0 .../common/data_structures/set_commitment.cpp | 2 +- .../common/data_structures/set_commitment.hpp | 6 +- .../common/data_structures/set_commitment.tcc | 0 .../common/data_structures/sparse_vector.hpp | 2 +- .../common/data_structures/sparse_vector.tcc | 0 .../default_types/bacs_ppzksnark_pp.hpp | 0 .../default_types/r1cs_gg_ppzksnark_pp.hpp | 0 .../default_types/r1cs_ppzkadsnark_pp.cpp | 2 +- .../default_types/r1cs_ppzkadsnark_pp.hpp | 6 +- .../common/default_types/r1cs_ppzkpcd_pp.cpp | 2 +- .../common/default_types/r1cs_ppzkpcd_pp.hpp | 0 .../default_types/r1cs_ppzksnark_pp.hpp | 0 .../common/default_types/ram_ppzksnark_pp.hpp | 2 +- .../common/default_types/ram_zksnark_pp.hpp | 2 +- .../default_types/tbcs_ppzksnark_pp.hpp | 0 .../default_types/tinyram_ppzksnark_pp.cpp | 2 +- .../default_types/tinyram_ppzksnark_pp.hpp | 4 +- .../default_types/tinyram_zksnark_pp.cpp | 2 +- .../default_types/tinyram_zksnark_pp.hpp | 4 +- .../default_types/uscs_ppzksnark_pp.hpp | 0 .../common/libsnark_serialization.hpp | 0 .../as_waksman_routing_algorithm.cpp | 2 +- .../as_waksman_routing_algorithm.hpp | 2 +- .../benes_routing_algorithm.cpp | 2 +- .../benes_routing_algorithm.hpp | 2 +- .../profiling/profile_routing_algorithms.cpp | 4 +- .../tests/test_routing_algorithms.cpp | 4 +- .../tests/test_routing_algorithms.py | 0 .../gadgetlib1/constraint_profiling.cpp | 2 +- .../gadgetlib1/constraint_profiling.hpp | 0 .../gadgetlib1/examples/simple_example.hpp | 4 +- .../gadgetlib1/examples/simple_example.tcc | 2 +- {src => libsnark}/gadgetlib1/gadget.hpp | 4 +- {src => libsnark}/gadgetlib1/gadget.tcc | 0 .../gadgetlib1/gadgets/basic_gadgets.hpp | 4 +- .../gadgetlib1/gadgets/basic_gadgets.tcc | 0 .../fooram/components/bar_gadget.hpp | 6 +- .../fooram/components/bar_gadget.tcc | 0 .../fooram/components/fooram_protoboard.hpp | 6 +- .../fooram/components/fooram_protoboard.tcc | 0 .../fooram/examples/test_fooram.cpp | 10 +- .../fooram/fooram_cpu_checker.hpp | 12 +- .../fooram/fooram_cpu_checker.tcc | 0 .../tinyram/components/alu_arithmetic.hpp | 6 +- .../tinyram/components/alu_arithmetic.tcc | 0 .../tinyram/components/alu_control_flow.hpp | 6 +- .../tinyram/components/alu_control_flow.tcc | 0 .../tinyram/components/alu_gadget.hpp | 6 +- .../tinyram/components/alu_gadget.tcc | 0 .../components/argument_decoder_gadget.hpp | 2 +- .../components/argument_decoder_gadget.tcc | 0 .../consistency_enforcer_gadget.hpp | 2 +- .../consistency_enforcer_gadget.tcc | 0 .../components/instruction_packing_gadget.hpp | 2 +- .../components/instruction_packing_gadget.tcc | 0 .../components/memory_masking_gadget.hpp | 2 +- .../components/memory_masking_gadget.tcc | 0 .../tinyram/components/tinyram_protoboard.hpp | 10 +- .../tinyram/components/tinyram_protoboard.tcc | 0 .../components/word_variable_gadget.hpp | 2 +- .../tinyram/tinyram_cpu_checker.hpp | 14 +- .../tinyram/tinyram_cpu_checker.tcc | 0 .../gadgets/curves/weierstrass_g1_gadget.hpp | 6 +- .../gadgets/curves/weierstrass_g1_gadget.tcc | 0 .../gadgets/curves/weierstrass_g2_gadget.hpp | 6 +- .../gadgets/curves/weierstrass_g2_gadget.tcc | 0 .../memory_load_gadget.hpp | 2 +- .../memory_load_store_gadget.hpp | 2 +- .../gadgets/fields/exponentiation_gadget.hpp | 4 +- .../gadgets/fields/exponentiation_gadget.tcc | 0 .../gadgetlib1/gadgets/fields/fp2_gadgets.hpp | 4 +- .../gadgetlib1/gadgets/fields/fp2_gadgets.tcc | 0 .../gadgetlib1/gadgets/fields/fp3_gadgets.hpp | 2 +- .../gadgetlib1/gadgets/fields/fp3_gadgets.tcc | 0 .../gadgetlib1/gadgets/fields/fp4_gadgets.hpp | 2 +- .../gadgetlib1/gadgets/fields/fp4_gadgets.tcc | 0 .../gadgetlib1/gadgets/fields/fp6_gadgets.hpp | 4 +- .../gadgetlib1/gadgets/fields/fp6_gadgets.tcc | 0 .../gadgetlib1/gadgets/gadget_from_r1cs.hpp | 4 +- .../gadgetlib1/gadgets/gadget_from_r1cs.tcc | 0 .../gadgetlib1/gadgets/hashes/crh_gadget.hpp | 2 +- .../gadgets/hashes/digest_selector_gadget.hpp | 6 +- .../gadgets/hashes/digest_selector_gadget.tcc | 0 .../gadgetlib1/gadgets/hashes/hash_io.hpp | 4 +- .../gadgetlib1/gadgets/hashes/hash_io.tcc | 0 .../hashes/knapsack/knapsack_gadget.hpp | 8 +- .../hashes/knapsack/knapsack_gadget.tcc | 0 .../knapsack/tests/generate_knapsack_tests.py | 0 .../knapsack/tests/test_knapsack_gadget.cpp | 2 +- .../gadgets/hashes/sha256/sha256_aux.hpp | 4 +- .../gadgets/hashes/sha256/sha256_aux.tcc | 0 .../hashes/sha256/sha256_components.hpp | 8 +- .../hashes/sha256/sha256_components.tcc | 0 .../gadgets/hashes/sha256/sha256_gadget.hpp | 10 +- .../gadgets/hashes/sha256/sha256_gadget.tcc | 0 .../tests/generate_sha256_gadget_tests.py | 0 .../hashes/sha256/tests/pypy_sha256.py | 0 .../sha256/tests/test_sha256_gadget.cpp | 2 +- .../merkle_authentication_path_variable.hpp | 8 +- .../merkle_authentication_path_variable.tcc | 0 .../merkle_tree_check_read_gadget.hpp | 14 +- .../merkle_tree_check_read_gadget.tcc | 0 .../merkle_tree_check_update_gadget.hpp | 14 +- .../merkle_tree_check_update_gadget.tcc | 0 .../tests/test_merkle_tree_gadgets.cpp | 6 +- .../gadgets/pairing/mnt_pairing_params.hpp | 10 +- .../gadgets/pairing/pairing_checks.hpp | 8 +- .../gadgets/pairing/pairing_checks.tcc | 0 .../gadgets/pairing/pairing_params.hpp | 0 .../weierstrass_final_exponentiation.hpp | 6 +- .../weierstrass_final_exponentiation.tcc | 4 +- .../pairing/weierstrass_miller_loop.hpp | 6 +- .../pairing/weierstrass_miller_loop.tcc | 4 +- .../pairing/weierstrass_precomputation.hpp | 8 +- .../pairing/weierstrass_precomputation.tcc | 2 +- .../routing/as_waksman_routing_gadget.hpp | 10 +- .../routing/as_waksman_routing_gadget.tcc | 2 +- .../gadgets/routing/benes_routing_gadget.hpp | 10 +- .../gadgets/routing/benes_routing_gadget.tcc | 0 .../profiling/profile_routing_gadgets.cpp | 4 +- .../set_commitment/set_commitment_gadget.hpp | 12 +- .../set_commitment/set_commitment_gadget.tcc | 2 +- .../set_membership_proof_variable.hpp | 10 +- .../set_membership_proof_variable.tcc | 0 .../tests/test_set_commitment_gadget.cpp | 4 +- .../r1cs_ppzksnark_verifier_gadget.hpp | 14 +- .../r1cs_ppzksnark_verifier_gadget.tcc | 2 +- .../test_r1cs_ppzksnark_verifier_gadget.cpp | 14 +- {src => libsnark}/gadgetlib1/pb_variable.hpp | 4 +- {src => libsnark}/gadgetlib1/pb_variable.tcc | 2 +- {src => libsnark}/gadgetlib1/protoboard.hpp | 6 +- {src => libsnark}/gadgetlib1/protoboard.tcc | 0 .../gadgetlib1/tests/gadgetlib1_test.cpp | 4 +- {src => libsnark}/gadgetlib2/adapters.cpp | 2 +- {src => libsnark}/gadgetlib2/adapters.hpp | 8 +- {src => libsnark}/gadgetlib2/constraint.cpp | 4 +- {src => libsnark}/gadgetlib2/constraint.hpp | 2 +- .../gadgetlib2/examples/simple_example.cpp | 8 +- .../gadgetlib2/examples/simple_example.hpp | 2 +- .../gadgetlib2/examples/tutorial.cpp | 6 +- {src => libsnark}/gadgetlib2/gadget.cpp | 2 +- {src => libsnark}/gadgetlib2/gadget.hpp | 6 +- {src => libsnark}/gadgetlib2/gadgetMacros.hpp | 0 .../gadgetlib2/infrastructure.cpp | 2 +- .../gadgetlib2/infrastructure.hpp | 0 {src => libsnark}/gadgetlib2/integration.cpp | 4 +- {src => libsnark}/gadgetlib2/integration.hpp | 4 +- {src => libsnark}/gadgetlib2/pp.cpp | 2 +- {src => libsnark}/gadgetlib2/pp.hpp | 0 {src => libsnark}/gadgetlib2/protoboard.cpp | 2 +- {src => libsnark}/gadgetlib2/protoboard.hpp | 6 +- .../gadgetlib2/tests/adapters_UTEST.cpp | 0 .../gadgetlib2/tests/constraint_UTEST.cpp | 0 .../gadgetlib2/tests/gadget_UTEST.cpp | 0 .../gadgetlib2/tests/gadgetlib2_test.cpp | 0 .../gadgetlib2/tests/integration_UTEST.cpp | 8 +- .../gadgetlib2/tests/protoboard_UTEST.cpp | 0 .../gadgetlib2/tests/variable_UTEST.cpp | 0 {src => libsnark}/gadgetlib2/variable.cpp | 6 +- {src => libsnark}/gadgetlib2/variable.hpp | 6 +- .../gadgetlib2/variable_operators.hpp | 2 +- .../knowledge_commitment/kc_multiexp.hpp | 4 +- .../knowledge_commitment/kc_multiexp.tcc | 0 .../knowledge_commitment.hpp | 4 +- .../knowledge_commitment.tcc | 0 .../reductions/bacs_to_r1cs/bacs_to_r1cs.hpp | 6 +- .../reductions/bacs_to_r1cs/bacs_to_r1cs.tcc | 4 +- .../reductions/r1cs_to_qap/r1cs_to_qap.hpp | 6 +- .../reductions/r1cs_to_qap/r1cs_to_qap.tcc | 0 .../examples/demo_arithmetization.cpp | 8 +- .../gadgets/memory_checker_gadget.hpp | 4 +- .../gadgets/memory_checker_gadget.tcc | 0 .../gadgets/ram_universal_gadget.hpp | 10 +- .../gadgets/ram_universal_gadget.tcc | 4 +- .../ram_to_r1cs/gadgets/trace_lines.hpp | 4 +- .../ram_to_r1cs/gadgets/trace_lines.tcc | 0 .../reductions/ram_to_r1cs/ram_to_r1cs.hpp | 4 +- .../reductions/ram_to_r1cs/ram_to_r1cs.tcc | 0 .../tbcs_to_uscs/get_tbcs_reduction.py | 0 .../tbcs_to_uscs/tbcs_reduction.txt | 0 .../reductions/tbcs_to_uscs/tbcs_to_uscs.hpp | 6 +- .../reductions/tbcs_to_uscs/tbcs_to_uscs.tcc | 0 .../reductions/uscs_to_ssp/uscs_to_ssp.hpp | 6 +- .../reductions/uscs_to_ssp/uscs_to_ssp.tcc | 0 .../relations/arithmetic_programs/qap/qap.hpp | 2 +- .../relations/arithmetic_programs/qap/qap.tcc | 0 .../qap/tests/test_qap.cpp | 4 +- .../relations/arithmetic_programs/ssp/ssp.hpp | 2 +- .../relations/arithmetic_programs/ssp/ssp.tcc | 0 .../ssp/tests/test_ssp.cpp | 4 +- .../bacs/bacs.hpp | 4 +- .../bacs/bacs.tcc | 0 .../bacs/examples/bacs_examples.hpp | 4 +- .../bacs/examples/bacs_examples.tcc | 0 .../tbcs/examples/tbcs_examples.cpp | 2 +- .../tbcs/examples/tbcs_examples.hpp | 2 +- .../tbcs/tbcs.cpp | 2 +- .../tbcs/tbcs.hpp | 2 +- .../r1cs/examples/r1cs_examples.hpp | 4 +- .../r1cs/examples/r1cs_examples.tcc | 0 .../r1cs/r1cs.hpp | 4 +- .../r1cs/r1cs.tcc | 0 .../uscs/examples/uscs_examples.hpp | 4 +- .../uscs/examples/uscs_examples.tcc | 0 .../uscs/uscs.hpp | 4 +- .../uscs/uscs.tcc | 0 .../memory/delegated_ra_memory.hpp | 6 +- .../memory/delegated_ra_memory.tcc | 0 .../examples/memory_contents_examples.cpp | 2 +- .../examples/memory_contents_examples.hpp | 2 +- .../memory/memory_interface.hpp | 0 .../memory/memory_store_trace.cpp | 2 +- .../memory/memory_store_trace.hpp | 2 +- .../ram_computations/memory/ra_memory.cpp | 2 +- .../ram_computations/memory/ra_memory.hpp | 2 +- .../rams/examples/ram_examples.hpp | 4 +- .../rams/examples/ram_examples.tcc | 2 +- .../rams/fooram/fooram_aux.cpp | 2 +- .../rams/fooram/fooram_aux.hpp | 2 +- .../rams/fooram/fooram_params.hpp | 6 +- .../ram_computations/rams/ram_params.hpp | 2 +- .../rams/tinyram/tinyram_aux.cpp | 2 +- .../rams/tinyram/tinyram_aux.hpp | 6 +- .../rams/tinyram/tinyram_params.hpp | 6 +- {src => libsnark}/relations/variable.hpp | 2 +- {src => libsnark}/relations/variable.tcc | 0 .../compliance_predicate.hpp | 4 +- .../compliance_predicate.tcc | 2 +- .../compliance_predicate/cp_handler.hpp | 6 +- .../compliance_predicate/cp_handler.tcc | 0 .../examples/tally_cp.hpp | 12 +- .../examples/tally_cp.tcc | 0 .../r1cs_pcd/ppzkpcd_compliance_predicate.hpp | 2 +- .../examples/run_r1cs_mp_ppzkpcd.hpp | 2 +- .../examples/run_r1cs_mp_ppzkpcd.tcc | 4 +- .../r1cs_mp_ppzkpcd/mp_pcd_circuits.hpp | 14 +- .../r1cs_mp_ppzkpcd/mp_pcd_circuits.tcc | 2 +- .../profiling/profile_r1cs_mp_ppzkpcd.cpp | 6 +- .../r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd.hpp | 10 +- .../r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd.tcc | 4 +- .../r1cs_mp_ppzkpcd_params.hpp | 4 +- .../tests/test_r1cs_mp_ppzkpcd.cpp | 4 +- .../pcd/r1cs_pcd/r1cs_pcd_params.hpp | 4 +- .../pcd/r1cs_pcd/r1cs_pcd_params.tcc | 0 .../examples/run_r1cs_sp_ppzkpcd.hpp | 2 +- .../examples/run_r1cs_sp_ppzkpcd.tcc | 4 +- .../profiling/profile_r1cs_sp_ppzkpcd.cpp | 6 +- .../r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd.hpp | 6 +- .../r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd.tcc | 2 +- .../r1cs_sp_ppzkpcd_params.hpp | 4 +- .../r1cs_sp_ppzkpcd/sp_pcd_circuits.hpp | 14 +- .../r1cs_sp_ppzkpcd/sp_pcd_circuits.tcc | 2 +- .../tests/test_r1cs_sp_ppzkpcd.cpp | 4 +- .../examples/demo_r1cs_ppzkadsnark.cpp | 4 +- .../examples/prf/aes_ctr_prf.hpp | 2 +- .../examples/prf/aes_ctr_prf.tcc | 2 +- .../examples/run_r1cs_ppzkadsnark.hpp | 4 +- .../examples/run_r1cs_ppzkadsnark.tcc | 6 +- .../examples/signature/ed25519_signature.hpp | 2 +- .../examples/signature/ed25519_signature.tcc | 2 +- .../r1cs_ppzkadsnark/r1cs_ppzkadsnark.hpp | 14 +- .../r1cs_ppzkadsnark/r1cs_ppzkadsnark.tcc | 4 +- .../r1cs_ppzkadsnark_params.hpp | 2 +- .../r1cs_ppzkadsnark/r1cs_ppzkadsnark_prf.hpp | 2 +- .../r1cs_ppzkadsnark_signature.hpp | 2 +- .../bacs_ppzksnark/bacs_ppzksnark.hpp | 8 +- .../bacs_ppzksnark/bacs_ppzksnark.tcc | 2 +- .../bacs_ppzksnark/bacs_ppzksnark_params.hpp | 2 +- .../examples/run_bacs_ppzksnark.hpp | 4 +- .../examples/run_bacs_ppzksnark.tcc | 2 +- .../profiling/profile_bacs_ppzksnark.cpp | 8 +- .../tests/test_bacs_ppzksnark.cpp | 6 +- .../examples/run_r1cs_gg_ppzksnark.hpp | 4 +- .../examples/run_r1cs_gg_ppzksnark.tcc | 2 +- .../profiling/profile_r1cs_gg_ppzksnark.cpp | 10 +- .../r1cs_gg_ppzksnark/r1cs_gg_ppzksnark.hpp | 10 +- .../r1cs_gg_ppzksnark/r1cs_gg_ppzksnark.tcc | 4 +- .../r1cs_gg_ppzksnark_params.hpp | 2 +- .../tests/test_r1cs_gg_ppzksnark.cpp | 6 +- .../examples/run_r1cs_ppzksnark.hpp | 4 +- .../examples/run_r1cs_ppzksnark.tcc | 2 +- .../profiling/profile_r1cs_ppzksnark.cpp | 10 +- .../r1cs_ppzksnark/r1cs_ppzksnark.hpp | 10 +- .../r1cs_ppzksnark/r1cs_ppzksnark.tcc | 4 +- .../r1cs_ppzksnark/r1cs_ppzksnark_params.hpp | 2 +- .../tests/test_r1cs_ppzksnark.cpp | 6 +- .../examples/demo_ram_ppzksnark.cpp | 8 +- .../examples/demo_ram_ppzksnark_generator.cpp | 6 +- .../examples/demo_ram_ppzksnark_prover.cpp | 6 +- .../examples/demo_ram_ppzksnark_verifier.cpp | 6 +- .../examples/run_ram_ppzksnark.hpp | 6 +- .../examples/run_ram_ppzksnark.tcc | 2 +- .../profiling/profile_ram_ppzksnark.cpp | 8 +- .../ppzksnark/ram_ppzksnark/ram_ppzksnark.hpp | 8 +- .../ppzksnark/ram_ppzksnark/ram_ppzksnark.tcc | 2 +- .../ram_ppzksnark/ram_ppzksnark_params.hpp | 0 .../tests/test_ram_ppzksnark.cpp | 6 +- .../examples/run_tbcs_ppzksnark.hpp | 4 +- .../examples/run_tbcs_ppzksnark.tcc | 2 +- .../profiling/profile_tbcs_ppzksnark.cpp | 8 +- .../tbcs_ppzksnark/tbcs_ppzksnark.hpp | 8 +- .../tbcs_ppzksnark/tbcs_ppzksnark.tcc | 2 +- .../tbcs_ppzksnark/tbcs_ppzksnark_params.hpp | 2 +- .../tests/test_tbcs_ppzksnark.cpp | 6 +- .../examples/run_uscs_ppzksnark.hpp | 4 +- .../examples/run_uscs_ppzksnark.tcc | 2 +- .../profiling/profile_uscs_ppzksnark.cpp | 10 +- .../tests/test_uscs_ppzksnark.cpp | 6 +- .../uscs_ppzksnark/uscs_ppzksnark.hpp | 10 +- .../uscs_ppzksnark/uscs_ppzksnark.tcc | 4 +- .../uscs_ppzksnark/uscs_ppzksnark_params.hpp | 2 +- .../ram_zksnark/examples/run_ram_zksnark.hpp | 6 +- .../ram_zksnark/examples/run_ram_zksnark.tcc | 2 +- .../profiling/profile_ram_zksnark.cpp | 12 +- .../ram_zksnark/ram_compliance_predicate.hpp | 14 +- .../ram_zksnark/ram_compliance_predicate.tcc | 0 .../zksnark/ram_zksnark/ram_zksnark.hpp | 8 +- .../zksnark/ram_zksnark/ram_zksnark.tcc | 0 .../ram_zksnark/ram_zksnark_params.hpp | 0 .../ram_zksnark/tests/test_ram_zksnark.cpp | 8 +- 331 files changed, 1437 insertions(+), 1439 deletions(-) rename {src => libsnark}/CMakeLists.txt (99%) rename {src => libsnark}/common/data_structures/accumulation_vector.hpp (95%) rename {src => libsnark}/common/data_structures/accumulation_vector.tcc (100%) rename {src => libsnark}/common/data_structures/integer_permutation.cpp (98%) rename {src => libsnark}/common/data_structures/integer_permutation.hpp (100%) rename {src => libsnark}/common/data_structures/merkle_tree.hpp (97%) rename {src => libsnark}/common/data_structures/merkle_tree.tcc (100%) rename {src => libsnark}/common/data_structures/set_commitment.cpp (96%) rename {src => libsnark}/common/data_structures/set_commitment.hpp (89%) rename {src => libsnark}/common/data_structures/set_commitment.tcc (100%) rename {src => libsnark}/common/data_structures/sparse_vector.hpp (97%) rename {src => libsnark}/common/data_structures/sparse_vector.tcc (100%) rename {src => libsnark}/common/default_types/bacs_ppzksnark_pp.hpp (100%) rename {src => libsnark}/common/default_types/r1cs_gg_ppzksnark_pp.hpp (100%) rename {src => libsnark}/common/default_types/r1cs_ppzkadsnark_pp.cpp (90%) rename {src => libsnark}/common/default_types/r1cs_ppzkadsnark_pp.hpp (77%) rename {src => libsnark}/common/default_types/r1cs_ppzkpcd_pp.cpp (91%) rename {src => libsnark}/common/default_types/r1cs_ppzkpcd_pp.hpp (100%) rename {src => libsnark}/common/default_types/r1cs_ppzksnark_pp.hpp (100%) rename {src => libsnark}/common/default_types/ram_ppzksnark_pp.hpp (91%) rename {src => libsnark}/common/default_types/ram_zksnark_pp.hpp (91%) rename {src => libsnark}/common/default_types/tbcs_ppzksnark_pp.hpp (100%) rename {src => libsnark}/common/default_types/tinyram_ppzksnark_pp.cpp (90%) rename {src => libsnark}/common/default_types/tinyram_ppzksnark_pp.hpp (86%) rename {src => libsnark}/common/default_types/tinyram_zksnark_pp.cpp (90%) rename {src => libsnark}/common/default_types/tinyram_zksnark_pp.hpp (85%) rename {src => libsnark}/common/default_types/uscs_ppzksnark_pp.hpp (100%) rename {src => libsnark}/common/libsnark_serialization.hpp (100%) rename {src => libsnark}/common/routing_algorithms/as_waksman_routing_algorithm.cpp (99%) rename {src => libsnark}/common/routing_algorithms/as_waksman_routing_algorithm.hpp (98%) rename {src => libsnark}/common/routing_algorithms/benes_routing_algorithm.cpp (99%) rename {src => libsnark}/common/routing_algorithms/benes_routing_algorithm.hpp (97%) rename {src => libsnark}/common/routing_algorithms/profiling/profile_routing_algorithms.cpp (92%) rename {src => libsnark}/common/routing_algorithms/tests/test_routing_algorithms.cpp (93%) rename {src => libsnark}/common/routing_algorithms/tests/test_routing_algorithms.py (100%) rename {src => libsnark}/gadgetlib1/constraint_profiling.cpp (95%) rename {src => libsnark}/gadgetlib1/constraint_profiling.hpp (100%) rename {src => libsnark}/gadgetlib1/examples/simple_example.hpp (80%) rename {src => libsnark}/gadgetlib1/examples/simple_example.tcc (96%) rename {src => libsnark}/gadgetlib1/gadget.hpp (87%) rename {src => libsnark}/gadgetlib1/gadget.tcc (100%) rename {src => libsnark}/gadgetlib1/gadgets/basic_gadgets.hpp (99%) rename {src => libsnark}/gadgetlib1/gadgets/basic_gadgets.tcc (100%) rename {src => libsnark}/gadgetlib1/gadgets/cpu_checkers/fooram/components/bar_gadget.hpp (91%) rename {src => libsnark}/gadgetlib1/gadgets/cpu_checkers/fooram/components/bar_gadget.tcc (100%) rename {src => libsnark}/gadgetlib1/gadgets/cpu_checkers/fooram/components/fooram_protoboard.hpp (83%) rename {src => libsnark}/gadgetlib1/gadgets/cpu_checkers/fooram/components/fooram_protoboard.tcc (100%) rename {src => libsnark}/gadgetlib1/gadgets/cpu_checkers/fooram/examples/test_fooram.cpp (84%) rename {src => libsnark}/gadgetlib1/gadgets/cpu_checkers/fooram/fooram_cpu_checker.hpp (89%) rename {src => libsnark}/gadgetlib1/gadgets/cpu_checkers/fooram/fooram_cpu_checker.tcc (100%) rename {src => libsnark}/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_arithmetic.hpp (99%) rename {src => libsnark}/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_arithmetic.tcc (100%) rename {src => libsnark}/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_control_flow.hpp (93%) rename {src => libsnark}/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_control_flow.tcc (100%) rename {src => libsnark}/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_gadget.hpp (97%) rename {src => libsnark}/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_gadget.tcc (100%) rename {src => libsnark}/gadgetlib1/gadgets/cpu_checkers/tinyram/components/argument_decoder_gadget.hpp (96%) rename {src => libsnark}/gadgetlib1/gadgets/cpu_checkers/tinyram/components/argument_decoder_gadget.tcc (100%) rename {src => libsnark}/gadgetlib1/gadgets/cpu_checkers/tinyram/components/consistency_enforcer_gadget.hpp (96%) rename {src => libsnark}/gadgetlib1/gadgets/cpu_checkers/tinyram/components/consistency_enforcer_gadget.tcc (100%) rename {src => libsnark}/gadgetlib1/gadgets/cpu_checkers/tinyram/components/instruction_packing_gadget.hpp (95%) rename {src => libsnark}/gadgetlib1/gadgets/cpu_checkers/tinyram/components/instruction_packing_gadget.tcc (100%) rename {src => libsnark}/gadgetlib1/gadgets/cpu_checkers/tinyram/components/memory_masking_gadget.hpp (97%) rename {src => libsnark}/gadgetlib1/gadgets/cpu_checkers/tinyram/components/memory_masking_gadget.tcc (100%) rename {src => libsnark}/gadgetlib1/gadgets/cpu_checkers/tinyram/components/tinyram_protoboard.hpp (80%) rename {src => libsnark}/gadgetlib1/gadgets/cpu_checkers/tinyram/components/tinyram_protoboard.tcc (100%) rename {src => libsnark}/gadgetlib1/gadgets/cpu_checkers/tinyram/components/word_variable_gadget.hpp (95%) rename {src => libsnark}/gadgetlib1/gadgets/cpu_checkers/tinyram/tinyram_cpu_checker.hpp (85%) rename {src => libsnark}/gadgetlib1/gadgets/cpu_checkers/tinyram/tinyram_cpu_checker.tcc (100%) rename {src => libsnark}/gadgetlib1/gadgets/curves/weierstrass_g1_gadget.hpp (96%) rename {src => libsnark}/gadgetlib1/gadgets/curves/weierstrass_g1_gadget.tcc (100%) rename {src => libsnark}/gadgetlib1/gadgets/curves/weierstrass_g2_gadget.hpp (93%) rename {src => libsnark}/gadgetlib1/gadgets/curves/weierstrass_g2_gadget.tcc (100%) rename {src => libsnark}/gadgetlib1/gadgets/delegated_ra_memory/memory_load_gadget.hpp (90%) rename {src => libsnark}/gadgetlib1/gadgets/delegated_ra_memory/memory_load_store_gadget.hpp (90%) rename {src => libsnark}/gadgetlib1/gadgets/fields/exponentiation_gadget.hpp (95%) rename {src => libsnark}/gadgetlib1/gadgets/fields/exponentiation_gadget.tcc (100%) rename {src => libsnark}/gadgetlib1/gadgets/fields/fp2_gadgets.hpp (97%) rename {src => libsnark}/gadgetlib1/gadgets/fields/fp2_gadgets.tcc (100%) rename {src => libsnark}/gadgetlib1/gadgets/fields/fp3_gadgets.hpp (98%) rename {src => libsnark}/gadgetlib1/gadgets/fields/fp3_gadgets.tcc (100%) rename {src => libsnark}/gadgetlib1/gadgets/fields/fp4_gadgets.hpp (99%) rename {src => libsnark}/gadgetlib1/gadgets/fields/fp4_gadgets.tcc (100%) rename {src => libsnark}/gadgetlib1/gadgets/fields/fp6_gadgets.hpp (98%) rename {src => libsnark}/gadgetlib1/gadgets/fields/fp6_gadgets.tcc (100%) rename {src => libsnark}/gadgetlib1/gadgets/gadget_from_r1cs.hpp (92%) rename {src => libsnark}/gadgetlib1/gadgets/gadget_from_r1cs.tcc (100%) rename {src => libsnark}/gadgetlib1/gadgets/hashes/crh_gadget.hpp (90%) rename {src => libsnark}/gadgetlib1/gadgets/hashes/digest_selector_gadget.hpp (87%) rename {src => libsnark}/gadgetlib1/gadgets/hashes/digest_selector_gadget.tcc (100%) rename {src => libsnark}/gadgetlib1/gadgets/hashes/hash_io.hpp (94%) rename {src => libsnark}/gadgetlib1/gadgets/hashes/hash_io.tcc (100%) rename {src => libsnark}/gadgetlib1/gadgets/hashes/knapsack/knapsack_gadget.hpp (94%) rename {src => libsnark}/gadgetlib1/gadgets/hashes/knapsack/knapsack_gadget.tcc (100%) rename {src => libsnark}/gadgetlib1/gadgets/hashes/knapsack/tests/generate_knapsack_tests.py (100%) rename {src => libsnark}/gadgetlib1/gadgets/hashes/knapsack/tests/test_knapsack_gadget.cpp (99%) rename {src => libsnark}/gadgetlib1/gadgets/hashes/sha256/sha256_aux.hpp (97%) rename {src => libsnark}/gadgetlib1/gadgets/hashes/sha256/sha256_aux.tcc (100%) rename {src => libsnark}/gadgetlib1/gadgets/hashes/sha256/sha256_components.hpp (94%) rename {src => libsnark}/gadgetlib1/gadgets/hashes/sha256/sha256_components.tcc (100%) rename {src => libsnark}/gadgetlib1/gadgets/hashes/sha256/sha256_gadget.hpp (92%) rename {src => libsnark}/gadgetlib1/gadgets/hashes/sha256/sha256_gadget.tcc (100%) rename {src => libsnark}/gadgetlib1/gadgets/hashes/sha256/tests/generate_sha256_gadget_tests.py (100%) rename {src => libsnark}/gadgetlib1/gadgets/hashes/sha256/tests/pypy_sha256.py (100%) rename {src => libsnark}/gadgetlib1/gadgets/hashes/sha256/tests/test_sha256_gadget.cpp (96%) rename {src => libsnark}/gadgetlib1/gadgets/merkle_tree/merkle_authentication_path_variable.hpp (82%) rename {src => libsnark}/gadgetlib1/gadgets/merkle_tree/merkle_authentication_path_variable.tcc (100%) rename {src => libsnark}/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_read_gadget.hpp (84%) rename {src => libsnark}/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_read_gadget.tcc (100%) rename {src => libsnark}/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_update_gadget.hpp (88%) rename {src => libsnark}/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_update_gadget.tcc (100%) rename {src => libsnark}/gadgetlib1/gadgets/merkle_tree/tests/test_merkle_tree_gadgets.cpp (86%) rename {src => libsnark}/gadgetlib1/gadgets/pairing/mnt_pairing_params.hpp (91%) rename {src => libsnark}/gadgetlib1/gadgets/pairing/pairing_checks.hpp (91%) rename {src => libsnark}/gadgetlib1/gadgets/pairing/pairing_checks.tcc (100%) rename {src => libsnark}/gadgetlib1/gadgets/pairing/pairing_params.hpp (100%) rename {src => libsnark}/gadgetlib1/gadgets/pairing/weierstrass_final_exponentiation.hpp (95%) rename {src => libsnark}/gadgetlib1/gadgets/pairing/weierstrass_final_exponentiation.tcc (98%) rename {src => libsnark}/gadgetlib1/gadgets/pairing/weierstrass_miller_loop.hpp (97%) rename {src => libsnark}/gadgetlib1/gadgets/pairing/weierstrass_miller_loop.tcc (99%) rename {src => libsnark}/gadgetlib1/gadgets/pairing/weierstrass_precomputation.hpp (97%) rename {src => libsnark}/gadgetlib1/gadgets/pairing/weierstrass_precomputation.tcc (99%) rename {src => libsnark}/gadgetlib1/gadgets/routing/as_waksman_routing_gadget.hpp (89%) rename {src => libsnark}/gadgetlib1/gadgets/routing/as_waksman_routing_gadget.tcc (99%) rename {src => libsnark}/gadgetlib1/gadgets/routing/benes_routing_gadget.hpp (89%) rename {src => libsnark}/gadgetlib1/gadgets/routing/benes_routing_gadget.tcc (100%) rename {src => libsnark}/gadgetlib1/gadgets/routing/profiling/profile_routing_gadgets.cpp (96%) rename {src => libsnark}/gadgetlib1/gadgets/set_commitment/set_commitment_gadget.hpp (81%) rename {src => libsnark}/gadgetlib1/gadgets/set_commitment/set_commitment_gadget.tcc (99%) rename {src => libsnark}/gadgetlib1/gadgets/set_commitment/set_membership_proof_variable.hpp (78%) rename {src => libsnark}/gadgetlib1/gadgets/set_commitment/set_membership_proof_variable.tcc (100%) rename {src => libsnark}/gadgetlib1/gadgets/set_commitment/tests/test_set_commitment_gadget.cpp (90%) rename {src => libsnark}/gadgetlib1/gadgets/verifiers/r1cs_ppzksnark_verifier_gadget.hpp (95%) rename {src => libsnark}/gadgetlib1/gadgets/verifiers/r1cs_ppzksnark_verifier_gadget.tcc (99%) rename {src => libsnark}/gadgetlib1/gadgets/verifiers/tests/test_r1cs_ppzksnark_verifier_gadget.cpp (97%) rename {src => libsnark}/gadgetlib1/pb_variable.hpp (98%) rename {src => libsnark}/gadgetlib1/pb_variable.tcc (99%) rename {src => libsnark}/gadgetlib1/protoboard.hpp (93%) rename {src => libsnark}/gadgetlib1/protoboard.tcc (100%) rename {src => libsnark}/gadgetlib1/tests/gadgetlib1_test.cpp (88%) rename {src => libsnark}/gadgetlib2/adapters.cpp (98%) rename {src => libsnark}/gadgetlib2/adapters.hpp (94%) rename {src => libsnark}/gadgetlib2/constraint.cpp (98%) rename {src => libsnark}/gadgetlib2/constraint.hpp (99%) rename {src => libsnark}/gadgetlib2/examples/simple_example.cpp (92%) rename {src => libsnark}/gadgetlib2/examples/simple_example.hpp (86%) rename {src => libsnark}/gadgetlib2/examples/tutorial.cpp (99%) rename {src => libsnark}/gadgetlib2/gadget.cpp (99%) rename {src => libsnark}/gadgetlib2/gadget.hpp (99%) rename {src => libsnark}/gadgetlib2/gadgetMacros.hpp (100%) rename {src => libsnark}/gadgetlib2/infrastructure.cpp (98%) rename {src => libsnark}/gadgetlib2/infrastructure.hpp (100%) rename {src => libsnark}/gadgetlib2/integration.cpp (97%) rename {src => libsnark}/gadgetlib2/integration.hpp (86%) rename {src => libsnark}/gadgetlib2/pp.cpp (96%) rename {src => libsnark}/gadgetlib2/pp.hpp (100%) rename {src => libsnark}/gadgetlib2/protoboard.cpp (99%) rename {src => libsnark}/gadgetlib2/protoboard.hpp (97%) rename {src => libsnark}/gadgetlib2/tests/adapters_UTEST.cpp (100%) rename {src => libsnark}/gadgetlib2/tests/constraint_UTEST.cpp (100%) rename {src => libsnark}/gadgetlib2/tests/gadget_UTEST.cpp (100%) rename {src => libsnark}/gadgetlib2/tests/gadgetlib2_test.cpp (100%) rename {src => libsnark}/gadgetlib2/tests/integration_UTEST.cpp (75%) rename {src => libsnark}/gadgetlib2/tests/protoboard_UTEST.cpp (100%) rename {src => libsnark}/gadgetlib2/tests/variable_UTEST.cpp (100%) rename {src => libsnark}/gadgetlib2/variable.cpp (99%) rename {src => libsnark}/gadgetlib2/variable.hpp (99%) rename {src => libsnark}/gadgetlib2/variable_operators.hpp (99%) rename {src => libsnark}/knowledge_commitment/kc_multiexp.hpp (95%) rename {src => libsnark}/knowledge_commitment/kc_multiexp.tcc (100%) rename {src => libsnark}/knowledge_commitment/knowledge_commitment.hpp (95%) rename {src => libsnark}/knowledge_commitment/knowledge_commitment.tcc (100%) rename {src => libsnark}/reductions/bacs_to_r1cs/bacs_to_r1cs.hpp (87%) rename {src => libsnark}/reductions/bacs_to_r1cs/bacs_to_r1cs.tcc (94%) rename {src => libsnark}/reductions/r1cs_to_qap/r1cs_to_qap.hpp (92%) rename {src => libsnark}/reductions/r1cs_to_qap/r1cs_to_qap.tcc (100%) rename {src => libsnark}/reductions/ram_to_r1cs/examples/demo_arithmetization.cpp (95%) rename {src => libsnark}/reductions/ram_to_r1cs/gadgets/memory_checker_gadget.hpp (92%) rename {src => libsnark}/reductions/ram_to_r1cs/gadgets/memory_checker_gadget.tcc (100%) rename {src => libsnark}/reductions/ram_to_r1cs/gadgets/ram_universal_gadget.hpp (93%) rename {src => libsnark}/reductions/ram_to_r1cs/gadgets/ram_universal_gadget.tcc (99%) rename {src => libsnark}/reductions/ram_to_r1cs/gadgets/trace_lines.hpp (94%) rename {src => libsnark}/reductions/ram_to_r1cs/gadgets/trace_lines.tcc (100%) rename {src => libsnark}/reductions/ram_to_r1cs/ram_to_r1cs.hpp (94%) rename {src => libsnark}/reductions/ram_to_r1cs/ram_to_r1cs.tcc (100%) rename {src => libsnark}/reductions/tbcs_to_uscs/get_tbcs_reduction.py (100%) rename {src => libsnark}/reductions/tbcs_to_uscs/tbcs_reduction.txt (100%) rename {src => libsnark}/reductions/tbcs_to_uscs/tbcs_to_uscs.hpp (89%) rename {src => libsnark}/reductions/tbcs_to_uscs/tbcs_to_uscs.tcc (100%) rename {src => libsnark}/reductions/uscs_to_ssp/uscs_to_ssp.hpp (92%) rename {src => libsnark}/reductions/uscs_to_ssp/uscs_to_ssp.tcc (100%) rename {src => libsnark}/relations/arithmetic_programs/qap/qap.hpp (99%) rename {src => libsnark}/relations/arithmetic_programs/qap/qap.tcc (100%) rename {src => libsnark}/relations/arithmetic_programs/qap/tests/test_qap.cpp (96%) rename {src => libsnark}/relations/arithmetic_programs/ssp/ssp.hpp (98%) rename {src => libsnark}/relations/arithmetic_programs/ssp/ssp.tcc (100%) rename {src => libsnark}/relations/arithmetic_programs/ssp/tests/test_ssp.cpp (96%) rename {src => libsnark}/relations/circuit_satisfaction_problems/bacs/bacs.hpp (97%) rename {src => libsnark}/relations/circuit_satisfaction_problems/bacs/bacs.tcc (100%) rename {src => libsnark}/relations/circuit_satisfaction_problems/bacs/examples/bacs_examples.hpp (94%) rename {src => libsnark}/relations/circuit_satisfaction_problems/bacs/examples/bacs_examples.tcc (100%) rename {src => libsnark}/relations/circuit_satisfaction_problems/tbcs/examples/tbcs_examples.cpp (96%) rename {src => libsnark}/relations/circuit_satisfaction_problems/tbcs/examples/tbcs_examples.hpp (97%) rename {src => libsnark}/relations/circuit_satisfaction_problems/tbcs/tbcs.cpp (99%) rename {src => libsnark}/relations/circuit_satisfaction_problems/tbcs/tbcs.hpp (99%) rename {src => libsnark}/relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp (94%) rename {src => libsnark}/relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.tcc (100%) rename {src => libsnark}/relations/constraint_satisfaction_problems/r1cs/r1cs.hpp (97%) rename {src => libsnark}/relations/constraint_satisfaction_problems/r1cs/r1cs.tcc (100%) rename {src => libsnark}/relations/constraint_satisfaction_problems/uscs/examples/uscs_examples.hpp (94%) rename {src => libsnark}/relations/constraint_satisfaction_problems/uscs/examples/uscs_examples.tcc (100%) rename {src => libsnark}/relations/constraint_satisfaction_problems/uscs/uscs.hpp (96%) rename {src => libsnark}/relations/constraint_satisfaction_problems/uscs/uscs.tcc (100%) rename {src => libsnark}/relations/ram_computations/memory/delegated_ra_memory.hpp (87%) rename {src => libsnark}/relations/ram_computations/memory/delegated_ra_memory.tcc (100%) rename {src => libsnark}/relations/ram_computations/memory/examples/memory_contents_examples.cpp (95%) rename {src => libsnark}/relations/ram_computations/memory/examples/memory_contents_examples.hpp (95%) rename {src => libsnark}/relations/ram_computations/memory/memory_interface.hpp (100%) rename {src => libsnark}/relations/ram_computations/memory/memory_store_trace.cpp (94%) rename {src => libsnark}/relations/ram_computations/memory/memory_store_trace.hpp (94%) rename {src => libsnark}/relations/ram_computations/memory/ra_memory.cpp (95%) rename {src => libsnark}/relations/ram_computations/memory/ra_memory.hpp (93%) rename {src => libsnark}/relations/ram_computations/rams/examples/ram_examples.hpp (90%) rename {src => libsnark}/relations/ram_computations/rams/examples/ram_examples.tcc (98%) rename {src => libsnark}/relations/ram_computations/rams/fooram/fooram_aux.cpp (96%) rename {src => libsnark}/relations/ram_computations/rams/fooram/fooram_aux.hpp (95%) rename {src => libsnark}/relations/ram_computations/rams/fooram/fooram_params.hpp (82%) rename {src => libsnark}/relations/ram_computations/rams/ram_params.hpp (96%) rename {src => libsnark}/relations/ram_computations/rams/tinyram/tinyram_aux.cpp (99%) rename {src => libsnark}/relations/ram_computations/rams/tinyram/tinyram_aux.hpp (96%) rename {src => libsnark}/relations/ram_computations/rams/tinyram/tinyram_params.hpp (81%) rename {src => libsnark}/relations/variable.hpp (99%) rename {src => libsnark}/relations/variable.tcc (100%) rename {src => libsnark}/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/compliance_predicate.hpp (97%) rename {src => libsnark}/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/compliance_predicate.tcc (99%) rename {src => libsnark}/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/cp_handler.hpp (94%) rename {src => libsnark}/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/cp_handler.tcc (100%) rename {src => libsnark}/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/examples/tally_cp.hpp (86%) rename {src => libsnark}/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/examples/tally_cp.tcc (100%) rename {src => libsnark}/zk_proof_systems/pcd/r1cs_pcd/ppzkpcd_compliance_predicate.hpp (92%) rename {src => libsnark}/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/examples/run_r1cs_mp_ppzkpcd.hpp (93%) rename {src => libsnark}/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/examples/run_r1cs_mp_ppzkpcd.tcc (97%) rename {src => libsnark}/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/mp_pcd_circuits.hpp (93%) rename {src => libsnark}/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/mp_pcd_circuits.tcc (99%) rename {src => libsnark}/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/profiling/profile_r1cs_mp_ppzkpcd.cpp (80%) rename {src => libsnark}/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd.hpp (97%) rename {src => libsnark}/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd.tcc (99%) rename {src => libsnark}/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd_params.hpp (89%) rename {src => libsnark}/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/tests/test_r1cs_mp_ppzkpcd.cpp (88%) rename {src => libsnark}/zk_proof_systems/pcd/r1cs_pcd/r1cs_pcd_params.hpp (91%) rename {src => libsnark}/zk_proof_systems/pcd/r1cs_pcd/r1cs_pcd_params.tcc (100%) rename {src => libsnark}/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/examples/run_r1cs_sp_ppzkpcd.hpp (92%) rename {src => libsnark}/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/examples/run_r1cs_sp_ppzkpcd.tcc (97%) rename {src => libsnark}/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/profiling/profile_r1cs_sp_ppzkpcd.cpp (78%) rename {src => libsnark}/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd.hpp (98%) rename {src => libsnark}/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd.tcc (99%) rename {src => libsnark}/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd_params.hpp (89%) rename {src => libsnark}/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/sp_pcd_circuits.hpp (93%) rename {src => libsnark}/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/sp_pcd_circuits.tcc (99%) rename {src => libsnark}/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/tests/test_r1cs_sp_ppzkpcd.cpp (84%) rename {src => libsnark}/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/demo_r1cs_ppzkadsnark.cpp (91%) rename {src => libsnark}/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/prf/aes_ctr_prf.hpp (87%) rename {src => libsnark}/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/prf/aes_ctr_prf.tcc (97%) rename {src => libsnark}/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/run_r1cs_ppzkadsnark.hpp (84%) rename {src => libsnark}/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/run_r1cs_ppzkadsnark.tcc (94%) rename {src => libsnark}/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/signature/ed25519_signature.hpp (91%) rename {src => libsnark}/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/signature/ed25519_signature.tcc (98%) rename {src => libsnark}/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark.hpp (97%) rename {src => libsnark}/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark.tcc (99%) rename {src => libsnark}/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark_params.hpp (95%) rename {src => libsnark}/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark_prf.hpp (88%) rename {src => libsnark}/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark_signature.hpp (94%) rename {src => libsnark}/zk_proof_systems/ppzksnark/bacs_ppzksnark/bacs_ppzksnark.hpp (96%) rename {src => libsnark}/zk_proof_systems/ppzksnark/bacs_ppzksnark/bacs_ppzksnark.tcc (98%) rename {src => libsnark}/zk_proof_systems/ppzksnark/bacs_ppzksnark/bacs_ppzksnark_params.hpp (92%) rename {src => libsnark}/zk_proof_systems/ppzksnark/bacs_ppzksnark/examples/run_bacs_ppzksnark.hpp (84%) rename {src => libsnark}/zk_proof_systems/ppzksnark/bacs_ppzksnark/examples/run_bacs_ppzksnark.tcc (97%) rename {src => libsnark}/zk_proof_systems/ppzksnark/bacs_ppzksnark/profiling/profile_bacs_ppzksnark.cpp (85%) rename {src => libsnark}/zk_proof_systems/ppzksnark/bacs_ppzksnark/tests/test_bacs_ppzksnark.cpp (85%) rename {src => libsnark}/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/examples/run_r1cs_gg_ppzksnark.hpp (84%) rename {src => libsnark}/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/examples/run_r1cs_gg_ppzksnark.tcc (98%) rename {src => libsnark}/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/profiling/profile_r1cs_gg_ppzksnark.cpp (82%) rename {src => libsnark}/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark.hpp (97%) rename {src => libsnark}/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark.tcc (99%) rename {src => libsnark}/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark_params.hpp (93%) rename {src => libsnark}/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/tests/test_r1cs_gg_ppzksnark.cpp (83%) rename {src => libsnark}/zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.hpp (85%) rename {src => libsnark}/zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.tcc (98%) rename {src => libsnark}/zk_proof_systems/ppzksnark/r1cs_ppzksnark/profiling/profile_r1cs_ppzksnark.cpp (83%) rename {src => libsnark}/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp (97%) rename {src => libsnark}/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.tcc (99%) rename {src => libsnark}/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark_params.hpp (92%) rename {src => libsnark}/zk_proof_systems/ppzksnark/r1cs_ppzksnark/tests/test_r1cs_ppzksnark.cpp (84%) rename {src => libsnark}/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark.cpp (96%) rename {src => libsnark}/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_generator.cpp (93%) rename {src => libsnark}/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_prover.cpp (94%) rename {src => libsnark}/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_verifier.cpp (94%) rename {src => libsnark}/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/run_ram_ppzksnark.hpp (81%) rename {src => libsnark}/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/run_ram_ppzksnark.tcc (97%) rename {src => libsnark}/zk_proof_systems/ppzksnark/ram_ppzksnark/profiling/profile_ram_ppzksnark.cpp (85%) rename {src => libsnark}/zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark.hpp (96%) rename {src => libsnark}/zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark.tcc (99%) rename {src => libsnark}/zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark_params.hpp (100%) rename {src => libsnark}/zk_proof_systems/ppzksnark/ram_ppzksnark/tests/test_ram_ppzksnark.cpp (88%) rename {src => libsnark}/zk_proof_systems/ppzksnark/tbcs_ppzksnark/examples/run_tbcs_ppzksnark.hpp (84%) rename {src => libsnark}/zk_proof_systems/ppzksnark/tbcs_ppzksnark/examples/run_tbcs_ppzksnark.tcc (97%) rename {src => libsnark}/zk_proof_systems/ppzksnark/tbcs_ppzksnark/profiling/profile_tbcs_ppzksnark.cpp (84%) rename {src => libsnark}/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tbcs_ppzksnark.hpp (96%) rename {src => libsnark}/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tbcs_ppzksnark.tcc (99%) rename {src => libsnark}/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tbcs_ppzksnark_params.hpp (92%) rename {src => libsnark}/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tests/test_tbcs_ppzksnark.cpp (85%) rename {src => libsnark}/zk_proof_systems/ppzksnark/uscs_ppzksnark/examples/run_uscs_ppzksnark.hpp (84%) rename {src => libsnark}/zk_proof_systems/ppzksnark/uscs_ppzksnark/examples/run_uscs_ppzksnark.tcc (97%) rename {src => libsnark}/zk_proof_systems/ppzksnark/uscs_ppzksnark/profiling/profile_uscs_ppzksnark.cpp (81%) rename {src => libsnark}/zk_proof_systems/ppzksnark/uscs_ppzksnark/tests/test_uscs_ppzksnark.cpp (84%) rename {src => libsnark}/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark.hpp (97%) rename {src => libsnark}/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark.tcc (99%) rename {src => libsnark}/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark_params.hpp (92%) rename {src => libsnark}/zk_proof_systems/zksnark/ram_zksnark/examples/run_ram_zksnark.hpp (81%) rename {src => libsnark}/zk_proof_systems/zksnark/ram_zksnark/examples/run_ram_zksnark.tcc (97%) rename {src => libsnark}/zk_proof_systems/zksnark/ram_zksnark/profiling/profile_ram_zksnark.cpp (93%) rename {src => libsnark}/zk_proof_systems/zksnark/ram_zksnark/ram_compliance_predicate.hpp (94%) rename {src => libsnark}/zk_proof_systems/zksnark/ram_zksnark/ram_compliance_predicate.tcc (100%) rename {src => libsnark}/zk_proof_systems/zksnark/ram_zksnark/ram_zksnark.hpp (96%) rename {src => libsnark}/zk_proof_systems/zksnark/ram_zksnark/ram_zksnark.tcc (100%) rename {src => libsnark}/zk_proof_systems/zksnark/ram_zksnark/ram_zksnark_params.hpp (100%) rename {src => libsnark}/zk_proof_systems/zksnark/ram_zksnark/tests/test_ram_zksnark.cpp (80%) diff --git a/.gitignore b/.gitignore index d56c9fbe..1cfc1b2a 100644 --- a/.gitignore +++ b/.gitignore @@ -6,46 +6,46 @@ depinst/ depsrc/ README.html doxygen/ -src/gadgetlib2/examples/tutorial -src/gadgetlib2/tests/gadgetlib2_test +libsnark/gadgetlib2/examples/tutorial +libsnark/gadgetlib2/tests/gadgetlib2_test -src/algebra/curves/tests/test_bilinearity -src/algebra/curves/tests/test_groups -src/algebra/fields/tests/test_fields -src/common/routing_algorithms/profiling/profile_routing_algorithms -src/common/routing_algorithms/tests/test_routing_algorithms -src/gadgetlib1/gadgets/cpu_checkers/fooram/examples/test_fooram -src/gadgetlib1/gadgets/hashes/knapsack/tests/test_knapsack_gadget -src/gadgetlib1/gadgets/hashes/sha256/tests/test_sha256_gadget -src/gadgetlib1/gadgets/merkle_tree/tests/test_merkle_tree_gadgets -src/gadgetlib1/gadgets/routing/profiling/profile_routing_gadgets -src/gadgetlib1/gadgets/set_commitment/tests/test_set_commitment_gadget -src/gadgetlib1/gadgets/verifiers/tests/test_r1cs_ppzksnark_verifier_gadget -src/reductions/ram_to_r1cs/examples/demo_arithmetization -src/relations/arithmetic_programs/qap/tests/test_qap -src/relations/arithmetic_programs/ssp/tests/test_ssp -src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/profiling/profile_r1cs_mp_ppzkpcd -src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/tests/test_r1cs_mp_ppzkpcd -src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/profiling/profile_r1cs_sp_ppzkpcd -src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/tests/test_r1cs_sp_ppzkpcd -src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/demo_r1cs_ppzkadsnark -src/zk_proof_systems/ppzksnark/bacs_ppzksnark/profiling/profile_bacs_ppzksnark -src/zk_proof_systems/ppzksnark/bacs_ppzksnark/tests/test_bacs_ppzksnark -src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/profiling/profile_r1cs_gg_ppzksnark -src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/tests/test_r1cs_gg_ppzksnark -src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/profiling/profile_r1cs_ppzksnark -src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/tests/test_r1cs_ppzksnark -src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark -src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_generator -src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_prover -src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_verifier -src/zk_proof_systems/ppzksnark/ram_ppzksnark/profiling/profile_ram_ppzksnark -src/zk_proof_systems/ppzksnark/ram_ppzksnark/tests/test_ram_ppzksnark -src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/profiling/profile_tbcs_ppzksnark -src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tests/test_tbcs_ppzksnark -src/zk_proof_systems/ppzksnark/uscs_ppzksnark/profiling/profile_uscs_ppzksnark -src/zk_proof_systems/ppzksnark/uscs_ppzksnark/tests/test_uscs_ppzksnark -src/zk_proof_systems/zksnark/ram_zksnark/profiling/profile_ram_zksnark -src/zk_proof_systems/zksnark/ram_zksnark/tests/test_ram_zksnark +libsnark/algebra/curves/tests/test_bilinearity +libsnark/algebra/curves/tests/test_groups +libsnark/algebra/fields/tests/test_fields +libsnark/common/routing_algorithms/profiling/profile_routing_algorithms +libsnark/common/routing_algorithms/tests/test_routing_algorithms +libsnark/gadgetlib1/gadgets/cpu_checkers/fooram/examples/test_fooram +libsnark/gadgetlib1/gadgets/hashes/knapsack/tests/test_knapsack_gadget +libsnark/gadgetlib1/gadgets/hashes/sha256/tests/test_sha256_gadget +libsnark/gadgetlib1/gadgets/merkle_tree/tests/test_merkle_tree_gadgets +libsnark/gadgetlib1/gadgets/routing/profiling/profile_routing_gadgets +libsnark/gadgetlib1/gadgets/set_commitment/tests/test_set_commitment_gadget +libsnark/gadgetlib1/gadgets/verifiers/tests/test_r1cs_ppzksnark_verifier_gadget +libsnark/reductions/ram_to_r1cs/examples/demo_arithmetization +libsnark/relations/arithmetic_programs/qap/tests/test_qap +libsnark/relations/arithmetic_programs/ssp/tests/test_ssp +libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/profiling/profile_r1cs_mp_ppzkpcd +libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/tests/test_r1cs_mp_ppzkpcd +libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/profiling/profile_r1cs_sp_ppzkpcd +libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/tests/test_r1cs_sp_ppzkpcd +libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/demo_r1cs_ppzkadsnark +libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/profiling/profile_bacs_ppzksnark +libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/tests/test_bacs_ppzksnark +libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/profiling/profile_r1cs_gg_ppzksnark +libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/tests/test_r1cs_gg_ppzksnark +libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/profiling/profile_r1cs_ppzksnark +libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/tests/test_r1cs_ppzksnark +libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark +libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_generator +libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_prover +libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_verifier +libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/profiling/profile_ram_ppzksnark +libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/tests/test_ram_ppzksnark +libsnark/zk_proof_systems/ppzksnark/tbcs_ppzksnark/profiling/profile_tbcs_ppzksnark +libsnark/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tests/test_tbcs_ppzksnark +libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/profiling/profile_uscs_ppzksnark +libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/tests/test_uscs_ppzksnark +libsnark/zk_proof_systems/zksnark/ram_zksnark/profiling/profile_ram_zksnark +libsnark/zk_proof_systems/zksnark/ram_zksnark/tests/test_ram_zksnark build diff --git a/CMakeLists.txt b/CMakeLists.txt index e7876a33..aa988c2d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -243,4 +243,4 @@ endif(CCACHE_FOUND) add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND}) add_subdirectory(third_party) -add_subdirectory(src) +add_subdirectory(libsnark) diff --git a/README.md b/README.md index a3c3190c..02d9d237 100644 --- a/README.md +++ b/README.md @@ -232,7 +232,7 @@ The libsnark library relies on the following: So far we have tested these only on Linux, though we have been able to make the libsnark work, with some features disabled (such as memory profiling or GTest tests), on Windows via Cygwin and on Mac OS X. See also the notes on [portability](#portability) -below. (If you port libsnark to additional platforms, please let us know!) +below. (If you port libsnark to additional platforms, please let us know!) Concretely, here are the requisite packages in some Linux distributions: @@ -263,7 +263,7 @@ Fetch dependencies from their GitHub repos: Create the Makefile: - $ mkdir build && cd build && cmake .. + $ mkdir build && cd build && cmake .. Then, to compile the library, tests, and profiling harness, run this within the `build directory: @@ -287,7 +287,7 @@ This will install `libsnark.a` into `/install/path/lib`; so your application sho In addition, unless you use `WITH_SUPERCOP=OFF`, `libsnark_adsnark.a` will be installed and should be linked in using `-lsnark_adsnark`. -When you use compile you application against `libsnark`, you must have the same conditional defines (`#define FOO` or `g++ -DFOO`) as when you compiled `libsnark`, due to the use of templates. One way to figure out the correct conditional defines is to look at `build/src/CMakeFiles/snark.dir/flags.make` after running `cmake`. ([Issue #21](https://github.com/scipr-lab/libsnark/issues/21)) +When you use compile you application against `libsnark`, you must have the same conditional defines (`#define FOO` or `g++ -DFOO`) as when you compiled `libsnark`, due to the use of templates. One way to figure out the correct conditional defines is to look at `build/libsnark/CMakeFiles/snark.dir/flags.make` after running `cmake`. ([Issue #21](https://github.com/scipr-lab/libsnark/issues/21)) ### Building on Windows using Cygwin @@ -315,16 +315,16 @@ Tutorials libsnark includes a tutorial, and some usage examples, for the high-level API. -* `src/gadgetlib1/examples1` contains a simple example for constructing a +* `libsnark/gadgetlib1/examples1` contains a simple example for constructing a constraint system using gadgetlib1. -* `src/gadgetlib2/examples` contains a tutorial for using gadgetlib2 to express +* `libsnark/gadgetlib2/examples` contains a tutorial for using gadgetlib2 to express NP statements as constraint systems. It introduces basic terminology, design overview, and recommended programming style. It also shows how to invoke ppzkSNARKs on such constraint systems. The main file, `tutorial.cpp`, builds into a standalone executable. -* `src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/profiling/profile_r1cs_ppzksnark.cpp` +* `libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/profiling/profile_r1cs_ppzksnark.cpp` constructs a simple constraint system and runs the ppzksnark. See below for how to run it. @@ -335,7 +335,7 @@ Executing profiling example The command - $ src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/profiling/profile_r1cs_ppzksnark 1000 10 Fr + $ libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/profiling/profile_r1cs_ppzksnark 1000 10 Fr exercises the ppzkSNARK (first generator, then prover, then verifier) on an R1CS instance with 1000 equations and an input consisting of 10 field elements. @@ -345,7 +345,7 @@ R1CS instance with 1000 equations and an input consisting of 10 field elements. The command - $ src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/profiling/profile_r1cs_ppzksnark 1000 10 bytes + $ libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/profiling/profile_r1cs_ppzksnark 1000 10 bytes does the same but now the input consists of 10 bytes. @@ -487,7 +487,7 @@ Directory structure The directory structure of the libsnark library is as follows: -* src/ --- main C++ source code, containing the following modules: +* libsnark/ --- main C++ source code, containing the following modules: * common/ --- miscellaneous utilities * gadgetlib1/ --- gadgetlib1, a library to construct R1CS instances * gadgets/ --- basic gadgets for gadgetlib1 @@ -505,7 +505,7 @@ The directory structure of the libsnark library is as follows: * examples/ --- example code and tutorials for this module * tests/ --- unit tests for this module - In particular, the top-level API examples are at `src/r1cs_ppzksnark/examples/` and `src/gadgetlib2/examples/`. + In particular, the top-level API examples are at `libsnark/r1cs_ppzksnark/examples/` and `libsnark/gadgetlib2/examples/`. -------------------------------------------------------------------------------- diff --git a/doxygen.conf b/doxygen.conf index 5fbe6168..7da88fcd 100644 --- a/doxygen.conf +++ b/doxygen.conf @@ -14,267 +14,267 @@ # Project related configuration options #--------------------------------------------------------------------------- -# This tag specifies the encoding used for all characters in the config file -# that follow. The default is UTF-8 which is also the encoding used for all -# text before the first occurrence of this tag. Doxygen uses libiconv (or the -# iconv built into libc) for the transcoding. See +# This tag specifies the encoding used for all characters in the config file +# that follow. The default is UTF-8 which is also the encoding used for all +# text before the first occurrence of this tag. Doxygen uses libiconv (or the +# iconv built into libc) for the transcoding. See # http://www.gnu.org/software/libiconv for the list of possible encodings. DOXYFILE_ENCODING = UTF-8 -# The PROJECT_NAME tag is a single word (or sequence of words) that should -# identify the project. Note that if you do not use Doxywizard you need +# The PROJECT_NAME tag is a single word (or sequence of words) that should +# identify the project. Note that if you do not use Doxywizard you need # to put quotes around the project name if it contains spaces. PROJECT_NAME = libsnark -# The PROJECT_NUMBER tag can be used to enter a project or revision number. -# This could be handy for archiving the generated documentation or +# The PROJECT_NUMBER tag can be used to enter a project or revision number. +# This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = +PROJECT_NUMBER = -# Using the PROJECT_BRIEF tag one can provide an optional one line description -# for a project that appears at the top of each page and should give viewer +# Using the PROJECT_BRIEF tag one can provide an optional one line description +# for a project that appears at the top of each page and should give viewer # a quick idea about the purpose of the project. Keep the description short. -PROJECT_BRIEF = +PROJECT_BRIEF = -# With the PROJECT_LOGO tag one can specify an logo or icon that is -# included in the documentation. The maximum height of the logo should not -# exceed 55 pixels and the maximum width should not exceed 200 pixels. +# With the PROJECT_LOGO tag one can specify an logo or icon that is +# included in the documentation. The maximum height of the logo should not +# exceed 55 pixels and the maximum width should not exceed 200 pixels. # Doxygen will copy the logo to the output directory. -PROJECT_LOGO = +PROJECT_LOGO = -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) -# base path where the generated documentation will be put. -# If a relative path is entered, it will be relative to the location +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) +# base path where the generated documentation will be put. +# If a relative path is entered, it will be relative to the location # where doxygen was started. If left blank the current directory will be used. -OUTPUT_DIRECTORY = +OUTPUT_DIRECTORY = -# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create -# 4096 sub-directories (in 2 levels) under the output directory of each output -# format and will distribute the generated files over these directories. -# Enabling this option can be useful when feeding doxygen a huge amount of -# source files, where putting all generated files in the same directory would +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create +# 4096 sub-directories (in 2 levels) under the output directory of each output +# format and will distribute the generated files over these directories. +# Enabling this option can be useful when feeding doxygen a huge amount of +# source files, where putting all generated files in the same directory would # otherwise cause performance problems for the file system. CREATE_SUBDIRS = NO -# The OUTPUT_LANGUAGE tag is used to specify the language in which all -# documentation generated by doxygen is written. Doxygen will use this -# information to generate all constant output in the proper language. -# The default language is English, other supported languages are: -# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, -# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, -# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English -# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, -# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# The default language is English, other supported languages are: +# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, +# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, +# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English +# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, +# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, # Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. OUTPUT_LANGUAGE = English -# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will -# include brief member descriptions after the members that are listed in -# the file and class documentation (similar to JavaDoc). +# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will +# include brief member descriptions after the members that are listed in +# the file and class documentation (similar to JavaDoc). # Set to NO to disable this. BRIEF_MEMBER_DESC = YES -# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend -# the brief description of a member or function before the detailed description. -# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend +# the brief description of a member or function before the detailed description. +# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the # brief descriptions will be completely suppressed. REPEAT_BRIEF = YES -# This tag implements a quasi-intelligent brief description abbreviator -# that is used to form the text in various listings. Each string -# in this list, if found as the leading text of the brief description, will be -# stripped from the text and the result after processing the whole list, is -# used as the annotated text. Otherwise, the brief description is used as-is. -# If left blank, the following values are used ("$name" is automatically -# replaced with the name of the entity): "The $name class" "The $name widget" -# "The $name file" "is" "provides" "specifies" "contains" +# This tag implements a quasi-intelligent brief description abbreviator +# that is used to form the text in various listings. Each string +# in this list, if found as the leading text of the brief description, will be +# stripped from the text and the result after processing the whole list, is +# used as the annotated text. Otherwise, the brief description is used as-is. +# If left blank, the following values are used ("$name" is automatically +# replaced with the name of the entity): "The $name class" "The $name widget" +# "The $name file" "is" "provides" "specifies" "contains" # "represents" "a" "an" "the" -ABBREVIATE_BRIEF = +ABBREVIATE_BRIEF = -# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# Doxygen will generate a detailed section even if there is only a brief +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# Doxygen will generate a detailed section even if there is only a brief # description. ALWAYS_DETAILED_SEC = NO -# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all -# inherited members of a class in the documentation of that class as if those -# members were ordinary class members. Constructors, destructors and assignment +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment # operators of the base classes will not be shown. INLINE_INHERITED_MEMB = NO -# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full -# path before files name in the file list and in the header files. If set +# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full +# path before files name in the file list and in the header files. If set # to NO the shortest path that makes the file name unique will be used. FULL_PATH_NAMES = YES -# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag -# can be used to strip a user-defined part of the path. Stripping is -# only done if one of the specified strings matches the left-hand part of -# the path. The tag can be used to show relative paths in the file list. -# If left blank the directory from which doxygen is run is used as the -# path to strip. Note that you specify absolute paths here, but also -# relative paths, which will be relative from the directory where doxygen is +# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag +# can be used to strip a user-defined part of the path. Stripping is +# only done if one of the specified strings matches the left-hand part of +# the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the +# path to strip. Note that you specify absolute paths here, but also +# relative paths, which will be relative from the directory where doxygen is # started. -STRIP_FROM_PATH = src +STRIP_FROM_PATH = libsnark -# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of -# the path mentioned in the documentation of a class, which tells -# the reader which header file to include in order to use a class. -# If left blank only the name of the header file containing the class -# definition is used. Otherwise one should specify the include paths that +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of +# the path mentioned in the documentation of a class, which tells +# the reader which header file to include in order to use a class. +# If left blank only the name of the header file containing the class +# definition is used. Otherwise one should specify the include paths that # are normally passed to the compiler using the -I flag. -STRIP_FROM_INC_PATH = +STRIP_FROM_INC_PATH = -# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter -# (but less readable) file names. This can be useful if your file system +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter +# (but less readable) file names. This can be useful if your file system # doesn't support long names like on DOS, Mac, or CD-ROM. SHORT_NAMES = NO -# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen -# will interpret the first line (until the first dot) of a JavaDoc-style -# comment as the brief description. If set to NO, the JavaDoc -# comments will behave just like regular Qt-style comments +# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen +# will interpret the first line (until the first dot) of a JavaDoc-style +# comment as the brief description. If set to NO, the JavaDoc +# comments will behave just like regular Qt-style comments # (thus requiring an explicit @brief command for a brief description.) JAVADOC_AUTOBRIEF = YES -# If the QT_AUTOBRIEF tag is set to YES then Doxygen will -# interpret the first line (until the first dot) of a Qt-style -# comment as the brief description. If set to NO, the comments -# will behave just like regular Qt-style comments (thus requiring +# If the QT_AUTOBRIEF tag is set to YES then Doxygen will +# interpret the first line (until the first dot) of a Qt-style +# comment as the brief description. If set to NO, the comments +# will behave just like regular Qt-style comments (thus requiring # an explicit \brief command for a brief description.) QT_AUTOBRIEF = NO -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen -# treat a multi-line C++ special comment block (i.e. a block of //! or /// -# comments) as a brief description. This used to be the default behaviour. -# The new default is to treat a multi-line C++ comment block as a detailed +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen +# treat a multi-line C++ special comment block (i.e. a block of //! or /// +# comments) as a brief description. This used to be the default behaviour. +# The new default is to treat a multi-line C++ comment block as a detailed # description. Set this tag to YES if you prefer the old behaviour instead. MULTILINE_CPP_IS_BRIEF = NO -# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented -# member inherits the documentation from any documented member that it +# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented +# member inherits the documentation from any documented member that it # re-implements. INHERIT_DOCS = YES -# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce -# a new page for each member. If set to NO, the documentation of a member will +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce +# a new page for each member. If set to NO, the documentation of a member will # be part of the file/class/namespace that contains it. SEPARATE_MEMBER_PAGES = NO -# The TAB_SIZE tag can be used to set the number of spaces in a tab. +# The TAB_SIZE tag can be used to set the number of spaces in a tab. # Doxygen uses this value to replace tabs by spaces in code fragments. TAB_SIZE = 8 -# This tag can be used to specify a number of aliases that acts -# as commands in the documentation. An alias has the form "name=value". -# For example adding "sideeffect=\par Side Effects:\n" will allow you to -# put the command \sideeffect (or @sideeffect) in the documentation, which -# will result in a user-defined paragraph with heading "Side Effects:". +# This tag can be used to specify a number of aliases that acts +# as commands in the documentation. An alias has the form "name=value". +# For example adding "sideeffect=\par Side Effects:\n" will allow you to +# put the command \sideeffect (or @sideeffect) in the documentation, which +# will result in a user-defined paragraph with heading "Side Effects:". # You can put \n's in the value part of an alias to insert newlines. -ALIASES = +ALIASES = -# This tag can be used to specify a number of word-keyword mappings (TCL only). -# A mapping has the form "name=value". For example adding -# "class=itcl::class" will allow you to use the command class in the +# This tag can be used to specify a number of word-keyword mappings (TCL only). +# A mapping has the form "name=value". For example adding +# "class=itcl::class" will allow you to use the command class in the # itcl::class meaning. -TCL_SUBST = +TCL_SUBST = -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C -# sources only. Doxygen will then generate output that is more tailored for C. -# For instance, some of the names that are used will be different. The list +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C +# sources only. Doxygen will then generate output that is more tailored for C. +# For instance, some of the names that are used will be different. The list # of all members will be omitted, etc. OPTIMIZE_OUTPUT_FOR_C = NO -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java -# sources only. Doxygen will then generate output that is more tailored for -# Java. For instance, namespaces will be presented as packages, qualified +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java +# sources only. Doxygen will then generate output that is more tailored for +# Java. For instance, namespaces will be presented as packages, qualified # scopes will look different, etc. OPTIMIZE_OUTPUT_JAVA = NO -# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran -# sources only. Doxygen will then generate output that is more tailored for +# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran +# sources only. Doxygen will then generate output that is more tailored for # Fortran. OPTIMIZE_FOR_FORTRAN = NO -# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL -# sources. Doxygen will then generate output that is tailored for +# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL +# sources. Doxygen will then generate output that is tailored for # VHDL. OPTIMIZE_OUTPUT_VHDL = NO -# Doxygen selects the parser to use depending on the extension of the files it -# parses. With this tag you can assign which parser to use for a given -# extension. Doxygen has a built-in mapping, but you can override or extend it -# using this tag. The format is ext=language, where ext is a file extension, -# and language is one of the parsers supported by doxygen: IDL, Java, -# Javascript, CSharp, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, -# C++. For instance to make doxygen treat .inc files as Fortran files (default -# is PHP), and .f files as C (default is Fortran), use: inc=Fortran f=C. Note -# that for custom extensions you also need to set FILE_PATTERNS otherwise the +# Doxygen selects the parser to use depending on the extension of the files it +# parses. With this tag you can assign which parser to use for a given +# extension. Doxygen has a built-in mapping, but you can override or extend it +# using this tag. The format is ext=language, where ext is a file extension, +# and language is one of the parsers supported by doxygen: IDL, Java, +# Javascript, CSharp, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, +# C++. For instance to make doxygen treat .inc files as Fortran files (default +# is PHP), and .f files as C (default is Fortran), use: inc=Fortran f=C. Note +# that for custom extensions you also need to set FILE_PATTERNS otherwise the # files are not read by doxygen. EXTENSION_MAPPING = tcc=C++ -# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all -# comments according to the Markdown format, which allows for more readable -# documentation. See http://daringfireball.net/projects/markdown/ for details. -# The output of markdown processing is further processed by doxygen, so you -# can mix doxygen, HTML, and XML commands with Markdown formatting. +# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all +# comments according to the Markdown format, which allows for more readable +# documentation. See http://daringfireball.net/projects/markdown/ for details. +# The output of markdown processing is further processed by doxygen, so you +# can mix doxygen, HTML, and XML commands with Markdown formatting. # Disable only in case of backward compatibilities issues. MARKDOWN_SUPPORT = YES -# When enabled doxygen tries to link words that correspond to documented classes, -# or namespaces to their corresponding documentation. Such a link can be -# prevented in individual cases by by putting a % sign in front of the word or +# When enabled doxygen tries to link words that correspond to documented classes, +# or namespaces to their corresponding documentation. Such a link can be +# prevented in individual cases by by putting a % sign in front of the word or # globally by setting AUTOLINK_SUPPORT to NO. AUTOLINK_SUPPORT = YES -# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want -# to include (a tag file for) the STL sources as input, then you should -# set this tag to YES in order to let doxygen match functions declarations and -# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. -# func(std::string) {}). This also makes the inheritance and collaboration +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want +# to include (a tag file for) the STL sources as input, then you should +# set this tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. +# func(std::string) {}). This also makes the inheritance and collaboration # diagrams that involve STL classes more complete and accurate. BUILTIN_STL_SUPPORT = NO -# If you use Microsoft's C++/CLI language, you should set this option to YES to +# If you use Microsoft's C++/CLI language, you should set this option to YES to # enable parsing support. CPP_CLI_SUPPORT = NO -# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. -# Doxygen will parse them like normal C++ but will assume all classes use public +# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. +# Doxygen will parse them like normal C++ but will assume all classes use public # instead of private inheritance when no explicit protection keyword is present. SIP_SUPPORT = NO @@ -288,70 +288,70 @@ SIP_SUPPORT = NO IDL_PROPERTY_SUPPORT = YES -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES, then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default # all members of a group must be documented explicitly. DISTRIBUTE_GROUP_DOC = NO -# Set the SUBGROUPING tag to YES (the default) to allow class member groups of -# the same type (for instance a group of public functions) to be put as a -# subgroup of that type (e.g. under the Public Functions section). Set it to -# NO to prevent subgrouping. Alternatively, this can be done per class using +# Set the SUBGROUPING tag to YES (the default) to allow class member groups of +# the same type (for instance a group of public functions) to be put as a +# subgroup of that type (e.g. under the Public Functions section). Set it to +# NO to prevent subgrouping. Alternatively, this can be done per class using # the \nosubgrouping command. SUBGROUPING = YES -# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and -# unions are shown inside the group in which they are included (e.g. using -# @ingroup) instead of on a separate page (for HTML and Man pages) or +# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and +# unions are shown inside the group in which they are included (e.g. using +# @ingroup) instead of on a separate page (for HTML and Man pages) or # section (for LaTeX and RTF). INLINE_GROUPED_CLASSES = NO -# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and -# unions with only public data fields will be shown inline in the documentation -# of the scope in which they are defined (i.e. file, namespace, or group -# documentation), provided this scope is documented. If set to NO (the default), -# structs, classes, and unions are shown on a separate page (for HTML and Man +# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and +# unions with only public data fields will be shown inline in the documentation +# of the scope in which they are defined (i.e. file, namespace, or group +# documentation), provided this scope is documented. If set to NO (the default), +# structs, classes, and unions are shown on a separate page (for HTML and Man # pages) or section (for LaTeX and RTF). INLINE_SIMPLE_STRUCTS = NO -# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum -# is documented as struct, union, or enum with the name of the typedef. So -# typedef struct TypeS {} TypeT, will appear in the documentation as a struct -# with name TypeT. When disabled the typedef will appear as a member of a file, -# namespace, or class. And the struct will be named TypeS. This can typically -# be useful for C code in case the coding convention dictates that all compound +# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum +# is documented as struct, union, or enum with the name of the typedef. So +# typedef struct TypeS {} TypeT, will appear in the documentation as a struct +# with name TypeT. When disabled the typedef will appear as a member of a file, +# namespace, or class. And the struct will be named TypeS. This can typically +# be useful for C code in case the coding convention dictates that all compound # types are typedef'ed and only the typedef is referenced, never the tag name. TYPEDEF_HIDES_STRUCT = NO -# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to -# determine which symbols to keep in memory and which to flush to disk. -# When the cache is full, less often used symbols will be written to disk. -# For small to medium size projects (<1000 input files) the default value is -# probably good enough. For larger projects a too small cache size can cause -# doxygen to be busy swapping symbols to and from disk most of the time -# causing a significant performance penalty. -# If the system has enough physical memory increasing the cache will improve the -# performance by keeping more symbols in memory. Note that the value works on -# a logarithmic scale so increasing the size by one will roughly double the -# memory usage. The cache size is given by this formula: -# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, +# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to +# determine which symbols to keep in memory and which to flush to disk. +# When the cache is full, less often used symbols will be written to disk. +# For small to medium size projects (<1000 input files) the default value is +# probably good enough. For larger projects a too small cache size can cause +# doxygen to be busy swapping symbols to and from disk most of the time +# causing a significant performance penalty. +# If the system has enough physical memory increasing the cache will improve the +# performance by keeping more symbols in memory. Note that the value works on +# a logarithmic scale so increasing the size by one will roughly double the +# memory usage. The cache size is given by this formula: +# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, # corresponding to a cache size of 2^16 = 65536 symbols. SYMBOL_CACHE_SIZE = 0 -# Similar to the SYMBOL_CACHE_SIZE the size of the symbol lookup cache can be -# set using LOOKUP_CACHE_SIZE. This cache is used to resolve symbols given -# their name and scope. Since this can be an expensive process and often the -# same symbol appear multiple times in the code, doxygen keeps a cache of -# pre-resolved symbols. If the cache is too small doxygen will become slower. -# If the cache is too large, memory is wasted. The cache size is given by this -# formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range is 0..9, the default is 0, +# Similar to the SYMBOL_CACHE_SIZE the size of the symbol lookup cache can be +# set using LOOKUP_CACHE_SIZE. This cache is used to resolve symbols given +# their name and scope. Since this can be an expensive process and often the +# same symbol appear multiple times in the code, doxygen keeps a cache of +# pre-resolved symbols. If the cache is too small doxygen will become slower. +# If the cache is too large, memory is wasted. The cache size is given by this +# formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range is 0..9, the default is 0, # corresponding to a cache size of 2^16 = 65536 symbols. LOOKUP_CACHE_SIZE = 0 @@ -360,400 +360,400 @@ LOOKUP_CACHE_SIZE = 0 # Build related configuration options #--------------------------------------------------------------------------- -# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in -# documentation are documented, even if no documentation was available. -# Private class members and static file members will be hidden unless +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. +# Private class members and static file members will be hidden unless # the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES EXTRACT_ALL = YES -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class # will be included in the documentation. EXTRACT_PRIVATE = YES -# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal +# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal # scope will be included in the documentation. EXTRACT_PACKAGE = NO -# If the EXTRACT_STATIC tag is set to YES all static members of a file +# If the EXTRACT_STATIC tag is set to YES all static members of a file # will be included in the documentation. EXTRACT_STATIC = YES -# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) -# defined locally in source files will be included in the documentation. +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) +# defined locally in source files will be included in the documentation. # If set to NO only classes defined in header files are included. EXTRACT_LOCAL_CLASSES = YES -# This flag is only useful for Objective-C code. When set to YES local -# methods, which are defined in the implementation section but not in -# the interface are included in the documentation. +# This flag is only useful for Objective-C code. When set to YES local +# methods, which are defined in the implementation section but not in +# the interface are included in the documentation. # If set to NO (the default) only methods in the interface are included. EXTRACT_LOCAL_METHODS = NO -# If this flag is set to YES, the members of anonymous namespaces will be -# extracted and appear in the documentation as a namespace called -# 'anonymous_namespace{file}', where file will be replaced with the base -# name of the file that contains the anonymous namespace. By default +# If this flag is set to YES, the members of anonymous namespaces will be +# extracted and appear in the documentation as a namespace called +# 'anonymous_namespace{file}', where file will be replaced with the base +# name of the file that contains the anonymous namespace. By default # anonymous namespaces are hidden. EXTRACT_ANON_NSPACES = NO -# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all -# undocumented members of documented classes, files or namespaces. -# If set to NO (the default) these members will be included in the -# various overviews, but no documentation section is generated. +# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all +# undocumented members of documented classes, files or namespaces. +# If set to NO (the default) these members will be included in the +# various overviews, but no documentation section is generated. # This option has no effect if EXTRACT_ALL is enabled. HIDE_UNDOC_MEMBERS = NO -# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. -# If set to NO (the default) these classes will be included in the various +# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. +# If set to NO (the default) these classes will be included in the various # overviews. This option has no effect if EXTRACT_ALL is enabled. HIDE_UNDOC_CLASSES = NO -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all -# friend (class|struct|union) declarations. -# If set to NO (the default) these declarations will be included in the +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all +# friend (class|struct|union) declarations. +# If set to NO (the default) these declarations will be included in the # documentation. HIDE_FRIEND_COMPOUNDS = NO -# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any -# documentation blocks found inside the body of a function. -# If set to NO (the default) these blocks will be appended to the +# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any +# documentation blocks found inside the body of a function. +# If set to NO (the default) these blocks will be appended to the # function's detailed documentation block. HIDE_IN_BODY_DOCS = NO -# The INTERNAL_DOCS tag determines if documentation -# that is typed after a \internal command is included. If the tag is set -# to NO (the default) then the documentation will be excluded. +# The INTERNAL_DOCS tag determines if documentation +# that is typed after a \internal command is included. If the tag is set +# to NO (the default) then the documentation will be excluded. # Set it to YES to include the internal documentation. INTERNAL_DOCS = NO -# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate -# file names in lower-case letters. If set to YES upper-case letters are also -# allowed. This is useful if you have classes or files whose names only differ -# in case and if your file system supports case sensitive file names. Windows +# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate +# file names in lower-case letters. If set to YES upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows # and Mac users are advised to set this option to NO. CASE_SENSE_NAMES = YES -# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen -# will show members with their full class and namespace scopes in the +# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen +# will show members with their full class and namespace scopes in the # documentation. If set to YES the scope will be hidden. HIDE_SCOPE_NAMES = NO -# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen -# will put a list of the files that are included by a file in the documentation +# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen +# will put a list of the files that are included by a file in the documentation # of that file. SHOW_INCLUDE_FILES = YES -# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen -# will list include files with double quotes in the documentation +# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen +# will list include files with double quotes in the documentation # rather than with sharp brackets. FORCE_LOCAL_INCLUDES = NO -# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] +# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] # is inserted in the documentation for inline members. INLINE_INFO = YES -# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen -# will sort the (detailed) documentation of file and class members -# alphabetically by member name. If set to NO the members will appear in +# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen +# will sort the (detailed) documentation of file and class members +# alphabetically by member name. If set to NO the members will appear in # declaration order. SORT_MEMBER_DOCS = YES -# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the -# brief documentation of file, namespace and class members alphabetically -# by member name. If set to NO (the default) the members will appear in +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the +# brief documentation of file, namespace and class members alphabetically +# by member name. If set to NO (the default) the members will appear in # declaration order. SORT_BRIEF_DOCS = NO -# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen -# will sort the (brief and detailed) documentation of class members so that -# constructors and destructors are listed first. If set to NO (the default) -# the constructors will appear in the respective orders defined by -# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. -# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO +# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen +# will sort the (brief and detailed) documentation of class members so that +# constructors and destructors are listed first. If set to NO (the default) +# the constructors will appear in the respective orders defined by +# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. +# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO # and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO. SORT_MEMBERS_CTORS_1ST = NO -# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the -# hierarchy of group names into alphabetical order. If set to NO (the default) +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the +# hierarchy of group names into alphabetical order. If set to NO (the default) # the group names will appear in their defined order. SORT_GROUP_NAMES = NO -# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be -# sorted by fully-qualified names, including namespaces. If set to -# NO (the default), the class list will be sorted only by class name, -# not including the namespace part. -# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. -# Note: This option applies only to the class list, not to the +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be +# sorted by fully-qualified names, including namespaces. If set to +# NO (the default), the class list will be sorted only by class name, +# not including the namespace part. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option applies only to the class list, not to the # alphabetical list. SORT_BY_SCOPE_NAME = NO -# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to -# do proper type resolution of all parameters of a function it will reject a -# match between the prototype and the implementation of a member function even -# if there is only one candidate or it is obvious which candidate to choose -# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen +# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to +# do proper type resolution of all parameters of a function it will reject a +# match between the prototype and the implementation of a member function even +# if there is only one candidate or it is obvious which candidate to choose +# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen # will still accept a match between prototype and implementation in such cases. STRICT_PROTO_MATCHING = NO -# The GENERATE_TODOLIST tag can be used to enable (YES) or -# disable (NO) the todo list. This list is created by putting \todo +# The GENERATE_TODOLIST tag can be used to enable (YES) or +# disable (NO) the todo list. This list is created by putting \todo # commands in the documentation. GENERATE_TODOLIST = YES -# The GENERATE_TESTLIST tag can be used to enable (YES) or -# disable (NO) the test list. This list is created by putting \test +# The GENERATE_TESTLIST tag can be used to enable (YES) or +# disable (NO) the test list. This list is created by putting \test # commands in the documentation. GENERATE_TESTLIST = YES -# The GENERATE_BUGLIST tag can be used to enable (YES) or -# disable (NO) the bug list. This list is created by putting \bug +# The GENERATE_BUGLIST tag can be used to enable (YES) or +# disable (NO) the bug list. This list is created by putting \bug # commands in the documentation. GENERATE_BUGLIST = YES -# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or -# disable (NO) the deprecated list. This list is created by putting +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or +# disable (NO) the deprecated list. This list is created by putting # \deprecated commands in the documentation. GENERATE_DEPRECATEDLIST= YES -# The ENABLED_SECTIONS tag can be used to enable conditional +# The ENABLED_SECTIONS tag can be used to enable conditional # documentation sections, marked by \if sectionname ... \endif. -ENABLED_SECTIONS = +ENABLED_SECTIONS = -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines -# the initial value of a variable or macro consists of for it to appear in -# the documentation. If the initializer consists of more lines than specified -# here it will be hidden. Use a value of 0 to hide initializers completely. -# The appearance of the initializer of individual variables and macros in the -# documentation can be controlled using \showinitializer or \hideinitializer +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines +# the initial value of a variable or macro consists of for it to appear in +# the documentation. If the initializer consists of more lines than specified +# here it will be hidden. Use a value of 0 to hide initializers completely. +# The appearance of the initializer of individual variables and macros in the +# documentation can be controlled using \showinitializer or \hideinitializer # command in the documentation regardless of this setting. MAX_INITIALIZER_LINES = 30 -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated -# at the bottom of the documentation of classes and structs. If set to YES the +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated +# at the bottom of the documentation of classes and structs. If set to YES the # list will mention the files that were used to generate the documentation. SHOW_USED_FILES = YES -# Set the SHOW_FILES tag to NO to disable the generation of the Files page. -# This will remove the Files entry from the Quick Index and from the +# Set the SHOW_FILES tag to NO to disable the generation of the Files page. +# This will remove the Files entry from the Quick Index and from the # Folder Tree View (if specified). The default is YES. SHOW_FILES = YES -# Set the SHOW_NAMESPACES tag to NO to disable the generation of the -# Namespaces page. This will remove the Namespaces entry from the Quick Index +# Set the SHOW_NAMESPACES tag to NO to disable the generation of the +# Namespaces page. This will remove the Namespaces entry from the Quick Index # and from the Folder Tree View (if specified). The default is YES. SHOW_NAMESPACES = YES -# The FILE_VERSION_FILTER tag can be used to specify a program or script that -# doxygen should invoke to get the current version for each file (typically from -# the version control system). Doxygen will invoke the program by executing (via -# popen()) the command , where is the value of -# the FILE_VERSION_FILTER tag, and is the name of an input file -# provided by doxygen. Whatever the program writes to standard output +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from +# the version control system). Doxygen will invoke the program by executing (via +# popen()) the command , where is the value of +# the FILE_VERSION_FILTER tag, and is the name of an input file +# provided by doxygen. Whatever the program writes to standard output # is used as the file version. See the manual for examples. -FILE_VERSION_FILTER = +FILE_VERSION_FILTER = -# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed -# by doxygen. The layout file controls the global structure of the generated -# output files in an output format independent way. To create the layout file -# that represents doxygen's defaults, run doxygen with the -l option. -# You can optionally specify a file name after the option, if omitted +# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed +# by doxygen. The layout file controls the global structure of the generated +# output files in an output format independent way. To create the layout file +# that represents doxygen's defaults, run doxygen with the -l option. +# You can optionally specify a file name after the option, if omitted # DoxygenLayout.xml will be used as the name of the layout file. -LAYOUT_FILE = +LAYOUT_FILE = -# The CITE_BIB_FILES tag can be used to specify one or more bib files -# containing the references data. This must be a list of .bib files. The -# .bib extension is automatically appended if omitted. Using this command -# requires the bibtex tool to be installed. See also -# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style -# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this +# The CITE_BIB_FILES tag can be used to specify one or more bib files +# containing the references data. This must be a list of .bib files. The +# .bib extension is automatically appended if omitted. Using this command +# requires the bibtex tool to be installed. See also +# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style +# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this # feature you need bibtex and perl available in the search path. -CITE_BIB_FILES = +CITE_BIB_FILES = #--------------------------------------------------------------------------- # configuration options related to warning and progress messages #--------------------------------------------------------------------------- -# The QUIET tag can be used to turn on/off the messages that are generated +# The QUIET tag can be used to turn on/off the messages that are generated # by doxygen. Possible values are YES and NO. If left blank NO is used. QUIET = NO -# The WARNINGS tag can be used to turn on/off the warning messages that are -# generated by doxygen. Possible values are YES and NO. If left blank +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated by doxygen. Possible values are YES and NO. If left blank # NO is used. WARNINGS = YES -# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings -# for undocumented members. If EXTRACT_ALL is set to YES then this flag will +# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings +# for undocumented members. If EXTRACT_ALL is set to YES then this flag will # automatically be disabled. WARN_IF_UNDOCUMENTED = YES -# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as not documenting some -# parameters in a documented function, or documenting parameters that +# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some +# parameters in a documented function, or documenting parameters that # don't exist or using markup commands wrongly. WARN_IF_DOC_ERROR = YES -# The WARN_NO_PARAMDOC option can be enabled to get warnings for -# functions that are documented, but have no documentation for their parameters -# or return value. If set to NO (the default) doxygen will only warn about -# wrong or incomplete parameter documentation, but not about the absence of +# The WARN_NO_PARAMDOC option can be enabled to get warnings for +# functions that are documented, but have no documentation for their parameters +# or return value. If set to NO (the default) doxygen will only warn about +# wrong or incomplete parameter documentation, but not about the absence of # documentation. WARN_NO_PARAMDOC = NO -# The WARN_FORMAT tag determines the format of the warning messages that -# doxygen can produce. The string should contain the $file, $line, and $text -# tags, which will be replaced by the file and line number from which the -# warning originated and the warning text. Optionally the format may contain -# $version, which will be replaced by the version of the file (if it could +# The WARN_FORMAT tag determines the format of the warning messages that +# doxygen can produce. The string should contain the $file, $line, and $text +# tags, which will be replaced by the file and line number from which the +# warning originated and the warning text. Optionally the format may contain +# $version, which will be replaced by the version of the file (if it could # be obtained via FILE_VERSION_FILTER) WARN_FORMAT = "$file:$line: $text" -# The WARN_LOGFILE tag can be used to specify a file to which warning -# and error messages should be written. If left blank the output is written +# The WARN_LOGFILE tag can be used to specify a file to which warning +# and error messages should be written. If left blank the output is written # to stderr. -WARN_LOGFILE = +WARN_LOGFILE = #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- -# The INPUT tag can be used to specify the files and/or directories that contain -# documented source files. You may enter file names like "myfile.cpp" or -# directories like "/usr/src/myproject". Separate the files or directories +# The INPUT tag can be used to specify the files and/or directories that contain +# documented source files. You may enter file names like "myfile.cpp" or +# directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = src README.md +INPUT = libsnark README.md -# This tag can be used to specify the character encoding of the source files -# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is -# also the default input encoding. Doxygen uses libiconv (or the iconv built -# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for +# This tag can be used to specify the character encoding of the source files +# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is +# also the default input encoding. Doxygen uses libiconv (or the iconv built +# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for # the list of possible encodings. INPUT_ENCODING = UTF-8 -# If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank the following patterns are tested: -# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh -# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank the following patterns are tested: +# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh +# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py # *.f90 *.f *.for *.vhd *.vhdl FILE_PATTERNS = *.md *.c *.h *.cpp *.hpp *.tcc *.inc *.cc -# The RECURSIVE tag can be used to turn specify whether or not subdirectories -# should be searched for input files as well. Possible values are YES and NO. +# The RECURSIVE tag can be used to turn specify whether or not subdirectories +# should be searched for input files as well. Possible values are YES and NO. # If left blank NO is used. RECURSIVE = YES -# The EXCLUDE tag can be used to specify files and/or directories that should be -# excluded from the INPUT source files. This way you can easily exclude a -# subdirectory from a directory tree whose root is specified with the INPUT tag. -# Note that relative paths are relative to the directory from which doxygen is +# The EXCLUDE tag can be used to specify files and/or directories that should be +# excluded from the INPUT source files. This way you can easily exclude a +# subdirectory from a directory tree whose root is specified with the INPUT tag. +# Note that relative paths are relative to the directory from which doxygen is # run. EXCLUDE = Debug \ Release -# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or -# directories that are symbolic links (a Unix file system feature) are excluded +# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or +# directories that are symbolic links (a Unix file system feature) are excluded # from the input. EXCLUDE_SYMLINKS = NO -# If the value of the INPUT tag contains directories, you can use the -# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. Note that the wildcards are matched -# against the file with absolute path, so to exclude all test directories +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. Note that the wildcards are matched +# against the file with absolute path, so to exclude all test directories # for example use the pattern */test/* -EXCLUDE_PATTERNS = +EXCLUDE_PATTERNS = -# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names -# (namespaces, classes, functions, etc.) that should be excluded from the -# output. The symbol name can be a fully qualified name, a word, or if the -# wildcard * is used, a substring. Examples: ANamespace, AClass, +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the +# output. The symbol name can be a fully qualified name, a word, or if the +# wildcard * is used, a substring. Examples: ANamespace, AClass, # AClass::ANamespace, ANamespace::*Test -EXCLUDE_SYMBOLS = +EXCLUDE_SYMBOLS = -# The EXAMPLE_PATH tag can be used to specify one or more files or -# directories that contain example code fragments that are included (see +# The EXAMPLE_PATH tag can be used to specify one or more files or +# directories that contain example code fragments that are included (see # the \include command). -EXAMPLE_PATH = +EXAMPLE_PATH = -# If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left # blank all files are included. -EXAMPLE_PATTERNS = +EXAMPLE_PATTERNS = -# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be -# searched for input files to be used with the \include or \dontinclude -# commands irrespective of the value of the RECURSIVE tag. +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude +# commands irrespective of the value of the RECURSIVE tag. # Possible values are YES and NO. If left blank NO is used. EXAMPLE_RECURSIVE = NO -# The IMAGE_PATH tag can be used to specify one or more files or -# directories that contain image that are included in the documentation (see +# The IMAGE_PATH tag can be used to specify one or more files or +# directories that contain image that are included in the documentation (see # the \image command). -IMAGE_PATH = +IMAGE_PATH = -# The INPUT_FILTER tag can be used to specify a program that doxygen should -# invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command , where -# is the value of the INPUT_FILTER tag, and is the name of an -# input file. Doxygen will then use the output that the filter program writes -# to standard output. If FILTER_PATTERNS is specified, this tag will be +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command , where +# is the value of the INPUT_FILTER tag, and is the name of an +# input file. Doxygen will then use the output that the filter program writes +# to standard output. If FILTER_PATTERNS is specified, this tag will be # ignored. INPUT_FILTER = "perl -pe 's/^(libsnark: .*)$/$1 {#mainpage}/ if $.==1; s!//+ *(TODO|FIXME|XXX)!/// \\todo!'" @@ -761,80 +761,80 @@ INPUT_FILTER = "perl -pe 's/^(libsnark: .*)$/$1 {#mainpage}/ if $.==1; # The 2nd replacement identifies additional TODO notations. # These should be done with FILTER_PATTERNS instead, but it looks like shell escaping is different there. -# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern -# basis. Doxygen will compare the file name with each pattern and apply the -# filter if there is a match. The filters are a list of the form: -# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further -# info on how filters are used. If FILTER_PATTERNS is empty or if +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. The filters are a list of the form: +# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further +# info on how filters are used. If FILTER_PATTERNS is empty or if # non of the patterns match the file name, INPUT_FILTER is applied. FILTER_PATTERNS = -# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER) will be used to filter the input files when producing source +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will be used to filter the input files when producing source # files to browse (i.e. when SOURCE_BROWSER is set to YES). FILTER_SOURCE_FILES = NO -# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file -# pattern. A pattern will override the setting for FILTER_PATTERN (if any) -# and it is also possible to disable source filtering for a specific pattern -# using *.ext= (so without naming a filter). This option only has effect when +# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file +# pattern. A pattern will override the setting for FILTER_PATTERN (if any) +# and it is also possible to disable source filtering for a specific pattern +# using *.ext= (so without naming a filter). This option only has effect when # FILTER_SOURCE_FILES is enabled. -FILTER_SOURCE_PATTERNS = +FILTER_SOURCE_PATTERNS = #--------------------------------------------------------------------------- # configuration options related to source browsing #--------------------------------------------------------------------------- -# If the SOURCE_BROWSER tag is set to YES then a list of source files will -# be generated. Documented entities will be cross-referenced with these sources. -# Note: To get rid of all source code in the generated output, make sure also +# If the SOURCE_BROWSER tag is set to YES then a list of source files will +# be generated. Documented entities will be cross-referenced with these sources. +# Note: To get rid of all source code in the generated output, make sure also # VERBATIM_HEADERS is set to NO. SOURCE_BROWSER = YES -# Setting the INLINE_SOURCES tag to YES will include the body +# Setting the INLINE_SOURCES tag to YES will include the body # of functions and classes directly in the documentation. INLINE_SOURCES = YES -# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct -# doxygen to hide any special comment blocks from generated source code +# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct +# doxygen to hide any special comment blocks from generated source code # fragments. Normal C, C++ and Fortran comments will always remain visible. STRIP_CODE_COMMENTS = NO -# If the REFERENCED_BY_RELATION tag is set to YES -# then for each documented function all documented +# If the REFERENCED_BY_RELATION tag is set to YES +# then for each documented function all documented # functions referencing it will be listed. REFERENCED_BY_RELATION = NO -# If the REFERENCES_RELATION tag is set to YES -# then for each documented function all documented entities +# If the REFERENCES_RELATION tag is set to YES +# then for each documented function all documented entities # called/used by that function will be listed. REFERENCES_RELATION = NO -# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) -# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from -# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will +# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) +# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from +# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will # link to the source code. Otherwise they will link to the documentation. REFERENCES_LINK_SOURCE = YES -# If the USE_HTAGS tag is set to YES then the references to source code -# will point to the HTML generated by the htags(1) tool instead of doxygen -# built-in source browser. The htags tool is part of GNU's global source -# tagging system (see http://www.gnu.org/software/global/global.html). You +# If the USE_HTAGS tag is set to YES then the references to source code +# will point to the HTML generated by the htags(1) tool instead of doxygen +# built-in source browser. The htags tool is part of GNU's global source +# tagging system (see http://www.gnu.org/software/global/global.html). You # will need version 4.8.6 or higher. USE_HTAGS = NO -# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen -# will generate a verbatim copy of the header file for each class for +# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen +# will generate a verbatim copy of the header file for each class for # which an include is specified. Set to NO to disable this. VERBATIM_HEADERS = YES @@ -843,170 +843,170 @@ VERBATIM_HEADERS = YES # configuration options related to the alphabetical class index #--------------------------------------------------------------------------- -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index -# of all compounds will be generated. Enable this if the project +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index +# of all compounds will be generated. Enable this if the project # contains a lot of classes, structs, unions or interfaces. ALPHABETICAL_INDEX = YES -# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then -# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns +# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then +# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns # in which this list will be split (can be a number in the range [1..20]) COLS_IN_ALPHA_INDEX = 5 -# In case all classes in a project start with a common prefix, all -# classes will be put under the same header in the alphabetical index. -# The IGNORE_PREFIX tag can be used to specify one or more prefixes that +# In case all classes in a project start with a common prefix, all +# classes will be put under the same header in the alphabetical index. +# The IGNORE_PREFIX tag can be used to specify one or more prefixes that # should be ignored while generating the index headers. -IGNORE_PREFIX = +IGNORE_PREFIX = #--------------------------------------------------------------------------- # configuration options related to the HTML output #--------------------------------------------------------------------------- -# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# If the GENERATE_HTML tag is set to YES (the default) Doxygen will # generate HTML output. GENERATE_HTML = YES -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `html' will be used as the default path. HTML_OUTPUT = doxygen -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for -# each generated HTML page (for example: .htm,.php,.asp). If it is left blank +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for +# each generated HTML page (for example: .htm,.php,.asp). If it is left blank # doxygen will generate files with .html extension. HTML_FILE_EXTENSION = .html -# The HTML_HEADER tag can be used to specify a personal HTML header for -# each generated HTML page. If it is left blank doxygen will generate a -# standard header. Note that when using a custom header you are responsible -# for the proper inclusion of any scripts and style sheets that doxygen -# needs, which is dependent on the configuration options used. -# It is advised to generate a default header using "doxygen -w html -# header.html footer.html stylesheet.css YourConfigFile" and then modify -# that header. Note that the header is subject to change so you typically -# have to redo this when upgrading to a newer version of doxygen or when +# The HTML_HEADER tag can be used to specify a personal HTML header for +# each generated HTML page. If it is left blank doxygen will generate a +# standard header. Note that when using a custom header you are responsible +# for the proper inclusion of any scripts and style sheets that doxygen +# needs, which is dependent on the configuration options used. +# It is advised to generate a default header using "doxygen -w html +# header.html footer.html stylesheet.css YourConfigFile" and then modify +# that header. Note that the header is subject to change so you typically +# have to redo this when upgrading to a newer version of doxygen or when # changing the value of configuration settings such as GENERATE_TREEVIEW! -HTML_HEADER = +HTML_HEADER = -# The HTML_FOOTER tag can be used to specify a personal HTML footer for -# each generated HTML page. If it is left blank doxygen will generate a +# The HTML_FOOTER tag can be used to specify a personal HTML footer for +# each generated HTML page. If it is left blank doxygen will generate a # standard footer. -HTML_FOOTER = +HTML_FOOTER = -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading -# style sheet that is used by each HTML page. It can be used to -# fine-tune the look of the HTML output. If left blank doxygen will -# generate a default style sheet. Note that it is recommended to use -# HTML_EXTRA_STYLESHEET instead of this one, as it is more robust and this +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading +# style sheet that is used by each HTML page. It can be used to +# fine-tune the look of the HTML output. If left blank doxygen will +# generate a default style sheet. Note that it is recommended to use +# HTML_EXTRA_STYLESHEET instead of this one, as it is more robust and this # tag will in the future become obsolete. -HTML_STYLESHEET = +HTML_STYLESHEET = -# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional -# user-defined cascading style sheet that is included after the standard -# style sheets created by doxygen. Using this option one can overrule -# certain style aspects. This is preferred over using HTML_STYLESHEET -# since it does not replace the standard style sheet and is therefor more -# robust against future updates. Doxygen will copy the style sheet file to +# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional +# user-defined cascading style sheet that is included after the standard +# style sheets created by doxygen. Using this option one can overrule +# certain style aspects. This is preferred over using HTML_STYLESHEET +# since it does not replace the standard style sheet and is therefor more +# robust against future updates. Doxygen will copy the style sheet file to # the output directory. -HTML_EXTRA_STYLESHEET = +HTML_EXTRA_STYLESHEET = -# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or -# other source files which should be copied to the HTML output directory. Note -# that these files will be copied to the base HTML output directory. Use the -# $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these -# files. In the HTML_STYLESHEET file, use the file name only. Also note that +# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or +# other source files which should be copied to the HTML output directory. Note +# that these files will be copied to the base HTML output directory. Use the +# $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these +# files. In the HTML_STYLESHEET file, use the file name only. Also note that # the files will be copied as-is; there are no commands or markers available. -HTML_EXTRA_FILES = +HTML_EXTRA_FILES = -# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. -# Doxygen will adjust the colors in the style sheet and background images -# according to this color. Hue is specified as an angle on a colorwheel, -# see http://en.wikipedia.org/wiki/Hue for more information. -# For instance the value 0 represents red, 60 is yellow, 120 is green, -# 180 is cyan, 240 is blue, 300 purple, and 360 is red again. +# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. +# Doxygen will adjust the colors in the style sheet and background images +# according to this color. Hue is specified as an angle on a colorwheel, +# see http://en.wikipedia.org/wiki/Hue for more information. +# For instance the value 0 represents red, 60 is yellow, 120 is green, +# 180 is cyan, 240 is blue, 300 purple, and 360 is red again. # The allowed range is 0 to 359. HTML_COLORSTYLE_HUE = 220 -# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of -# the colors in the HTML output. For a value of 0 the output will use +# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of +# the colors in the HTML output. For a value of 0 the output will use # grayscales only. A value of 255 will produce the most vivid colors. HTML_COLORSTYLE_SAT = 100 -# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to -# the luminance component of the colors in the HTML output. Values below -# 100 gradually make the output lighter, whereas values above 100 make -# the output darker. The value divided by 100 is the actual gamma applied, -# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2, +# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to +# the luminance component of the colors in the HTML output. Values below +# 100 gradually make the output lighter, whereas values above 100 make +# the output darker. The value divided by 100 is the actual gamma applied, +# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2, # and 100 does not change the gamma. HTML_COLORSTYLE_GAMMA = 80 -# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML -# page will contain the date and time when the page was generated. Setting +# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML +# page will contain the date and time when the page was generated. Setting # this to NO can help when comparing the output of multiple runs. HTML_TIMESTAMP = NO -# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML -# documentation will contain sections that can be hidden and shown after the +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the # page has loaded. HTML_DYNAMIC_SECTIONS = NO -# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of -# entries shown in the various tree structured indices initially; the user -# can expand and collapse entries dynamically later on. Doxygen will expand -# the tree to such a level that at most the specified number of entries are -# visible (unless a fully collapsed tree already exceeds this amount). -# So setting the number of entries 1 will produce a full collapsed tree by -# default. 0 is a special value representing an infinite number of entries +# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of +# entries shown in the various tree structured indices initially; the user +# can expand and collapse entries dynamically later on. Doxygen will expand +# the tree to such a level that at most the specified number of entries are +# visible (unless a fully collapsed tree already exceeds this amount). +# So setting the number of entries 1 will produce a full collapsed tree by +# default. 0 is a special value representing an infinite number of entries # and will result in a full expanded tree by default. HTML_INDEX_NUM_ENTRIES = 0 -# If the GENERATE_DOCSET tag is set to YES, additional index files -# will be generated that can be used as input for Apple's Xcode 3 -# integrated development environment, introduced with OSX 10.5 (Leopard). -# To create a documentation set, doxygen will generate a Makefile in the -# HTML output directory. Running make will produce the docset in that -# directory and running "make install" will install the docset in -# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find -# it at startup. -# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# If the GENERATE_DOCSET tag is set to YES, additional index files +# will be generated that can be used as input for Apple's Xcode 3 +# integrated development environment, introduced with OSX 10.5 (Leopard). +# To create a documentation set, doxygen will generate a Makefile in the +# HTML output directory. Running make will produce the docset in that +# directory and running "make install" will install the docset in +# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find +# it at startup. +# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html # for more information. GENERATE_DOCSET = NO -# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the -# feed. A documentation feed provides an umbrella under which multiple -# documentation sets from a single provider (such as a company or product suite) +# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the +# feed. A documentation feed provides an umbrella under which multiple +# documentation sets from a single provider (such as a company or product suite) # can be grouped. DOCSET_FEEDNAME = "Doxygen generated docs" -# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that -# should uniquely identify the documentation set bundle. This should be a -# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen +# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that +# should uniquely identify the documentation set bundle. This should be a +# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen # will append .docset to the name. DOCSET_BUNDLE_ID = org.doxygen.Project -# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely -# identify the documentation publisher. This should be a reverse domain-name +# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely +# identify the documentation publisher. This should be a reverse domain-name # style string, e.g. com.mycompany.MyDocSet.documentation. DOCSET_PUBLISHER_ID = org.doxygen.Publisher @@ -1015,215 +1015,215 @@ DOCSET_PUBLISHER_ID = org.doxygen.Publisher DOCSET_PUBLISHER_NAME = Publisher -# If the GENERATE_HTMLHELP tag is set to YES, additional index files -# will be generated that can be used as input for tools like the -# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) +# If the GENERATE_HTMLHELP tag is set to YES, additional index files +# will be generated that can be used as input for tools like the +# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) # of the generated HTML documentation. GENERATE_HTMLHELP = NO -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can -# be used to specify the file name of the resulting .chm file. You -# can add a path in front of the file if the result should not be +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can +# be used to specify the file name of the resulting .chm file. You +# can add a path in front of the file if the result should not be # written to the html output directory. -CHM_FILE = +CHM_FILE = -# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can -# be used to specify the location (absolute path including file name) of -# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run +# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can +# be used to specify the location (absolute path including file name) of +# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run # the HTML help compiler on the generated index.hhp. -HHC_LOCATION = +HHC_LOCATION = -# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag -# controls if a separate .chi index file is generated (YES) or that +# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag +# controls if a separate .chi index file is generated (YES) or that # it should be included in the master .chm file (NO). GENERATE_CHI = NO -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING -# is used to encode HtmlHelp index (hhk), content (hhc) and project file +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING +# is used to encode HtmlHelp index (hhk), content (hhc) and project file # content. -CHM_INDEX_ENCODING = +CHM_INDEX_ENCODING = -# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag -# controls whether a binary table of contents is generated (YES) or a +# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag +# controls whether a binary table of contents is generated (YES) or a # normal table of contents (NO) in the .chm file. BINARY_TOC = NO -# The TOC_EXPAND flag can be set to YES to add extra items for group members +# The TOC_EXPAND flag can be set to YES to add extra items for group members # to the contents of the HTML help documentation and to the tree view. TOC_EXPAND = NO -# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and -# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated -# that can be used as input for Qt's qhelpgenerator to generate a +# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and +# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated +# that can be used as input for Qt's qhelpgenerator to generate a # Qt Compressed Help (.qch) of the generated HTML documentation. GENERATE_QHP = NO -# If the QHG_LOCATION tag is specified, the QCH_FILE tag can -# be used to specify the file name of the resulting .qch file. +# If the QHG_LOCATION tag is specified, the QCH_FILE tag can +# be used to specify the file name of the resulting .qch file. # The path specified is relative to the HTML output folder. -QCH_FILE = +QCH_FILE = -# The QHP_NAMESPACE tag specifies the namespace to use when generating -# Qt Help Project output. For more information please see +# The QHP_NAMESPACE tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see # http://doc.trolltech.com/qthelpproject.html#namespace QHP_NAMESPACE = org.doxygen.Project -# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating -# Qt Help Project output. For more information please see +# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see # http://doc.trolltech.com/qthelpproject.html#virtual-folders QHP_VIRTUAL_FOLDER = doc -# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to -# add. For more information please see +# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to +# add. For more information please see # http://doc.trolltech.com/qthelpproject.html#custom-filters -QHP_CUST_FILTER_NAME = +QHP_CUST_FILTER_NAME = -# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the -# custom filter to add. For more information please see -# +# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the +# custom filter to add. For more information please see +# # Qt Help Project / Custom Filters. -QHP_CUST_FILTER_ATTRS = +QHP_CUST_FILTER_ATTRS = -# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this -# project's -# filter section matches. -# +# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this +# project's +# filter section matches. +# # Qt Help Project / Filter Attributes. -QHP_SECT_FILTER_ATTRS = +QHP_SECT_FILTER_ATTRS = -# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can -# be used to specify the location of Qt's qhelpgenerator. -# If non-empty doxygen will try to run qhelpgenerator on the generated +# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can +# be used to specify the location of Qt's qhelpgenerator. +# If non-empty doxygen will try to run qhelpgenerator on the generated # .qhp file. -QHG_LOCATION = +QHG_LOCATION = -# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files -# will be generated, which together with the HTML files, form an Eclipse help -# plugin. To install this plugin and make it available under the help contents -# menu in Eclipse, the contents of the directory containing the HTML and XML -# files needs to be copied into the plugins directory of eclipse. The name of -# the directory within the plugins directory should be the same as -# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before +# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files +# will be generated, which together with the HTML files, form an Eclipse help +# plugin. To install this plugin and make it available under the help contents +# menu in Eclipse, the contents of the directory containing the HTML and XML +# files needs to be copied into the plugins directory of eclipse. The name of +# the directory within the plugins directory should be the same as +# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before # the help appears. GENERATE_ECLIPSEHELP = NO -# A unique identifier for the eclipse help plugin. When installing the plugin -# the directory name containing the HTML and XML files should also have +# A unique identifier for the eclipse help plugin. When installing the plugin +# the directory name containing the HTML and XML files should also have # this name. ECLIPSE_DOC_ID = org.doxygen.Project -# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) -# at top of each HTML page. The value NO (the default) enables the index and -# the value YES disables it. Since the tabs have the same information as the -# navigation tree you can set this option to NO if you already set +# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) +# at top of each HTML page. The value NO (the default) enables the index and +# the value YES disables it. Since the tabs have the same information as the +# navigation tree you can set this option to NO if you already set # GENERATE_TREEVIEW to YES. DISABLE_INDEX = NO -# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index -# structure should be generated to display hierarchical information. -# If the tag value is set to YES, a side panel will be generated -# containing a tree-like index structure (just like the one that -# is generated for HTML Help). For this to work a browser that supports -# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). -# Windows users are probably better off using the HTML help feature. -# Since the tree basically has the same information as the tab index you +# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index +# structure should be generated to display hierarchical information. +# If the tag value is set to YES, a side panel will be generated +# containing a tree-like index structure (just like the one that +# is generated for HTML Help). For this to work a browser that supports +# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). +# Windows users are probably better off using the HTML help feature. +# Since the tree basically has the same information as the tab index you # could consider to set DISABLE_INDEX to NO when enabling this option. GENERATE_TREEVIEW = YES -# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values -# (range [0,1..20]) that doxygen will group on one line in the generated HTML -# documentation. Note that a value of 0 will completely suppress the enum +# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values +# (range [0,1..20]) that doxygen will group on one line in the generated HTML +# documentation. Note that a value of 0 will completely suppress the enum # values from appearing in the overview section. ENUM_VALUES_PER_LINE = 4 -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be -# used to set the initial width (in pixels) of the frame in which the tree +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be +# used to set the initial width (in pixels) of the frame in which the tree # is shown. TREEVIEW_WIDTH = 250 -# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open +# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open # links to external symbols imported via tag files in a separate window. EXT_LINKS_IN_WINDOW = NO -# Use this tag to change the font size of Latex formulas included -# as images in the HTML documentation. The default is 10. Note that -# when you change the font size after a successful doxygen run you need -# to manually remove any form_*.png images from the HTML output directory +# Use this tag to change the font size of Latex formulas included +# as images in the HTML documentation. The default is 10. Note that +# when you change the font size after a successful doxygen run you need +# to manually remove any form_*.png images from the HTML output directory # to force them to be regenerated. FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images -# generated for formulas are transparent PNGs. Transparent PNGs are -# not supported properly for IE 6.0, but are supported on all modern browsers. -# Note that when changing this option you need to delete any form_*.png files +# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# generated for formulas are transparent PNGs. Transparent PNGs are +# not supported properly for IE 6.0, but are supported on all modern browsers. +# Note that when changing this option you need to delete any form_*.png files # in the HTML output before the changes have effect. FORMULA_TRANSPARENT = YES -# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax -# (see http://www.mathjax.org) which uses client side Javascript for the -# rendering instead of using prerendered bitmaps. Use this if you do not -# have LaTeX installed or if you want to formulas look prettier in the HTML -# output. When enabled you may also need to install MathJax separately and +# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax +# (see http://www.mathjax.org) which uses client side Javascript for the +# rendering instead of using prerendered bitmaps. Use this if you do not +# have LaTeX installed or if you want to formulas look prettier in the HTML +# output. When enabled you may also need to install MathJax separately and # configure the path to it using the MATHJAX_RELPATH option. USE_MATHJAX = YES -# When MathJax is enabled you need to specify the location relative to the -# HTML output directory using the MATHJAX_RELPATH option. The destination -# directory should contain the MathJax.js script. For instance, if the mathjax -# directory is located at the same level as the HTML output directory, then -# MATHJAX_RELPATH should be ../mathjax. The default value points to -# the MathJax Content Delivery Network so you can quickly see the result without -# installing MathJax. However, it is strongly recommended to install a local +# When MathJax is enabled you need to specify the location relative to the +# HTML output directory using the MATHJAX_RELPATH option. The destination +# directory should contain the MathJax.js script. For instance, if the mathjax +# directory is located at the same level as the HTML output directory, then +# MATHJAX_RELPATH should be ../mathjax. The default value points to +# the MathJax Content Delivery Network so you can quickly see the result without +# installing MathJax. However, it is strongly recommended to install a local # copy of MathJax from http://www.mathjax.org before deployment. MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest -# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension +# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension # names that should be enabled during MathJax rendering. -MATHJAX_EXTENSIONS = +MATHJAX_EXTENSIONS = -# When the SEARCHENGINE tag is enabled doxygen will generate a search box -# for the HTML output. The underlying search engine uses javascript -# and DHTML and should work on any modern browser. Note that when using -# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets -# (GENERATE_DOCSET) there is already a search function so this one should -# typically be disabled. For large projects the javascript based search engine +# When the SEARCHENGINE tag is enabled doxygen will generate a search box +# for the HTML output. The underlying search engine uses javascript +# and DHTML and should work on any modern browser. Note that when using +# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets +# (GENERATE_DOCSET) there is already a search function so this one should +# typically be disabled. For large projects the javascript based search engine # can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. SEARCHENGINE = YES -# When the SERVER_BASED_SEARCH tag is enabled the search engine will be -# implemented using a PHP enabled web server instead of at the web client -# using Javascript. Doxygen will generate the search PHP script and index -# file to put on the web server. The advantage of the server -# based approach is that it scales better to large projects and allows -# full text search. The disadvantages are that it is more difficult to setup +# When the SERVER_BASED_SEARCH tag is enabled the search engine will be +# implemented using a PHP enabled web server instead of at the web client +# using Javascript. Doxygen will generate the search PHP script and index +# file to put on the web server. The advantage of the server +# based approach is that it scales better to large projects and allows +# full text search. The disadvantages are that it is more difficult to setup # and does not have live searching capabilities. SERVER_BASED_SEARCH = NO @@ -1232,97 +1232,97 @@ SERVER_BASED_SEARCH = NO # configuration options related to the LaTeX output #--------------------------------------------------------------------------- -# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will # generate Latex output. GENERATE_LATEX = NO -# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `latex' will be used as the default path. LATEX_OUTPUT = latex -# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be -# invoked. If left blank `latex' will be used as the default command name. -# Note that when enabling USE_PDFLATEX this option is only used for -# generating bitmaps for formulas in the HTML output, but not in the +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# invoked. If left blank `latex' will be used as the default command name. +# Note that when enabling USE_PDFLATEX this option is only used for +# generating bitmaps for formulas in the HTML output, but not in the # Makefile that is written to the output directory. LATEX_CMD_NAME = latex -# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to -# generate index for LaTeX. If left blank `makeindex' will be used as the +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to +# generate index for LaTeX. If left blank `makeindex' will be used as the # default command name. MAKEINDEX_CMD_NAME = makeindex -# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact -# LaTeX documents. This may be useful for small projects and may help to +# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact +# LaTeX documents. This may be useful for small projects and may help to # save some trees in general. COMPACT_LATEX = NO -# The PAPER_TYPE tag can be used to set the paper type that is used -# by the printer. Possible values are: a4, letter, legal and +# The PAPER_TYPE tag can be used to set the paper type that is used +# by the printer. Possible values are: a4, letter, legal and # executive. If left blank a4wide will be used. PAPER_TYPE = a4 -# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX +# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX # packages that should be included in the LaTeX output. EXTRA_PACKAGES = amsfonts -# The LATEX_HEADER tag can be used to specify a personal LaTeX header for -# the generated latex document. The header should contain everything until -# the first chapter. If it is left blank doxygen will generate a +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for +# the generated latex document. The header should contain everything until +# the first chapter. If it is left blank doxygen will generate a # standard header. Notice: only use this tag if you know what you are doing! -LATEX_HEADER = +LATEX_HEADER = -# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for -# the generated latex document. The footer should contain everything after -# the last chapter. If it is left blank doxygen will generate a +# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for +# the generated latex document. The footer should contain everything after +# the last chapter. If it is left blank doxygen will generate a # standard footer. Notice: only use this tag if you know what you are doing! -LATEX_FOOTER = +LATEX_FOOTER = -# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated -# is prepared for conversion to pdf (using ps2pdf). The pdf file will -# contain links (just like the HTML output) instead of page references +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated +# is prepared for conversion to pdf (using ps2pdf). The pdf file will +# contain links (just like the HTML output) instead of page references # This makes the output suitable for online browsing using a pdf viewer. PDF_HYPERLINKS = NO -# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of -# plain latex in the generated Makefile. Set this option to YES to get a +# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of +# plain latex in the generated Makefile. Set this option to YES to get a # higher quality PDF documentation. USE_PDFLATEX = NO -# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. -# command to the generated LaTeX files. This will instruct LaTeX to keep -# running if errors occur, instead of asking the user for help. +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. +# command to the generated LaTeX files. This will instruct LaTeX to keep +# running if errors occur, instead of asking the user for help. # This option is also used when generating formulas in HTML. LATEX_BATCHMODE = NO -# If LATEX_HIDE_INDICES is set to YES then doxygen will not -# include the index chapters (such as File Index, Compound Index, etc.) +# If LATEX_HIDE_INDICES is set to YES then doxygen will not +# include the index chapters (such as File Index, Compound Index, etc.) # in the output. LATEX_HIDE_INDICES = NO -# If LATEX_SOURCE_CODE is set to YES then doxygen will include -# source code with syntax highlighting in the LaTeX output. -# Note that which sources are shown also depends on other settings +# If LATEX_SOURCE_CODE is set to YES then doxygen will include +# source code with syntax highlighting in the LaTeX output. +# Note that which sources are shown also depends on other settings # such as SOURCE_BROWSER. LATEX_SOURCE_CODE = NO -# The LATEX_BIB_STYLE tag can be used to specify the style to use for the -# bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See +# The LATEX_BIB_STYLE tag can be used to specify the style to use for the +# bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See # http://en.wikipedia.org/wiki/BibTeX for more info. LATEX_BIB_STYLE = plain @@ -1331,68 +1331,68 @@ LATEX_BIB_STYLE = plain # configuration options related to the RTF output #--------------------------------------------------------------------------- -# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output -# The RTF output is optimized for Word 97 and may not look very pretty with +# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output +# The RTF output is optimized for Word 97 and may not look very pretty with # other RTF readers or editors. GENERATE_RTF = NO -# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `rtf' will be used as the default path. RTF_OUTPUT = rtf -# If the COMPACT_RTF tag is set to YES Doxygen generates more compact -# RTF documents. This may be useful for small projects and may help to +# If the COMPACT_RTF tag is set to YES Doxygen generates more compact +# RTF documents. This may be useful for small projects and may help to # save some trees in general. COMPACT_RTF = NO -# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated -# will contain hyperlink fields. The RTF file will -# contain links (just like the HTML output) instead of page references. -# This makes the output suitable for online browsing using WORD or other -# programs which support those fields. +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated +# will contain hyperlink fields. The RTF file will +# contain links (just like the HTML output) instead of page references. +# This makes the output suitable for online browsing using WORD or other +# programs which support those fields. # Note: wordpad (write) and others do not support links. RTF_HYPERLINKS = NO -# Load style sheet definitions from file. Syntax is similar to doxygen's -# config file, i.e. a series of assignments. You only have to provide +# Load style sheet definitions from file. Syntax is similar to doxygen's +# config file, i.e. a series of assignments. You only have to provide # replacements, missing definitions are set to their default value. -RTF_STYLESHEET_FILE = +RTF_STYLESHEET_FILE = -# Set optional variables used in the generation of an rtf document. +# Set optional variables used in the generation of an rtf document. # Syntax is similar to doxygen's config file. -RTF_EXTENSIONS_FILE = +RTF_EXTENSIONS_FILE = #--------------------------------------------------------------------------- # configuration options related to the man page output #--------------------------------------------------------------------------- -# If the GENERATE_MAN tag is set to YES (the default) Doxygen will +# If the GENERATE_MAN tag is set to YES (the default) Doxygen will # generate man pages GENERATE_MAN = NO -# The MAN_OUTPUT tag is used to specify where the man pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The MAN_OUTPUT tag is used to specify where the man pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `man' will be used as the default path. MAN_OUTPUT = man -# The MAN_EXTENSION tag determines the extension that is added to +# The MAN_EXTENSION tag determines the extension that is added to # the generated man pages (default is the subroutine's section .3) MAN_EXTENSION = .3 -# If the MAN_LINKS tag is set to YES and Doxygen generates man output, -# then it will generate one additional man file for each entity -# documented in the real man page(s). These additional files -# only source the real man page, but without them the man command +# If the MAN_LINKS tag is set to YES and Doxygen generates man output, +# then it will generate one additional man file for each entity +# documented in the real man page(s). These additional files +# only source the real man page, but without them the man command # would be unable to find the correct page. The default is NO. MAN_LINKS = NO @@ -1401,33 +1401,33 @@ MAN_LINKS = NO # configuration options related to the XML output #--------------------------------------------------------------------------- -# If the GENERATE_XML tag is set to YES Doxygen will -# generate an XML file that captures the structure of +# If the GENERATE_XML tag is set to YES Doxygen will +# generate an XML file that captures the structure of # the code including all documentation. GENERATE_XML = NO -# The XML_OUTPUT tag is used to specify where the XML pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The XML_OUTPUT tag is used to specify where the XML pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `xml' will be used as the default path. XML_OUTPUT = xml -# The XML_SCHEMA tag can be used to specify an XML schema, -# which can be used by a validating XML parser to check the +# The XML_SCHEMA tag can be used to specify an XML schema, +# which can be used by a validating XML parser to check the # syntax of the XML files. -XML_SCHEMA = +XML_SCHEMA = -# The XML_DTD tag can be used to specify an XML DTD, -# which can be used by a validating XML parser to check the +# The XML_DTD tag can be used to specify an XML DTD, +# which can be used by a validating XML parser to check the # syntax of the XML files. -XML_DTD = +XML_DTD = -# If the XML_PROGRAMLISTING tag is set to YES Doxygen will -# dump the program listings (including syntax highlighting -# and cross-referencing information) to the XML output. Note that +# If the XML_PROGRAMLISTING tag is set to YES Doxygen will +# dump the program listings (including syntax highlighting +# and cross-referencing information) to the XML output. Note that # enabling this will significantly increase the size of the XML output. XML_PROGRAMLISTING = YES @@ -1436,10 +1436,10 @@ XML_PROGRAMLISTING = YES # configuration options for the AutoGen Definitions output #--------------------------------------------------------------------------- -# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will -# generate an AutoGen Definitions (see autogen.sf.net) file -# that captures the structure of the code including all -# documentation. Note that this feature is still experimental +# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will +# generate an AutoGen Definitions (see autogen.sf.net) file +# that captures the structure of the code including all +# documentation. Note that this feature is still experimental # and incomplete at the moment. GENERATE_AUTOGEN_DEF = NO @@ -1448,97 +1448,97 @@ GENERATE_AUTOGEN_DEF = NO # configuration options related to the Perl module output #--------------------------------------------------------------------------- -# If the GENERATE_PERLMOD tag is set to YES Doxygen will -# generate a Perl module file that captures the structure of -# the code including all documentation. Note that this -# feature is still experimental and incomplete at the +# If the GENERATE_PERLMOD tag is set to YES Doxygen will +# generate a Perl module file that captures the structure of +# the code including all documentation. Note that this +# feature is still experimental and incomplete at the # moment. GENERATE_PERLMOD = NO -# If the PERLMOD_LATEX tag is set to YES Doxygen will generate -# the necessary Makefile rules, Perl scripts and LaTeX code to be able +# If the PERLMOD_LATEX tag is set to YES Doxygen will generate +# the necessary Makefile rules, Perl scripts and LaTeX code to be able # to generate PDF and DVI output from the Perl module output. PERLMOD_LATEX = NO -# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be -# nicely formatted so it can be parsed by a human reader. This is useful -# if you want to understand what is going on. On the other hand, if this -# tag is set to NO the size of the Perl module output will be much smaller +# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be +# nicely formatted so it can be parsed by a human reader. This is useful +# if you want to understand what is going on. On the other hand, if this +# tag is set to NO the size of the Perl module output will be much smaller # and Perl will parse it just the same. PERLMOD_PRETTY = YES -# The names of the make variables in the generated doxyrules.make file -# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. -# This is useful so different doxyrules.make files included by the same +# The names of the make variables in the generated doxyrules.make file +# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. +# This is useful so different doxyrules.make files included by the same # Makefile don't overwrite each other's variables. -PERLMOD_MAKEVAR_PREFIX = +PERLMOD_MAKEVAR_PREFIX = #--------------------------------------------------------------------------- # Configuration options related to the preprocessor #--------------------------------------------------------------------------- -# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will -# evaluate all C-preprocessor directives found in the sources and include +# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will +# evaluate all C-preprocessor directives found in the sources and include # files. ENABLE_PREPROCESSING = YES -# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro -# names in the source code. If set to NO (the default) only conditional -# compilation will be performed. Macro expansion can be done in a controlled +# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro +# names in the source code. If set to NO (the default) only conditional +# compilation will be performed. Macro expansion can be done in a controlled # way by setting EXPAND_ONLY_PREDEF to YES. MACRO_EXPANSION = NO -# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES -# then the macro expansion is limited to the macros specified with the +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES +# then the macro expansion is limited to the macros specified with the # PREDEFINED and EXPAND_AS_DEFINED tags. EXPAND_ONLY_PREDEF = NO -# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files +# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files # pointed to by INCLUDE_PATH will be searched when a #include is found. SEARCH_INCLUDES = YES -# The INCLUDE_PATH tag can be used to specify one or more directories that -# contain include files that are not input files but should be processed by +# The INCLUDE_PATH tag can be used to specify one or more directories that +# contain include files that are not input files but should be processed by # the preprocessor. -INCLUDE_PATH = +INCLUDE_PATH = -# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard -# patterns (like *.h and *.hpp) to filter out the header-files in the -# directories. If left blank, the patterns specified with FILE_PATTERNS will +# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard +# patterns (like *.h and *.hpp) to filter out the header-files in the +# directories. If left blank, the patterns specified with FILE_PATTERNS will # be used. -INCLUDE_FILE_PATTERNS = +INCLUDE_FILE_PATTERNS = -# The PREDEFINED tag can be used to specify one or more macro names that -# are defined before the preprocessor is started (similar to the -D option of -# gcc). The argument of the tag is a list of macros of the form: name -# or name=definition (no spaces). If the definition and the = are -# omitted =1 is assumed. To prevent a macro definition from being -# undefined via #undef or recursively expanded use the := operator +# The PREDEFINED tag can be used to specify one or more macro names that +# are defined before the preprocessor is started (similar to the -D option of +# gcc). The argument of the tag is a list of macros of the form: name +# or name=definition (no spaces). If the definition and the = are +# omitted =1 is assumed. To prevent a macro definition from being +# undefined via #undef or recursively expanded use the := operator # instead of the = operator. -PREDEFINED = +PREDEFINED = -# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then -# this tag can be used to specify a list of macro names that should be expanded. -# The macro definition that is found in the sources will be used. -# Use the PREDEFINED tag if you want to use a different macro definition that +# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then +# this tag can be used to specify a list of macro names that should be expanded. +# The macro definition that is found in the sources will be used. +# Use the PREDEFINED tag if you want to use a different macro definition that # overrules the definition found in the source code. -EXPAND_AS_DEFINED = +EXPAND_AS_DEFINED = -# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then -# doxygen's preprocessor will remove all references to function-like macros -# that are alone on a line, have an all uppercase name, and do not end with a +# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then +# doxygen's preprocessor will remove all references to function-like macros +# that are alone on a line, have an all uppercase name, and do not end with a # semicolon, because these will confuse the parser if not removed. SKIP_FUNCTION_MACROS = YES @@ -1547,37 +1547,37 @@ SKIP_FUNCTION_MACROS = YES # Configuration::additions related to external references #--------------------------------------------------------------------------- -# The TAGFILES option can be used to specify one or more tagfiles. For each -# tag file the location of the external documentation should be added. The -# format of a tag file without this location is as follows: -# TAGFILES = file1 file2 ... -# Adding location for the tag files is done as follows: -# TAGFILES = file1=loc1 "file2 = loc2" ... -# where "loc1" and "loc2" can be relative or absolute paths -# or URLs. Note that each tag file must have a unique name (where the name does -# NOT include the path). If a tag file is not located in the directory in which +# The TAGFILES option can be used to specify one or more tagfiles. For each +# tag file the location of the external documentation should be added. The +# format of a tag file without this location is as follows: +# TAGFILES = file1 file2 ... +# Adding location for the tag files is done as follows: +# TAGFILES = file1=loc1 "file2 = loc2" ... +# where "loc1" and "loc2" can be relative or absolute paths +# or URLs. Note that each tag file must have a unique name (where the name does +# NOT include the path). If a tag file is not located in the directory in which # doxygen is run, you must also specify the path to the tagfile here. -TAGFILES = +TAGFILES = -# When a file name is specified after GENERATE_TAGFILE, doxygen will create +# When a file name is specified after GENERATE_TAGFILE, doxygen will create # a tag file that is based on the input files it reads. -GENERATE_TAGFILE = +GENERATE_TAGFILE = -# If the ALLEXTERNALS tag is set to YES all external classes will be listed -# in the class index. If set to NO only the inherited external classes +# If the ALLEXTERNALS tag is set to YES all external classes will be listed +# in the class index. If set to NO only the inherited external classes # will be listed. ALLEXTERNALS = NO -# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed -# in the modules index. If set to NO, only the current project's groups will +# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed +# in the modules index. If set to NO, only the current project's groups will # be listed. EXTERNAL_GROUPS = YES -# The PERL_PATH should be the absolute path and name of the perl script +# The PERL_PATH should be the absolute path and name of the perl script # interpreter (i.e. the result of `which perl'). PERL_PATH = /usr/bin/perl @@ -1586,222 +1586,222 @@ PERL_PATH = /usr/bin/perl # Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will -# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base -# or super classes. Setting the tag to NO turns the diagrams off. Note that -# this option also works with HAVE_DOT disabled, but it is recommended to +# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will +# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base +# or super classes. Setting the tag to NO turns the diagrams off. Note that +# this option also works with HAVE_DOT disabled, but it is recommended to # install and use dot, since it yields more powerful graphs. CLASS_DIAGRAMS = NO -# You can define message sequence charts within doxygen comments using the \msc -# command. Doxygen will then run the mscgen tool (see -# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the -# documentation. The MSCGEN_PATH tag allows you to specify the directory where -# the mscgen tool resides. If left empty the tool is assumed to be found in the +# You can define message sequence charts within doxygen comments using the \msc +# command. Doxygen will then run the mscgen tool (see +# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the +# documentation. The MSCGEN_PATH tag allows you to specify the directory where +# the mscgen tool resides. If left empty the tool is assumed to be found in the # default search path. -MSCGEN_PATH = +MSCGEN_PATH = -# If set to YES, the inheritance and collaboration graphs will hide -# inheritance and usage relations if the target is undocumented +# If set to YES, the inheritance and collaboration graphs will hide +# inheritance and usage relations if the target is undocumented # or is not a class. HIDE_UNDOC_RELATIONS = YES -# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is -# available from the path. This tool is part of Graphviz, a graph visualization -# toolkit from AT&T and Lucent Bell Labs. The other options in this section +# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is +# available from the path. This tool is part of Graphviz, a graph visualization +# toolkit from AT&T and Lucent Bell Labs. The other options in this section # have no effect if this option is set to NO (the default) HAVE_DOT = YES -# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is -# allowed to run in parallel. When set to 0 (the default) doxygen will -# base this on the number of processors available in the system. You can set it -# explicitly to a value larger than 0 to get control over the balance +# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is +# allowed to run in parallel. When set to 0 (the default) doxygen will +# base this on the number of processors available in the system. You can set it +# explicitly to a value larger than 0 to get control over the balance # between CPU load and processing speed. DOT_NUM_THREADS = 0 -# By default doxygen will use the Helvetica font for all dot files that -# doxygen generates. When you want a differently looking font you can specify -# the font name using DOT_FONTNAME. You need to make sure dot is able to find -# the font, which can be done by putting it in a standard location or by setting -# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the +# By default doxygen will use the Helvetica font for all dot files that +# doxygen generates. When you want a differently looking font you can specify +# the font name using DOT_FONTNAME. You need to make sure dot is able to find +# the font, which can be done by putting it in a standard location or by setting +# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the # directory containing the font. DOT_FONTNAME = Helvetica -# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. +# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. # The default size is 10pt. DOT_FONTSIZE = 10 -# By default doxygen will tell dot to use the Helvetica font. -# If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to +# By default doxygen will tell dot to use the Helvetica font. +# If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to # set the path where dot can find it. -DOT_FONTPATH = +DOT_FONTPATH = -# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect inheritance relations. Setting this tag to YES will force the +# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect inheritance relations. Setting this tag to YES will force the # CLASS_DIAGRAMS tag to NO. CLASS_GRAPH = YES -# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect implementation dependencies (inheritance, containment, and +# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect implementation dependencies (inheritance, containment, and # class references variables) of the class with other documented classes. COLLABORATION_GRAPH = YES -# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen +# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen # will generate a graph for groups, showing the direct groups dependencies GROUP_GRAPHS = YES -# If the UML_LOOK tag is set to YES doxygen will generate inheritance and -# collaboration diagrams in a style similar to the OMG's Unified Modeling +# If the UML_LOOK tag is set to YES doxygen will generate inheritance and +# collaboration diagrams in a style similar to the OMG's Unified Modeling # Language. UML_LOOK = NO -# If the UML_LOOK tag is enabled, the fields and methods are shown inside -# the class node. If there are many fields or methods and many nodes the -# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS -# threshold limits the number of items for each type to make the size more -# managable. Set this to 0 for no limit. Note that the threshold may be +# If the UML_LOOK tag is enabled, the fields and methods are shown inside +# the class node. If there are many fields or methods and many nodes the +# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS +# threshold limits the number of items for each type to make the size more +# managable. Set this to 0 for no limit. Note that the threshold may be # exceeded by 50% before the limit is enforced. UML_LIMIT_NUM_FIELDS = 10 -# If set to YES, the inheritance and collaboration graphs will show the +# If set to YES, the inheritance and collaboration graphs will show the # relations between templates and their instances. TEMPLATE_RELATIONS = NO -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT -# tags are set to YES then doxygen will generate a graph for each documented -# file showing the direct and indirect include dependencies of the file with +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT +# tags are set to YES then doxygen will generate a graph for each documented +# file showing the direct and indirect include dependencies of the file with # other documented files. INCLUDE_GRAPH = YES -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and -# HAVE_DOT tags are set to YES then doxygen will generate a graph for each -# documented header file showing the documented files that directly or +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and +# HAVE_DOT tags are set to YES then doxygen will generate a graph for each +# documented header file showing the documented files that directly or # indirectly include this file. INCLUDED_BY_GRAPH = YES -# If the CALL_GRAPH and HAVE_DOT options are set to YES then -# doxygen will generate a call dependency graph for every global function -# or class method. Note that enabling this option will significantly increase -# the time of a run. So in most cases it will be better to enable call graphs +# If the CALL_GRAPH and HAVE_DOT options are set to YES then +# doxygen will generate a call dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable call graphs # for selected functions only using the \callgraph command. CALL_GRAPH = YES -# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then -# doxygen will generate a caller dependency graph for every global function -# or class method. Note that enabling this option will significantly increase -# the time of a run. So in most cases it will be better to enable caller +# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then +# doxygen will generate a caller dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable caller # graphs for selected functions only using the \callergraph command. CALLER_GRAPH = YES -# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen +# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen # will generate a graphical hierarchy of all classes instead of a textual one. GRAPHICAL_HIERARCHY = YES -# If the DIRECTORY_GRAPH and HAVE_DOT tags are set to YES -# then doxygen will show the dependencies a directory has on other directories -# in a graphical way. The dependency relations are determined by the #include +# If the DIRECTORY_GRAPH and HAVE_DOT tags are set to YES +# then doxygen will show the dependencies a directory has on other directories +# in a graphical way. The dependency relations are determined by the #include # relations between the files in the directories. DIRECTORY_GRAPH = YES -# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images -# generated by dot. Possible values are svg, png, jpg, or gif. -# If left blank png will be used. If you choose svg you need to set -# HTML_FILE_EXTENSION to xhtml in order to make the SVG files +# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images +# generated by dot. Possible values are svg, png, jpg, or gif. +# If left blank png will be used. If you choose svg you need to set +# HTML_FILE_EXTENSION to xhtml in order to make the SVG files # visible in IE 9+ (other browsers do not have this requirement). DOT_IMAGE_FORMAT = png -# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to -# enable generation of interactive SVG images that allow zooming and panning. -# Note that this requires a modern browser other than Internet Explorer. -# Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you -# need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files +# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to +# enable generation of interactive SVG images that allow zooming and panning. +# Note that this requires a modern browser other than Internet Explorer. +# Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you +# need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files # visible. Older versions of IE do not have SVG support. INTERACTIVE_SVG = NO -# The tag DOT_PATH can be used to specify the path where the dot tool can be +# The tag DOT_PATH can be used to specify the path where the dot tool can be # found. If left blank, it is assumed the dot tool can be found in the path. -DOT_PATH = +DOT_PATH = -# The DOTFILE_DIRS tag can be used to specify one or more directories that -# contain dot files that are included in the documentation (see the +# The DOTFILE_DIRS tag can be used to specify one or more directories that +# contain dot files that are included in the documentation (see the # \dotfile command). -DOTFILE_DIRS = +DOTFILE_DIRS = -# The MSCFILE_DIRS tag can be used to specify one or more directories that -# contain msc files that are included in the documentation (see the +# The MSCFILE_DIRS tag can be used to specify one or more directories that +# contain msc files that are included in the documentation (see the # \mscfile command). -MSCFILE_DIRS = +MSCFILE_DIRS = -# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of -# nodes that will be shown in the graph. If the number of nodes in a graph -# becomes larger than this value, doxygen will truncate the graph, which is -# visualized by representing a node as a red box. Note that doxygen if the -# number of direct children of the root node in a graph is already larger than -# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note +# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of +# nodes that will be shown in the graph. If the number of nodes in a graph +# becomes larger than this value, doxygen will truncate the graph, which is +# visualized by representing a node as a red box. Note that doxygen if the +# number of direct children of the root node in a graph is already larger than +# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note # that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. DOT_GRAPH_MAX_NODES = 50 -# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the -# graphs generated by dot. A depth value of 3 means that only nodes reachable -# from the root by following a path via at most 3 edges will be shown. Nodes -# that lay further from the root node will be omitted. Note that setting this -# option to 1 or 2 may greatly reduce the computation time needed for large -# code bases. Also note that the size of a graph can be further restricted by +# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the +# graphs generated by dot. A depth value of 3 means that only nodes reachable +# from the root by following a path via at most 3 edges will be shown. Nodes +# that lay further from the root node will be omitted. Note that setting this +# option to 1 or 2 may greatly reduce the computation time needed for large +# code bases. Also note that the size of a graph can be further restricted by # DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. MAX_DOT_GRAPH_DEPTH = 0 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not -# seem to support this out of the box. Warning: Depending on the platform used, -# enabling this option may lead to badly anti-aliased labels on the edges of +# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent +# background. This is disabled by default, because dot on Windows does not +# seem to support this out of the box. Warning: Depending on the platform used, +# enabling this option may lead to badly anti-aliased labels on the edges of # a graph (i.e. they become hard to read). DOT_TRANSPARENT = NO -# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output -# files in one run (i.e. multiple -o and -T options on the command line). This -# makes dot run faster, but since only newer versions of dot (>1.8.10) +# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output +# files in one run (i.e. multiple -o and -T options on the command line). This +# makes dot run faster, but since only newer versions of dot (>1.8.10) # support this, this feature is disabled by default. DOT_MULTI_TARGETS = NO -# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will -# generate a legend page explaining the meaning of the various boxes and +# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will +# generate a legend page explaining the meaning of the various boxes and # arrows in the dot generated graphs. GENERATE_LEGEND = YES -# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will -# remove the intermediate dot files that are used to generate +# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will +# remove the intermediate dot files that are used to generate # the various graphs. DOT_CLEANUP = YES diff --git a/src/CMakeLists.txt b/libsnark/CMakeLists.txt similarity index 99% rename from src/CMakeLists.txt rename to libsnark/CMakeLists.txt index 077fc301..3919e73b 100644 --- a/src/CMakeLists.txt +++ b/libsnark/CMakeLists.txt @@ -1,5 +1,3 @@ -include_directories(.) - set(SNARK_EXTRALIBS) if(${CURVE} STREQUAL "BN128") set( diff --git a/src/common/data_structures/accumulation_vector.hpp b/libsnark/common/data_structures/accumulation_vector.hpp similarity index 95% rename from src/common/data_structures/accumulation_vector.hpp rename to libsnark/common/data_structures/accumulation_vector.hpp index 37e0c984..30575bba 100644 --- a/src/common/data_structures/accumulation_vector.hpp +++ b/libsnark/common/data_structures/accumulation_vector.hpp @@ -12,7 +12,7 @@ #ifndef ACCUMULATION_VECTOR_HPP_ #define ACCUMULATION_VECTOR_HPP_ -#include "common/data_structures/sparse_vector.hpp" +#include namespace libsnark { @@ -69,6 +69,6 @@ std::istream& operator>>(std::istream &in, accumulation_vector &v); } // libsnark -#include "common/data_structures/accumulation_vector.tcc" +#include #endif // ACCUMULATION_VECTOR_HPP_ diff --git a/src/common/data_structures/accumulation_vector.tcc b/libsnark/common/data_structures/accumulation_vector.tcc similarity index 100% rename from src/common/data_structures/accumulation_vector.tcc rename to libsnark/common/data_structures/accumulation_vector.tcc diff --git a/src/common/data_structures/integer_permutation.cpp b/libsnark/common/data_structures/integer_permutation.cpp similarity index 98% rename from src/common/data_structures/integer_permutation.cpp rename to libsnark/common/data_structures/integer_permutation.cpp index 378ea7ee..399c35c8 100644 --- a/src/common/data_structures/integer_permutation.cpp +++ b/libsnark/common/data_structures/integer_permutation.cpp @@ -11,7 +11,7 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include "common/data_structures/integer_permutation.hpp" +#include #include #include diff --git a/src/common/data_structures/integer_permutation.hpp b/libsnark/common/data_structures/integer_permutation.hpp similarity index 100% rename from src/common/data_structures/integer_permutation.hpp rename to libsnark/common/data_structures/integer_permutation.hpp diff --git a/src/common/data_structures/merkle_tree.hpp b/libsnark/common/data_structures/merkle_tree.hpp similarity index 97% rename from src/common/data_structures/merkle_tree.hpp rename to libsnark/common/data_structures/merkle_tree.hpp index 7c0edc7a..ddcb1e8a 100644 --- a/src/common/data_structures/merkle_tree.hpp +++ b/libsnark/common/data_structures/merkle_tree.hpp @@ -66,6 +66,6 @@ class merkle_tree { } // libsnark -#include "common/data_structures/merkle_tree.tcc" +#include #endif // MERKLE_TREE_HPP_ diff --git a/src/common/data_structures/merkle_tree.tcc b/libsnark/common/data_structures/merkle_tree.tcc similarity index 100% rename from src/common/data_structures/merkle_tree.tcc rename to libsnark/common/data_structures/merkle_tree.tcc diff --git a/src/common/data_structures/set_commitment.cpp b/libsnark/common/data_structures/set_commitment.cpp similarity index 96% rename from src/common/data_structures/set_commitment.cpp rename to libsnark/common/data_structures/set_commitment.cpp index 56ab3f20..bc1e74ef 100644 --- a/src/common/data_structures/set_commitment.cpp +++ b/libsnark/common/data_structures/set_commitment.cpp @@ -5,7 +5,7 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include "common/data_structures/set_commitment.hpp" +#include #include namespace libsnark { diff --git a/src/common/data_structures/set_commitment.hpp b/libsnark/common/data_structures/set_commitment.hpp similarity index 89% rename from src/common/data_structures/set_commitment.hpp rename to libsnark/common/data_structures/set_commitment.hpp index 72b8ff41..fa29b8b3 100644 --- a/src/common/data_structures/set_commitment.hpp +++ b/libsnark/common/data_structures/set_commitment.hpp @@ -13,8 +13,8 @@ #define SET_COMMITMENT_HPP_ #include -#include "common/data_structures/merkle_tree.hpp" -#include "gadgetlib1/gadgets/hashes/hash_io.hpp" // TODO: the current structure is suboptimal +#include +#include // TODO: the current structure is suboptimal namespace libsnark { @@ -55,6 +55,6 @@ class set_commitment_accumulator { /* note that set_commitment has both .cpp, for implementation of non-templatized code (methods of set_membership_proof) and .tcc (implementation of set_commitment_accumulator */ -#include "common/data_structures/set_commitment.tcc" +#include #endif // SET_COMMITMENT_HPP_ diff --git a/src/common/data_structures/set_commitment.tcc b/libsnark/common/data_structures/set_commitment.tcc similarity index 100% rename from src/common/data_structures/set_commitment.tcc rename to libsnark/common/data_structures/set_commitment.tcc diff --git a/src/common/data_structures/sparse_vector.hpp b/libsnark/common/data_structures/sparse_vector.hpp similarity index 97% rename from src/common/data_structures/sparse_vector.hpp rename to libsnark/common/data_structures/sparse_vector.hpp index 552a8ae9..bd292df5 100644 --- a/src/common/data_structures/sparse_vector.hpp +++ b/libsnark/common/data_structures/sparse_vector.hpp @@ -74,6 +74,6 @@ std::istream& operator>>(std::istream& in, sparse_vector &v); } // libsnark -#include "common/data_structures/sparse_vector.tcc" +#include #endif // SPARSE_VECTOR_HPP_ diff --git a/src/common/data_structures/sparse_vector.tcc b/libsnark/common/data_structures/sparse_vector.tcc similarity index 100% rename from src/common/data_structures/sparse_vector.tcc rename to libsnark/common/data_structures/sparse_vector.tcc diff --git a/src/common/default_types/bacs_ppzksnark_pp.hpp b/libsnark/common/default_types/bacs_ppzksnark_pp.hpp similarity index 100% rename from src/common/default_types/bacs_ppzksnark_pp.hpp rename to libsnark/common/default_types/bacs_ppzksnark_pp.hpp diff --git a/src/common/default_types/r1cs_gg_ppzksnark_pp.hpp b/libsnark/common/default_types/r1cs_gg_ppzksnark_pp.hpp similarity index 100% rename from src/common/default_types/r1cs_gg_ppzksnark_pp.hpp rename to libsnark/common/default_types/r1cs_gg_ppzksnark_pp.hpp diff --git a/src/common/default_types/r1cs_ppzkadsnark_pp.cpp b/libsnark/common/default_types/r1cs_ppzkadsnark_pp.cpp similarity index 90% rename from src/common/default_types/r1cs_ppzkadsnark_pp.cpp rename to libsnark/common/default_types/r1cs_ppzkadsnark_pp.cpp index aab2efe9..14321add 100644 --- a/src/common/default_types/r1cs_ppzkadsnark_pp.cpp +++ b/libsnark/common/default_types/r1cs_ppzkadsnark_pp.cpp @@ -9,7 +9,7 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include "common/default_types/r1cs_ppzkadsnark_pp.hpp" +#include namespace libsnark { diff --git a/src/common/default_types/r1cs_ppzkadsnark_pp.hpp b/libsnark/common/default_types/r1cs_ppzkadsnark_pp.hpp similarity index 77% rename from src/common/default_types/r1cs_ppzkadsnark_pp.hpp rename to libsnark/common/default_types/r1cs_ppzkadsnark_pp.hpp index b35d3d79..f09a9ca8 100644 --- a/src/common/default_types/r1cs_ppzkadsnark_pp.hpp +++ b/libsnark/common/default_types/r1cs_ppzkadsnark_pp.hpp @@ -13,9 +13,9 @@ #ifndef R1CS_PPZKADSNARK_PP_HPP_ #define R1CS_PPZKADSNARK_PP_HPP_ -#include "common/default_types/r1cs_ppzksnark_pp.hpp" -#include "zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/prf/aes_ctr_prf.hpp" -#include "zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/signature/ed25519_signature.hpp" +#include +#include +#include namespace libsnark { diff --git a/src/common/default_types/r1cs_ppzkpcd_pp.cpp b/libsnark/common/default_types/r1cs_ppzkpcd_pp.cpp similarity index 91% rename from src/common/default_types/r1cs_ppzkpcd_pp.cpp rename to libsnark/common/default_types/r1cs_ppzkpcd_pp.cpp index 9281f5ab..85e40958 100644 --- a/src/common/default_types/r1cs_ppzkpcd_pp.cpp +++ b/libsnark/common/default_types/r1cs_ppzkpcd_pp.cpp @@ -9,7 +9,7 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include "common/default_types/r1cs_ppzkpcd_pp.hpp" +#include namespace libsnark { diff --git a/src/common/default_types/r1cs_ppzkpcd_pp.hpp b/libsnark/common/default_types/r1cs_ppzkpcd_pp.hpp similarity index 100% rename from src/common/default_types/r1cs_ppzkpcd_pp.hpp rename to libsnark/common/default_types/r1cs_ppzkpcd_pp.hpp diff --git a/src/common/default_types/r1cs_ppzksnark_pp.hpp b/libsnark/common/default_types/r1cs_ppzksnark_pp.hpp similarity index 100% rename from src/common/default_types/r1cs_ppzksnark_pp.hpp rename to libsnark/common/default_types/r1cs_ppzksnark_pp.hpp diff --git a/src/common/default_types/ram_ppzksnark_pp.hpp b/libsnark/common/default_types/ram_ppzksnark_pp.hpp similarity index 91% rename from src/common/default_types/ram_ppzksnark_pp.hpp rename to libsnark/common/default_types/ram_ppzksnark_pp.hpp index 2e7c15b9..1672ccfe 100644 --- a/src/common/default_types/ram_ppzksnark_pp.hpp +++ b/libsnark/common/default_types/ram_ppzksnark_pp.hpp @@ -13,7 +13,7 @@ #ifndef RAM_PPZKSNARK_PP_HPP_ #define RAM_PPZKSNARK_PP_HPP_ -#include "common/default_types/tinyram_ppzksnark_pp.hpp" +#include namespace libsnark { diff --git a/src/common/default_types/ram_zksnark_pp.hpp b/libsnark/common/default_types/ram_zksnark_pp.hpp similarity index 91% rename from src/common/default_types/ram_zksnark_pp.hpp rename to libsnark/common/default_types/ram_zksnark_pp.hpp index 806b9783..bb4949ab 100644 --- a/src/common/default_types/ram_zksnark_pp.hpp +++ b/libsnark/common/default_types/ram_zksnark_pp.hpp @@ -13,7 +13,7 @@ #ifndef RAM_ZKSNARK_PP_HPP_ #define RAM_ZKSNARK_PP_HPP_ -#include "common/default_types/tinyram_zksnark_pp.hpp" +#include namespace libsnark { diff --git a/src/common/default_types/tbcs_ppzksnark_pp.hpp b/libsnark/common/default_types/tbcs_ppzksnark_pp.hpp similarity index 100% rename from src/common/default_types/tbcs_ppzksnark_pp.hpp rename to libsnark/common/default_types/tbcs_ppzksnark_pp.hpp diff --git a/src/common/default_types/tinyram_ppzksnark_pp.cpp b/libsnark/common/default_types/tinyram_ppzksnark_pp.cpp similarity index 90% rename from src/common/default_types/tinyram_ppzksnark_pp.cpp rename to libsnark/common/default_types/tinyram_ppzksnark_pp.cpp index 5daba1a9..b56a6c28 100644 --- a/src/common/default_types/tinyram_ppzksnark_pp.cpp +++ b/libsnark/common/default_types/tinyram_ppzksnark_pp.cpp @@ -9,7 +9,7 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include "common/default_types/tinyram_ppzksnark_pp.hpp" +#include namespace libsnark { diff --git a/src/common/default_types/tinyram_ppzksnark_pp.hpp b/libsnark/common/default_types/tinyram_ppzksnark_pp.hpp similarity index 86% rename from src/common/default_types/tinyram_ppzksnark_pp.hpp rename to libsnark/common/default_types/tinyram_ppzksnark_pp.hpp index e1010b5d..710ce18e 100644 --- a/src/common/default_types/tinyram_ppzksnark_pp.hpp +++ b/libsnark/common/default_types/tinyram_ppzksnark_pp.hpp @@ -13,8 +13,8 @@ #ifndef TINYRAM_PPZKSNARK_PP_HPP_ #define TINYRAM_PPZKSNARK_PP_HPP_ -#include "common/default_types/r1cs_ppzksnark_pp.hpp" -#include "relations/ram_computations/rams/tinyram/tinyram_params.hpp" +#include +#include namespace libsnark { diff --git a/src/common/default_types/tinyram_zksnark_pp.cpp b/libsnark/common/default_types/tinyram_zksnark_pp.cpp similarity index 90% rename from src/common/default_types/tinyram_zksnark_pp.cpp rename to libsnark/common/default_types/tinyram_zksnark_pp.cpp index bd2c0578..e40255e5 100644 --- a/src/common/default_types/tinyram_zksnark_pp.cpp +++ b/libsnark/common/default_types/tinyram_zksnark_pp.cpp @@ -7,7 +7,7 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include "common/default_types/tinyram_zksnark_pp.hpp" +#include namespace libsnark { diff --git a/src/common/default_types/tinyram_zksnark_pp.hpp b/libsnark/common/default_types/tinyram_zksnark_pp.hpp similarity index 85% rename from src/common/default_types/tinyram_zksnark_pp.hpp rename to libsnark/common/default_types/tinyram_zksnark_pp.hpp index e3824729..d8123985 100644 --- a/src/common/default_types/tinyram_zksnark_pp.hpp +++ b/libsnark/common/default_types/tinyram_zksnark_pp.hpp @@ -12,8 +12,8 @@ #ifndef TINYRAM_PPZKSNARK_PP_HPP_ #define TINYRAM_PPZKSNARK_PP_HPP_ -#include "common/default_types/r1cs_ppzkpcd_pp.hpp" -#include "relations/ram_computations/rams/tinyram/tinyram_params.hpp" +#include +#include namespace libsnark { diff --git a/src/common/default_types/uscs_ppzksnark_pp.hpp b/libsnark/common/default_types/uscs_ppzksnark_pp.hpp similarity index 100% rename from src/common/default_types/uscs_ppzksnark_pp.hpp rename to libsnark/common/default_types/uscs_ppzksnark_pp.hpp diff --git a/src/common/libsnark_serialization.hpp b/libsnark/common/libsnark_serialization.hpp similarity index 100% rename from src/common/libsnark_serialization.hpp rename to libsnark/common/libsnark_serialization.hpp diff --git a/src/common/routing_algorithms/as_waksman_routing_algorithm.cpp b/libsnark/common/routing_algorithms/as_waksman_routing_algorithm.cpp similarity index 99% rename from src/common/routing_algorithms/as_waksman_routing_algorithm.cpp rename to libsnark/common/routing_algorithms/as_waksman_routing_algorithm.cpp index 8ef90175..34489739 100644 --- a/src/common/routing_algorithms/as_waksman_routing_algorithm.cpp +++ b/libsnark/common/routing_algorithms/as_waksman_routing_algorithm.cpp @@ -13,7 +13,7 @@ #include -#include "common/routing_algorithms/as_waksman_routing_algorithm.hpp" +#include namespace libsnark { diff --git a/src/common/routing_algorithms/as_waksman_routing_algorithm.hpp b/libsnark/common/routing_algorithms/as_waksman_routing_algorithm.hpp similarity index 98% rename from src/common/routing_algorithms/as_waksman_routing_algorithm.hpp rename to libsnark/common/routing_algorithms/as_waksman_routing_algorithm.hpp index fb7991a9..f09dac1f 100644 --- a/src/common/routing_algorithms/as_waksman_routing_algorithm.hpp +++ b/libsnark/common/routing_algorithms/as_waksman_routing_algorithm.hpp @@ -43,7 +43,7 @@ #include #include -#include "common/data_structures/integer_permutation.hpp" +#include namespace libsnark { diff --git a/src/common/routing_algorithms/benes_routing_algorithm.cpp b/libsnark/common/routing_algorithms/benes_routing_algorithm.cpp similarity index 99% rename from src/common/routing_algorithms/benes_routing_algorithm.cpp rename to libsnark/common/routing_algorithms/benes_routing_algorithm.cpp index 6b9594b6..ffb1508e 100644 --- a/src/common/routing_algorithms/benes_routing_algorithm.cpp +++ b/libsnark/common/routing_algorithms/benes_routing_algorithm.cpp @@ -11,7 +11,7 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include "common/routing_algorithms/benes_routing_algorithm.hpp" +#include #include namespace libsnark { diff --git a/src/common/routing_algorithms/benes_routing_algorithm.hpp b/libsnark/common/routing_algorithms/benes_routing_algorithm.hpp similarity index 97% rename from src/common/routing_algorithms/benes_routing_algorithm.hpp rename to libsnark/common/routing_algorithms/benes_routing_algorithm.hpp index 41897e07..1b0adc9a 100644 --- a/src/common/routing_algorithms/benes_routing_algorithm.hpp +++ b/libsnark/common/routing_algorithms/benes_routing_algorithm.hpp @@ -27,7 +27,7 @@ #include -#include "common/data_structures/integer_permutation.hpp" +#include #include namespace libsnark { diff --git a/src/common/routing_algorithms/profiling/profile_routing_algorithms.cpp b/libsnark/common/routing_algorithms/profiling/profile_routing_algorithms.cpp similarity index 92% rename from src/common/routing_algorithms/profiling/profile_routing_algorithms.cpp rename to libsnark/common/routing_algorithms/profiling/profile_routing_algorithms.cpp index dd78acd4..dd31e5e1 100644 --- a/src/common/routing_algorithms/profiling/profile_routing_algorithms.cpp +++ b/libsnark/common/routing_algorithms/profiling/profile_routing_algorithms.cpp @@ -12,8 +12,8 @@ #include #include -#include "common/routing_algorithms/as_waksman_routing_algorithm.hpp" -#include "common/routing_algorithms/benes_routing_algorithm.hpp" +#include +#include using namespace libsnark; diff --git a/src/common/routing_algorithms/tests/test_routing_algorithms.cpp b/libsnark/common/routing_algorithms/tests/test_routing_algorithms.cpp similarity index 93% rename from src/common/routing_algorithms/tests/test_routing_algorithms.cpp rename to libsnark/common/routing_algorithms/tests/test_routing_algorithms.cpp index 5bb19e16..c227204e 100644 --- a/src/common/routing_algorithms/tests/test_routing_algorithms.cpp +++ b/libsnark/common/routing_algorithms/tests/test_routing_algorithms.cpp @@ -12,8 +12,8 @@ #include #include -#include "common/routing_algorithms/benes_routing_algorithm.hpp" -#include "common/routing_algorithms/as_waksman_routing_algorithm.hpp" +#include +#include using namespace libsnark; diff --git a/src/common/routing_algorithms/tests/test_routing_algorithms.py b/libsnark/common/routing_algorithms/tests/test_routing_algorithms.py similarity index 100% rename from src/common/routing_algorithms/tests/test_routing_algorithms.py rename to libsnark/common/routing_algorithms/tests/test_routing_algorithms.py diff --git a/src/gadgetlib1/constraint_profiling.cpp b/libsnark/gadgetlib1/constraint_profiling.cpp similarity index 95% rename from src/gadgetlib1/constraint_profiling.cpp rename to libsnark/gadgetlib1/constraint_profiling.cpp index 96ac6794..a6a77b7d 100644 --- a/src/gadgetlib1/constraint_profiling.cpp +++ b/libsnark/gadgetlib1/constraint_profiling.cpp @@ -11,7 +11,7 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include "gadgetlib1/constraint_profiling.hpp" +#include #include namespace libsnark { diff --git a/src/gadgetlib1/constraint_profiling.hpp b/libsnark/gadgetlib1/constraint_profiling.hpp similarity index 100% rename from src/gadgetlib1/constraint_profiling.hpp rename to libsnark/gadgetlib1/constraint_profiling.hpp diff --git a/src/gadgetlib1/examples/simple_example.hpp b/libsnark/gadgetlib1/examples/simple_example.hpp similarity index 80% rename from src/gadgetlib1/examples/simple_example.hpp rename to libsnark/gadgetlib1/examples/simple_example.hpp index e2a47742..3a575e7a 100644 --- a/src/gadgetlib1/examples/simple_example.hpp +++ b/libsnark/gadgetlib1/examples/simple_example.hpp @@ -8,7 +8,7 @@ #ifndef SIMPLE_EXAMPLE_HPP_ #define SIMPLE_EXAMPLE_HPP_ -#include "relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp" +#include namespace libsnark { @@ -18,6 +18,6 @@ r1cs_example gen_r1cs_example_from_protoboard(const size_t num_constrain } // libsnark -#include "gadgetlib1/examples/simple_example.tcc" +#include #endif // SIMPLE_EXAMPLE_HPP_ diff --git a/src/gadgetlib1/examples/simple_example.tcc b/libsnark/gadgetlib1/examples/simple_example.tcc similarity index 96% rename from src/gadgetlib1/examples/simple_example.tcc rename to libsnark/gadgetlib1/examples/simple_example.tcc index c7418f58..a0b40c48 100644 --- a/src/gadgetlib1/examples/simple_example.tcc +++ b/libsnark/gadgetlib1/examples/simple_example.tcc @@ -8,7 +8,7 @@ #ifndef SIMPLE_EXAMPLE_TCC_ #define SIMPLE_EXAMPLE_TCC_ -#include "gadgetlib1/gadgets/basic_gadgets.hpp" +#include namespace libsnark { diff --git a/src/gadgetlib1/gadget.hpp b/libsnark/gadgetlib1/gadget.hpp similarity index 87% rename from src/gadgetlib1/gadget.hpp rename to libsnark/gadgetlib1/gadget.hpp index dbeaa9d4..128fdeb9 100644 --- a/src/gadgetlib1/gadget.hpp +++ b/libsnark/gadgetlib1/gadget.hpp @@ -8,7 +8,7 @@ #ifndef GADGET_HPP_ #define GADGET_HPP_ -#include "gadgetlib1/protoboard.hpp" +#include namespace libsnark { @@ -22,6 +22,6 @@ class gadget { }; } // libsnark -#include "gadgetlib1/gadget.tcc" +#include #endif // GADGET_HPP_ diff --git a/src/gadgetlib1/gadget.tcc b/libsnark/gadgetlib1/gadget.tcc similarity index 100% rename from src/gadgetlib1/gadget.tcc rename to libsnark/gadgetlib1/gadget.tcc diff --git a/src/gadgetlib1/gadgets/basic_gadgets.hpp b/libsnark/gadgetlib1/gadgets/basic_gadgets.hpp similarity index 99% rename from src/gadgetlib1/gadgets/basic_gadgets.hpp rename to libsnark/gadgetlib1/gadgets/basic_gadgets.hpp index 08e596be..6bb07bca 100644 --- a/src/gadgetlib1/gadgets/basic_gadgets.hpp +++ b/libsnark/gadgetlib1/gadgets/basic_gadgets.hpp @@ -11,7 +11,7 @@ #include #include -#include "gadgetlib1/gadget.hpp" +#include namespace libsnark { @@ -346,6 +346,6 @@ void create_linear_combination_witness(protoboard &pb, const VarT &target); } // libsnark -#include "gadgetlib1/gadgets/basic_gadgets.tcc" +#include #endif // BASIC_GADGETS_HPP_ diff --git a/src/gadgetlib1/gadgets/basic_gadgets.tcc b/libsnark/gadgetlib1/gadgets/basic_gadgets.tcc similarity index 100% rename from src/gadgetlib1/gadgets/basic_gadgets.tcc rename to libsnark/gadgetlib1/gadgets/basic_gadgets.tcc diff --git a/src/gadgetlib1/gadgets/cpu_checkers/fooram/components/bar_gadget.hpp b/libsnark/gadgetlib1/gadgets/cpu_checkers/fooram/components/bar_gadget.hpp similarity index 91% rename from src/gadgetlib1/gadgets/cpu_checkers/fooram/components/bar_gadget.hpp rename to libsnark/gadgetlib1/gadgets/cpu_checkers/fooram/components/bar_gadget.hpp index 0e280323..bc4859ef 100644 --- a/src/gadgetlib1/gadgets/cpu_checkers/fooram/components/bar_gadget.hpp +++ b/libsnark/gadgetlib1/gadgets/cpu_checkers/fooram/components/bar_gadget.hpp @@ -12,8 +12,8 @@ #ifndef BAR_GADGET_HPP_ #define BAR_GADGET_HPP_ -#include "gadgetlib1/gadget.hpp" -#include "gadgetlib1/gadgets/basic_gadgets.hpp" +#include +#include namespace libsnark { @@ -59,6 +59,6 @@ class bar_gadget : public gadget { } // libsnark -#include "gadgetlib1/gadgets/cpu_checkers/fooram/components/bar_gadget.tcc" +#include #endif // BAR_GADGET_HPP_ diff --git a/src/gadgetlib1/gadgets/cpu_checkers/fooram/components/bar_gadget.tcc b/libsnark/gadgetlib1/gadgets/cpu_checkers/fooram/components/bar_gadget.tcc similarity index 100% rename from src/gadgetlib1/gadgets/cpu_checkers/fooram/components/bar_gadget.tcc rename to libsnark/gadgetlib1/gadgets/cpu_checkers/fooram/components/bar_gadget.tcc diff --git a/src/gadgetlib1/gadgets/cpu_checkers/fooram/components/fooram_protoboard.hpp b/libsnark/gadgetlib1/gadgets/cpu_checkers/fooram/components/fooram_protoboard.hpp similarity index 83% rename from src/gadgetlib1/gadgets/cpu_checkers/fooram/components/fooram_protoboard.hpp rename to libsnark/gadgetlib1/gadgets/cpu_checkers/fooram/components/fooram_protoboard.hpp index d8c3ca86..3e65fe5a 100644 --- a/src/gadgetlib1/gadgets/cpu_checkers/fooram/components/fooram_protoboard.hpp +++ b/libsnark/gadgetlib1/gadgets/cpu_checkers/fooram/components/fooram_protoboard.hpp @@ -12,8 +12,8 @@ #ifndef FOORAM_PROTOBOARD_HPP_ #define FOORAM_PROTOBOARD_HPP_ -#include "gadgetlib1/gadget.hpp" -#include "relations/ram_computations/rams/fooram/fooram_aux.hpp" +#include +#include namespace libsnark { @@ -35,6 +35,6 @@ class fooram_gadget : public gadget { } // libsnark -#include "gadgetlib1/gadgets/cpu_checkers/fooram/components/fooram_protoboard.tcc" +#include #endif // FOORAM_PROTOBOARD_HPP_ diff --git a/src/gadgetlib1/gadgets/cpu_checkers/fooram/components/fooram_protoboard.tcc b/libsnark/gadgetlib1/gadgets/cpu_checkers/fooram/components/fooram_protoboard.tcc similarity index 100% rename from src/gadgetlib1/gadgets/cpu_checkers/fooram/components/fooram_protoboard.tcc rename to libsnark/gadgetlib1/gadgets/cpu_checkers/fooram/components/fooram_protoboard.tcc diff --git a/src/gadgetlib1/gadgets/cpu_checkers/fooram/examples/test_fooram.cpp b/libsnark/gadgetlib1/gadgets/cpu_checkers/fooram/examples/test_fooram.cpp similarity index 84% rename from src/gadgetlib1/gadgets/cpu_checkers/fooram/examples/test_fooram.cpp rename to libsnark/gadgetlib1/gadgets/cpu_checkers/fooram/examples/test_fooram.cpp index 30b8c9f2..859eb7a2 100644 --- a/src/gadgetlib1/gadgets/cpu_checkers/fooram/examples/test_fooram.cpp +++ b/libsnark/gadgetlib1/gadgets/cpu_checkers/fooram/examples/test_fooram.cpp @@ -4,13 +4,13 @@ * and contributors (see AUTHORS). * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include "common/default_types/r1cs_ppzksnark_pp.hpp" -#include "common/default_types/r1cs_ppzkpcd_pp.hpp" +#include +#include #include -#include "zk_proof_systems/zksnark/ram_zksnark/examples/run_ram_zksnark.hpp" -#include "zk_proof_systems/ppzksnark/ram_ppzksnark/examples/run_ram_ppzksnark.hpp" +#include +#include -#include "relations/ram_computations/rams/fooram/fooram_params.hpp" +#include namespace libsnark { diff --git a/src/gadgetlib1/gadgets/cpu_checkers/fooram/fooram_cpu_checker.hpp b/libsnark/gadgetlib1/gadgets/cpu_checkers/fooram/fooram_cpu_checker.hpp similarity index 89% rename from src/gadgetlib1/gadgets/cpu_checkers/fooram/fooram_cpu_checker.hpp rename to libsnark/gadgetlib1/gadgets/cpu_checkers/fooram/fooram_cpu_checker.hpp index f2791b6e..0fb4efa7 100644 --- a/src/gadgetlib1/gadgets/cpu_checkers/fooram/fooram_cpu_checker.hpp +++ b/libsnark/gadgetlib1/gadgets/cpu_checkers/fooram/fooram_cpu_checker.hpp @@ -29,11 +29,11 @@ #include #include -#include "gadgetlib1/gadget.hpp" -#include "gadgetlib1/gadgets/basic_gadgets.hpp" -#include "gadgetlib1/gadgets/cpu_checkers/fooram/components/fooram_protoboard.hpp" -#include "gadgetlib1/gadgets/cpu_checkers/fooram/components/bar_gadget.hpp" -#include "relations/ram_computations/memory/memory_interface.hpp" +#include +#include +#include +#include +#include namespace libsnark { @@ -102,6 +102,6 @@ class fooram_cpu_checker : public fooram_gadget { } // libsnark -#include "gadgetlib1/gadgets/cpu_checkers/fooram/fooram_cpu_checker.tcc" +#include #endif // FORAM_CPU_CHECKER_HPP_ diff --git a/src/gadgetlib1/gadgets/cpu_checkers/fooram/fooram_cpu_checker.tcc b/libsnark/gadgetlib1/gadgets/cpu_checkers/fooram/fooram_cpu_checker.tcc similarity index 100% rename from src/gadgetlib1/gadgets/cpu_checkers/fooram/fooram_cpu_checker.tcc rename to libsnark/gadgetlib1/gadgets/cpu_checkers/fooram/fooram_cpu_checker.tcc diff --git a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_arithmetic.hpp b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_arithmetic.hpp similarity index 99% rename from src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_arithmetic.hpp rename to libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_arithmetic.hpp index dcf30c39..9252da71 100644 --- a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_arithmetic.hpp +++ b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_arithmetic.hpp @@ -15,8 +15,8 @@ #define ALU_ARITHMETIC_HPP_ #include -#include "gadgetlib1/gadgets/cpu_checkers/tinyram/components/tinyram_protoboard.hpp" -#include "gadgetlib1/gadgets/basic_gadgets.hpp" +#include +#include namespace libsnark { @@ -679,6 +679,6 @@ void test_ALU_shl_gadget(const size_t w); } // libsnark -#include "gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_arithmetic.tcc" +#include #endif // ALU_ARITHMETIC_HPP_ diff --git a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_arithmetic.tcc b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_arithmetic.tcc similarity index 100% rename from src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_arithmetic.tcc rename to libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_arithmetic.tcc diff --git a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_control_flow.hpp b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_control_flow.hpp similarity index 93% rename from src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_control_flow.hpp rename to libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_control_flow.hpp index 9287825a..60d4ec22 100644 --- a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_control_flow.hpp +++ b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_control_flow.hpp @@ -14,8 +14,8 @@ #ifndef ALU_CONTROL_FLOW_HPP_ #define ALU_CONTROL_FLOW_HPP_ -#include "gadgetlib1/gadgets/cpu_checkers/tinyram/components/tinyram_protoboard.hpp" -#include "gadgetlib1/gadgets/basic_gadgets.hpp" +#include +#include namespace libsnark { @@ -97,6 +97,6 @@ void test_ALU_cnjmp_gadget(); } // libsnark -#include "gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_control_flow.tcc" +#include #endif // ALU_CONTROL_FLOW_HPP_ diff --git a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_control_flow.tcc b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_control_flow.tcc similarity index 100% rename from src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_control_flow.tcc rename to libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_control_flow.tcc diff --git a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_gadget.hpp b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_gadget.hpp similarity index 97% rename from src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_gadget.hpp rename to libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_gadget.hpp index 8466fe09..20777bbd 100644 --- a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_gadget.hpp +++ b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_gadget.hpp @@ -14,8 +14,8 @@ #ifndef ALU_GADGET_HPP_ #define ALU_GADGET_HPP_ -#include "gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_arithmetic.hpp" -#include "gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_control_flow.hpp" +#include +#include namespace libsnark { @@ -178,6 +178,6 @@ class ALU_gadget : public tinyram_standard_gadget { } // libsnark -#include "gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_gadget.tcc" +#include #endif // ALU_GADGET_HPP_ diff --git a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_gadget.tcc b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_gadget.tcc similarity index 100% rename from src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_gadget.tcc rename to libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_gadget.tcc diff --git a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/argument_decoder_gadget.hpp b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/argument_decoder_gadget.hpp similarity index 96% rename from src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/argument_decoder_gadget.hpp rename to libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/argument_decoder_gadget.hpp index 5f6f0e86..7c73acec 100644 --- a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/argument_decoder_gadget.hpp +++ b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/argument_decoder_gadget.hpp @@ -61,6 +61,6 @@ void test_argument_decoder_gadget(); } // libsnark -#include "gadgetlib1/gadgets/cpu_checkers/tinyram/components/argument_decoder_gadget.tcc" +#include #endif // ARGUMENT_DECODER_GADGET_HPP_ diff --git a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/argument_decoder_gadget.tcc b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/argument_decoder_gadget.tcc similarity index 100% rename from src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/argument_decoder_gadget.tcc rename to libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/argument_decoder_gadget.tcc diff --git a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/consistency_enforcer_gadget.hpp b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/consistency_enforcer_gadget.hpp similarity index 96% rename from src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/consistency_enforcer_gadget.hpp rename to libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/consistency_enforcer_gadget.hpp index fdf6c0a2..ab79e4ac 100644 --- a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/consistency_enforcer_gadget.hpp +++ b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/consistency_enforcer_gadget.hpp @@ -66,6 +66,6 @@ class consistency_enforcer_gadget : public tinyram_standard_gadget { } // libsnark -#include "gadgetlib1/gadgets/cpu_checkers/tinyram/components/consistency_enforcer_gadget.tcc" +#include #endif // CONSISTENCY_ENFORCER_GADGET_HPP_ diff --git a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/consistency_enforcer_gadget.tcc b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/consistency_enforcer_gadget.tcc similarity index 100% rename from src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/consistency_enforcer_gadget.tcc rename to libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/consistency_enforcer_gadget.tcc diff --git a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/instruction_packing_gadget.hpp b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/instruction_packing_gadget.hpp similarity index 95% rename from src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/instruction_packing_gadget.hpp rename to libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/instruction_packing_gadget.hpp index 8f247d14..2c31435c 100644 --- a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/instruction_packing_gadget.hpp +++ b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/instruction_packing_gadget.hpp @@ -53,6 +53,6 @@ void test_instruction_packing(); } // libsnark -#include "gadgetlib1/gadgets/cpu_checkers/tinyram/components/instruction_packing_gadget.tcc" +#include #endif // INSTRUCTION_PACKING_GADGET_HPP_ diff --git a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/instruction_packing_gadget.tcc b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/instruction_packing_gadget.tcc similarity index 100% rename from src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/instruction_packing_gadget.tcc rename to libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/instruction_packing_gadget.tcc diff --git a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/memory_masking_gadget.hpp b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/memory_masking_gadget.hpp similarity index 97% rename from src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/memory_masking_gadget.hpp rename to libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/memory_masking_gadget.hpp index 5096aa3a..6bc0bee9 100644 --- a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/memory_masking_gadget.hpp +++ b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/memory_masking_gadget.hpp @@ -89,6 +89,6 @@ class memory_masking_gadget : public tinyram_standard_gadget { } // libsnark -#include "gadgetlib1/gadgets/cpu_checkers/tinyram/components/memory_masking_gadget.tcc" +#include #endif // MEMORY_MASKING_GADGET_HPP_ diff --git a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/memory_masking_gadget.tcc b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/memory_masking_gadget.tcc similarity index 100% rename from src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/memory_masking_gadget.tcc rename to libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/memory_masking_gadget.tcc diff --git a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/tinyram_protoboard.hpp b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/tinyram_protoboard.hpp similarity index 80% rename from src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/tinyram_protoboard.hpp rename to libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/tinyram_protoboard.hpp index c84ea7c6..0e97ee3a 100644 --- a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/tinyram_protoboard.hpp +++ b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/tinyram_protoboard.hpp @@ -12,10 +12,10 @@ #ifndef TINYRAM_PROTOBOARD_HPP_ #define TINYRAM_PROTOBOARD_HPP_ -#include "relations/ram_computations/rams/ram_params.hpp" -#include "relations/ram_computations/rams/tinyram/tinyram_aux.hpp" -#include "gadgetlib1/protoboard.hpp" -#include "gadgetlib1/gadgets/basic_gadgets.hpp" +#include +#include +#include +#include namespace libsnark { @@ -47,6 +47,6 @@ class tinyram_standard_gadget : public tinyram_gadget { } // libsnark -#include "gadgetlib1/gadgets/cpu_checkers/tinyram/components/tinyram_protoboard.tcc" +#include #endif // TINYRAM_PROTOBOARD_HPP_ diff --git a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/tinyram_protoboard.tcc b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/tinyram_protoboard.tcc similarity index 100% rename from src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/tinyram_protoboard.tcc rename to libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/tinyram_protoboard.tcc diff --git a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/word_variable_gadget.hpp b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/word_variable_gadget.hpp similarity index 95% rename from src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/word_variable_gadget.hpp rename to libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/word_variable_gadget.hpp index 24c462bd..a3ed3678 100644 --- a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/word_variable_gadget.hpp +++ b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/word_variable_gadget.hpp @@ -12,7 +12,7 @@ #ifndef WORD_VARIABLE_GADGET_HPP_ #define WORD_VARIABLE_GADGET_HPP_ -#include "gadgetlib1/gadgets/cpu_checkers/tinyram/components/tinyram_protoboard.hpp" +#include namespace libsnark { diff --git a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/tinyram_cpu_checker.hpp b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/tinyram_cpu_checker.hpp similarity index 85% rename from src/gadgetlib1/gadgets/cpu_checkers/tinyram/tinyram_cpu_checker.hpp rename to libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/tinyram_cpu_checker.hpp index 3168ec3e..a589526c 100644 --- a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/tinyram_cpu_checker.hpp +++ b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/tinyram_cpu_checker.hpp @@ -14,12 +14,12 @@ #ifndef TINYRAM_CPU_CHECKER_HPP_ #define TINYRAM_CPU_CHECKER_HPP_ -#include "gadgetlib1/gadgets/cpu_checkers/tinyram/components/tinyram_protoboard.hpp" -#include "gadgetlib1/gadgets/cpu_checkers/tinyram/components/word_variable_gadget.hpp" -#include "gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_gadget.hpp" -#include "gadgetlib1/gadgets/cpu_checkers/tinyram/components/argument_decoder_gadget.hpp" -#include "gadgetlib1/gadgets/cpu_checkers/tinyram/components/consistency_enforcer_gadget.hpp" -#include "gadgetlib1/gadgets/cpu_checkers/tinyram/components/memory_masking_gadget.hpp" +#include +#include +#include +#include +#include +#include namespace libsnark { @@ -96,6 +96,6 @@ class tinyram_cpu_checker : public tinyram_standard_gadget { } // libsnark -#include "gadgetlib1/gadgets/cpu_checkers/tinyram/tinyram_cpu_checker.tcc" +#include #endif // TINYRAM_CPU_CHECKER_HPP_ diff --git a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/tinyram_cpu_checker.tcc b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/tinyram_cpu_checker.tcc similarity index 100% rename from src/gadgetlib1/gadgets/cpu_checkers/tinyram/tinyram_cpu_checker.tcc rename to libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/tinyram_cpu_checker.tcc diff --git a/src/gadgetlib1/gadgets/curves/weierstrass_g1_gadget.hpp b/libsnark/gadgetlib1/gadgets/curves/weierstrass_g1_gadget.hpp similarity index 96% rename from src/gadgetlib1/gadgets/curves/weierstrass_g1_gadget.hpp rename to libsnark/gadgetlib1/gadgets/curves/weierstrass_g1_gadget.hpp index 8fee80ff..50e5cbda 100644 --- a/src/gadgetlib1/gadgets/curves/weierstrass_g1_gadget.hpp +++ b/libsnark/gadgetlib1/gadgets/curves/weierstrass_g1_gadget.hpp @@ -15,8 +15,8 @@ #ifndef WEIERSTRASS_G1_GADGET_HPP_ #define WEIERSTRASS_G1_GADGET_HPP_ -#include "gadgetlib1/gadget.hpp" -#include "gadgetlib1/gadgets/pairing/pairing_params.hpp" +#include +#include namespace libsnark { @@ -148,6 +148,6 @@ class G1_multiscalar_mul_gadget : public gadget > { } // libsnark -#include "gadgetlib1/gadgets/curves/weierstrass_g1_gadget.tcc" +#include #endif // WEIERSTRASS_G1_GADGET_TCC_ diff --git a/src/gadgetlib1/gadgets/curves/weierstrass_g1_gadget.tcc b/libsnark/gadgetlib1/gadgets/curves/weierstrass_g1_gadget.tcc similarity index 100% rename from src/gadgetlib1/gadgets/curves/weierstrass_g1_gadget.tcc rename to libsnark/gadgetlib1/gadgets/curves/weierstrass_g1_gadget.tcc diff --git a/src/gadgetlib1/gadgets/curves/weierstrass_g2_gadget.hpp b/libsnark/gadgetlib1/gadgets/curves/weierstrass_g2_gadget.hpp similarity index 93% rename from src/gadgetlib1/gadgets/curves/weierstrass_g2_gadget.hpp rename to libsnark/gadgetlib1/gadgets/curves/weierstrass_g2_gadget.hpp index 6f5fea08..bb116865 100644 --- a/src/gadgetlib1/gadgets/curves/weierstrass_g2_gadget.hpp +++ b/libsnark/gadgetlib1/gadgets/curves/weierstrass_g2_gadget.hpp @@ -15,8 +15,8 @@ #ifndef WEIERSTRASS_G2_GADGET_HPP_ #define WEIERSTRASS_G2_GADGET_HPP_ -#include "gadgetlib1/gadget.hpp" -#include "gadgetlib1/gadgets/pairing/pairing_params.hpp" +#include +#include namespace libsnark { @@ -79,6 +79,6 @@ class G2_checker_gadget : public gadget > { } // libsnark -#include "gadgetlib1/gadgets/curves/weierstrass_g2_gadget.tcc" +#include #endif // WEIERSTRASS_G2_GADGET_HPP_ diff --git a/src/gadgetlib1/gadgets/curves/weierstrass_g2_gadget.tcc b/libsnark/gadgetlib1/gadgets/curves/weierstrass_g2_gadget.tcc similarity index 100% rename from src/gadgetlib1/gadgets/curves/weierstrass_g2_gadget.tcc rename to libsnark/gadgetlib1/gadgets/curves/weierstrass_g2_gadget.tcc diff --git a/src/gadgetlib1/gadgets/delegated_ra_memory/memory_load_gadget.hpp b/libsnark/gadgetlib1/gadgets/delegated_ra_memory/memory_load_gadget.hpp similarity index 90% rename from src/gadgetlib1/gadgets/delegated_ra_memory/memory_load_gadget.hpp rename to libsnark/gadgetlib1/gadgets/delegated_ra_memory/memory_load_gadget.hpp index 09a4c5be..0bc7ed35 100644 --- a/src/gadgetlib1/gadgets/delegated_ra_memory/memory_load_gadget.hpp +++ b/libsnark/gadgetlib1/gadgets/delegated_ra_memory/memory_load_gadget.hpp @@ -13,7 +13,7 @@ #ifndef MEMORY_LOAD_GADGET_HPP_ #define MEMORY_LOAD_GADGET_HPP_ -#include "gadgetlib1/gadgets/merkle_tree/merkle_tree_check_read_gadget.hpp" +#include namespace libsnark { diff --git a/src/gadgetlib1/gadgets/delegated_ra_memory/memory_load_store_gadget.hpp b/libsnark/gadgetlib1/gadgets/delegated_ra_memory/memory_load_store_gadget.hpp similarity index 90% rename from src/gadgetlib1/gadgets/delegated_ra_memory/memory_load_store_gadget.hpp rename to libsnark/gadgetlib1/gadgets/delegated_ra_memory/memory_load_store_gadget.hpp index 222a1dc4..33a1fad0 100644 --- a/src/gadgetlib1/gadgets/delegated_ra_memory/memory_load_store_gadget.hpp +++ b/libsnark/gadgetlib1/gadgets/delegated_ra_memory/memory_load_store_gadget.hpp @@ -15,7 +15,7 @@ #ifndef MEMORY_LOAD_STORE_GADGET_HPP_ #define MEMORY_LOAD_STORE_GADGET_HPP_ -#include "gadgetlib1/gadgets/merkle_tree/merkle_tree_check_update_gadget.hpp" +#include namespace libsnark { diff --git a/src/gadgetlib1/gadgets/fields/exponentiation_gadget.hpp b/libsnark/gadgetlib1/gadgets/fields/exponentiation_gadget.hpp similarity index 95% rename from src/gadgetlib1/gadgets/fields/exponentiation_gadget.hpp rename to libsnark/gadgetlib1/gadgets/fields/exponentiation_gadget.hpp index 9a5e8413..3b1bbcba 100644 --- a/src/gadgetlib1/gadgets/fields/exponentiation_gadget.hpp +++ b/libsnark/gadgetlib1/gadgets/fields/exponentiation_gadget.hpp @@ -16,7 +16,7 @@ #include #include #include -#include "gadgetlib1/gadget.hpp" +#include namespace libsnark { @@ -59,6 +59,6 @@ void test_exponentiation_gadget(const libff::bigint &power, const std::string } // libsnark -#include "gadgetlib1/gadgets/fields/exponentiation_gadget.tcc" +#include #endif // EXPONENTIATION_GADGET_HPP_ diff --git a/src/gadgetlib1/gadgets/fields/exponentiation_gadget.tcc b/libsnark/gadgetlib1/gadgets/fields/exponentiation_gadget.tcc similarity index 100% rename from src/gadgetlib1/gadgets/fields/exponentiation_gadget.tcc rename to libsnark/gadgetlib1/gadgets/fields/exponentiation_gadget.tcc diff --git a/src/gadgetlib1/gadgets/fields/fp2_gadgets.hpp b/libsnark/gadgetlib1/gadgets/fields/fp2_gadgets.hpp similarity index 97% rename from src/gadgetlib1/gadgets/fields/fp2_gadgets.hpp rename to libsnark/gadgetlib1/gadgets/fields/fp2_gadgets.hpp index ac968fda..30247c22 100644 --- a/src/gadgetlib1/gadgets/fields/fp2_gadgets.hpp +++ b/libsnark/gadgetlib1/gadgets/fields/fp2_gadgets.hpp @@ -15,7 +15,7 @@ #ifndef FP2_GADGETS_HPP_ #define FP2_GADGETS_HPP_ -#include "gadgetlib1/gadget.hpp" +#include #include namespace libsnark { @@ -127,6 +127,6 @@ class Fp2_sqr_gadget : public gadget { } // libsnark -#include "gadgetlib1/gadgets/fields/fp2_gadgets.tcc" +#include #endif // FP2_GADGETS_HPP_ diff --git a/src/gadgetlib1/gadgets/fields/fp2_gadgets.tcc b/libsnark/gadgetlib1/gadgets/fields/fp2_gadgets.tcc similarity index 100% rename from src/gadgetlib1/gadgets/fields/fp2_gadgets.tcc rename to libsnark/gadgetlib1/gadgets/fields/fp2_gadgets.tcc diff --git a/src/gadgetlib1/gadgets/fields/fp3_gadgets.hpp b/libsnark/gadgetlib1/gadgets/fields/fp3_gadgets.hpp similarity index 98% rename from src/gadgetlib1/gadgets/fields/fp3_gadgets.hpp rename to libsnark/gadgetlib1/gadgets/fields/fp3_gadgets.hpp index 4a6f4b13..b179ede3 100644 --- a/src/gadgetlib1/gadgets/fields/fp3_gadgets.hpp +++ b/libsnark/gadgetlib1/gadgets/fields/fp3_gadgets.hpp @@ -130,6 +130,6 @@ class Fp3_sqr_gadget : public gadget { } // libsnark -#include "gadgetlib1/gadgets/fields/fp3_gadgets.tcc" +#include #endif // FP3_GADGETS_HPP_ diff --git a/src/gadgetlib1/gadgets/fields/fp3_gadgets.tcc b/libsnark/gadgetlib1/gadgets/fields/fp3_gadgets.tcc similarity index 100% rename from src/gadgetlib1/gadgets/fields/fp3_gadgets.tcc rename to libsnark/gadgetlib1/gadgets/fields/fp3_gadgets.tcc diff --git a/src/gadgetlib1/gadgets/fields/fp4_gadgets.hpp b/libsnark/gadgetlib1/gadgets/fields/fp4_gadgets.hpp similarity index 99% rename from src/gadgetlib1/gadgets/fields/fp4_gadgets.hpp rename to libsnark/gadgetlib1/gadgets/fields/fp4_gadgets.hpp index 6ff79fa1..76094962 100644 --- a/src/gadgetlib1/gadgets/fields/fp4_gadgets.hpp +++ b/libsnark/gadgetlib1/gadgets/fields/fp4_gadgets.hpp @@ -195,6 +195,6 @@ class Fp4_cyclotomic_sqr_gadget : public gadget { } // libsnark -#include "gadgetlib1/gadgets/fields/fp4_gadgets.tcc" +#include #endif // FP4_GADGETS_HPP_ diff --git a/src/gadgetlib1/gadgets/fields/fp4_gadgets.tcc b/libsnark/gadgetlib1/gadgets/fields/fp4_gadgets.tcc similarity index 100% rename from src/gadgetlib1/gadgets/fields/fp4_gadgets.tcc rename to libsnark/gadgetlib1/gadgets/fields/fp4_gadgets.tcc diff --git a/src/gadgetlib1/gadgets/fields/fp6_gadgets.hpp b/libsnark/gadgetlib1/gadgets/fields/fp6_gadgets.hpp similarity index 98% rename from src/gadgetlib1/gadgets/fields/fp6_gadgets.hpp rename to libsnark/gadgetlib1/gadgets/fields/fp6_gadgets.hpp index efb978b4..6b40881b 100644 --- a/src/gadgetlib1/gadgets/fields/fp6_gadgets.hpp +++ b/libsnark/gadgetlib1/gadgets/fields/fp6_gadgets.hpp @@ -15,7 +15,7 @@ #ifndef FP6_GADGETS_HPP_ #define FP6_GADGETS_HPP_ -#include "gadgetlib1/gadgets/fields/fp2_gadgets.hpp" +#include namespace libsnark { @@ -200,6 +200,6 @@ class Fp6_cyclotomic_sqr_gadget : public gadget { } // libsnark -#include "gadgetlib1/gadgets/fields/fp6_gadgets.tcc" +#include #endif // FP6_GADGETS_HPP_ diff --git a/src/gadgetlib1/gadgets/fields/fp6_gadgets.tcc b/libsnark/gadgetlib1/gadgets/fields/fp6_gadgets.tcc similarity index 100% rename from src/gadgetlib1/gadgets/fields/fp6_gadgets.tcc rename to libsnark/gadgetlib1/gadgets/fields/fp6_gadgets.tcc diff --git a/src/gadgetlib1/gadgets/gadget_from_r1cs.hpp b/libsnark/gadgetlib1/gadgets/gadget_from_r1cs.hpp similarity index 92% rename from src/gadgetlib1/gadgets/gadget_from_r1cs.hpp rename to libsnark/gadgetlib1/gadgets/gadget_from_r1cs.hpp index e4b8a2ac..56ae8a23 100644 --- a/src/gadgetlib1/gadgets/gadget_from_r1cs.hpp +++ b/libsnark/gadgetlib1/gadgets/gadget_from_r1cs.hpp @@ -14,7 +14,7 @@ #include -#include "gadgetlib1/gadget.hpp" +#include namespace libsnark { @@ -40,6 +40,6 @@ class gadget_from_r1cs : public gadget { } // libsnark -#include "gadgetlib1/gadgets/gadget_from_r1cs.tcc" +#include #endif // GADGET_FROM_R1CS_HPP_ diff --git a/src/gadgetlib1/gadgets/gadget_from_r1cs.tcc b/libsnark/gadgetlib1/gadgets/gadget_from_r1cs.tcc similarity index 100% rename from src/gadgetlib1/gadgets/gadget_from_r1cs.tcc rename to libsnark/gadgetlib1/gadgets/gadget_from_r1cs.tcc diff --git a/src/gadgetlib1/gadgets/hashes/crh_gadget.hpp b/libsnark/gadgetlib1/gadgets/hashes/crh_gadget.hpp similarity index 90% rename from src/gadgetlib1/gadgets/hashes/crh_gadget.hpp rename to libsnark/gadgetlib1/gadgets/hashes/crh_gadget.hpp index 80338a31..33dc5d47 100644 --- a/src/gadgetlib1/gadgets/hashes/crh_gadget.hpp +++ b/libsnark/gadgetlib1/gadgets/hashes/crh_gadget.hpp @@ -7,7 +7,7 @@ #ifndef CRH_GADGET_HPP_ #define CRH_GADGET_HPP_ -#include "gadgetlib1/gadgets/hashes/knapsack/knapsack_gadget.hpp" +#include namespace libsnark { diff --git a/src/gadgetlib1/gadgets/hashes/digest_selector_gadget.hpp b/libsnark/gadgetlib1/gadgets/hashes/digest_selector_gadget.hpp similarity index 87% rename from src/gadgetlib1/gadgets/hashes/digest_selector_gadget.hpp rename to libsnark/gadgetlib1/gadgets/hashes/digest_selector_gadget.hpp index a7598b9b..0f0f48e9 100644 --- a/src/gadgetlib1/gadgets/hashes/digest_selector_gadget.hpp +++ b/libsnark/gadgetlib1/gadgets/hashes/digest_selector_gadget.hpp @@ -9,8 +9,8 @@ #include -#include "gadgetlib1/gadgets/basic_gadgets.hpp" -#include "gadgetlib1/gadgets/hashes/hash_io.hpp" +#include +#include namespace libsnark { @@ -37,6 +37,6 @@ class digest_selector_gadget : public gadget { } // libsnark -#include "gadgetlib1/gadgets/hashes/digest_selector_gadget.tcc" +#include #endif // DIGEST_SELECTOR_GADGET_HPP_ diff --git a/src/gadgetlib1/gadgets/hashes/digest_selector_gadget.tcc b/libsnark/gadgetlib1/gadgets/hashes/digest_selector_gadget.tcc similarity index 100% rename from src/gadgetlib1/gadgets/hashes/digest_selector_gadget.tcc rename to libsnark/gadgetlib1/gadgets/hashes/digest_selector_gadget.tcc diff --git a/src/gadgetlib1/gadgets/hashes/hash_io.hpp b/libsnark/gadgetlib1/gadgets/hashes/hash_io.hpp similarity index 94% rename from src/gadgetlib1/gadgets/hashes/hash_io.hpp rename to libsnark/gadgetlib1/gadgets/hashes/hash_io.hpp index 9d88fcdf..7bbc1d44 100644 --- a/src/gadgetlib1/gadgets/hashes/hash_io.hpp +++ b/libsnark/gadgetlib1/gadgets/hashes/hash_io.hpp @@ -8,7 +8,7 @@ #define HASH_IO_HPP_ #include #include -#include "gadgetlib1/gadgets/basic_gadgets.hpp" +#include namespace libsnark { @@ -58,6 +58,6 @@ class block_variable : public gadget { }; } // libsnark -#include "gadgetlib1/gadgets/hashes/hash_io.tcc" +#include #endif // HASH_IO_HPP_ diff --git a/src/gadgetlib1/gadgets/hashes/hash_io.tcc b/libsnark/gadgetlib1/gadgets/hashes/hash_io.tcc similarity index 100% rename from src/gadgetlib1/gadgets/hashes/hash_io.tcc rename to libsnark/gadgetlib1/gadgets/hashes/hash_io.tcc diff --git a/src/gadgetlib1/gadgets/hashes/knapsack/knapsack_gadget.hpp b/libsnark/gadgetlib1/gadgets/hashes/knapsack/knapsack_gadget.hpp similarity index 94% rename from src/gadgetlib1/gadgets/hashes/knapsack/knapsack_gadget.hpp rename to libsnark/gadgetlib1/gadgets/hashes/knapsack/knapsack_gadget.hpp index d3eb15b9..d56b95a6 100644 --- a/src/gadgetlib1/gadgets/hashes/knapsack/knapsack_gadget.hpp +++ b/libsnark/gadgetlib1/gadgets/hashes/knapsack/knapsack_gadget.hpp @@ -43,9 +43,9 @@ #ifndef KNAPSACK_GADGET_HPP_ #define KNAPSACK_GADGET_HPP_ -#include "gadgetlib1/gadgets/basic_gadgets.hpp" -#include "gadgetlib1/gadgets/hashes/hash_io.hpp" -#include "common/data_structures/merkle_tree.hpp" +#include +#include +#include namespace libsnark { @@ -129,6 +129,6 @@ void test_knapsack_CRH_with_bit_out_gadget(); } // libsnark -#include "gadgetlib1/gadgets/hashes/knapsack/knapsack_gadget.tcc" +#include #endif // KNAPSACK_GADGET_HPP_ diff --git a/src/gadgetlib1/gadgets/hashes/knapsack/knapsack_gadget.tcc b/libsnark/gadgetlib1/gadgets/hashes/knapsack/knapsack_gadget.tcc similarity index 100% rename from src/gadgetlib1/gadgets/hashes/knapsack/knapsack_gadget.tcc rename to libsnark/gadgetlib1/gadgets/hashes/knapsack/knapsack_gadget.tcc diff --git a/src/gadgetlib1/gadgets/hashes/knapsack/tests/generate_knapsack_tests.py b/libsnark/gadgetlib1/gadgets/hashes/knapsack/tests/generate_knapsack_tests.py similarity index 100% rename from src/gadgetlib1/gadgets/hashes/knapsack/tests/generate_knapsack_tests.py rename to libsnark/gadgetlib1/gadgets/hashes/knapsack/tests/generate_knapsack_tests.py diff --git a/src/gadgetlib1/gadgets/hashes/knapsack/tests/test_knapsack_gadget.cpp b/libsnark/gadgetlib1/gadgets/hashes/knapsack/tests/test_knapsack_gadget.cpp similarity index 99% rename from src/gadgetlib1/gadgets/hashes/knapsack/tests/test_knapsack_gadget.cpp rename to libsnark/gadgetlib1/gadgets/hashes/knapsack/tests/test_knapsack_gadget.cpp index 9aaeaeb0..72c66c00 100644 --- a/src/gadgetlib1/gadgets/hashes/knapsack/tests/test_knapsack_gadget.cpp +++ b/libsnark/gadgetlib1/gadgets/hashes/knapsack/tests/test_knapsack_gadget.cpp @@ -11,7 +11,7 @@ #include #include #include -#include "gadgetlib1/gadgets/hashes/knapsack/knapsack_gadget.hpp" +#include namespace libsnark { diff --git a/src/gadgetlib1/gadgets/hashes/sha256/sha256_aux.hpp b/libsnark/gadgetlib1/gadgets/hashes/sha256/sha256_aux.hpp similarity index 97% rename from src/gadgetlib1/gadgets/hashes/sha256/sha256_aux.hpp rename to libsnark/gadgetlib1/gadgets/hashes/sha256/sha256_aux.hpp index e0c7a7e0..2c12b678 100644 --- a/src/gadgetlib1/gadgets/hashes/sha256/sha256_aux.hpp +++ b/libsnark/gadgetlib1/gadgets/hashes/sha256/sha256_aux.hpp @@ -12,7 +12,7 @@ #ifndef SHA256_AUX_HPP_ #define SHA256_AUX_HPP_ -#include "gadgetlib1/gadgets/basic_gadgets.hpp" +#include namespace libsnark { @@ -155,6 +155,6 @@ class majority_gadget : public gadget { } // libsnark -#include "gadgetlib1/gadgets/hashes/sha256/sha256_aux.tcc" +#include #endif // SHA256_AUX_HPP_ diff --git a/src/gadgetlib1/gadgets/hashes/sha256/sha256_aux.tcc b/libsnark/gadgetlib1/gadgets/hashes/sha256/sha256_aux.tcc similarity index 100% rename from src/gadgetlib1/gadgets/hashes/sha256/sha256_aux.tcc rename to libsnark/gadgetlib1/gadgets/hashes/sha256/sha256_aux.tcc diff --git a/src/gadgetlib1/gadgets/hashes/sha256/sha256_components.hpp b/libsnark/gadgetlib1/gadgets/hashes/sha256/sha256_components.hpp similarity index 94% rename from src/gadgetlib1/gadgets/hashes/sha256/sha256_components.hpp rename to libsnark/gadgetlib1/gadgets/hashes/sha256/sha256_components.hpp index c2f31e3a..0465622b 100644 --- a/src/gadgetlib1/gadgets/hashes/sha256/sha256_components.hpp +++ b/libsnark/gadgetlib1/gadgets/hashes/sha256/sha256_components.hpp @@ -12,9 +12,9 @@ #ifndef SHA256_COMPONENTS_HPP_ #define SHA256_COMPONENTS_HPP_ -#include "gadgetlib1/gadgets/basic_gadgets.hpp" -#include "gadgetlib1/gadgets/hashes/hash_io.hpp" -#include "gadgetlib1/gadgets/hashes/sha256/sha256_aux.hpp" +#include +#include +#include namespace libsnark { @@ -103,6 +103,6 @@ class sha256_round_function_gadget : public gadget { } // libsnark -#include "gadgetlib1/gadgets/hashes/sha256/sha256_components.tcc" +#include #endif // SHA256_COMPONENTS_HPP_ diff --git a/src/gadgetlib1/gadgets/hashes/sha256/sha256_components.tcc b/libsnark/gadgetlib1/gadgets/hashes/sha256/sha256_components.tcc similarity index 100% rename from src/gadgetlib1/gadgets/hashes/sha256/sha256_components.tcc rename to libsnark/gadgetlib1/gadgets/hashes/sha256/sha256_components.tcc diff --git a/src/gadgetlib1/gadgets/hashes/sha256/sha256_gadget.hpp b/libsnark/gadgetlib1/gadgets/hashes/sha256/sha256_gadget.hpp similarity index 92% rename from src/gadgetlib1/gadgets/hashes/sha256/sha256_gadget.hpp rename to libsnark/gadgetlib1/gadgets/hashes/sha256/sha256_gadget.hpp index 50410cb9..f8e1397b 100644 --- a/src/gadgetlib1/gadgets/hashes/sha256/sha256_gadget.hpp +++ b/libsnark/gadgetlib1/gadgets/hashes/sha256/sha256_gadget.hpp @@ -12,10 +12,10 @@ #ifndef SHA256_GADGET_HPP_ #define SHA256_GADGET_HPP_ -#include "common/data_structures/merkle_tree.hpp" -#include "gadgetlib1/gadgets/basic_gadgets.hpp" -#include "gadgetlib1/gadgets/hashes/hash_io.hpp" -#include "gadgetlib1/gadgets/hashes/sha256/sha256_components.hpp" +#include +#include +#include +#include namespace libsnark { @@ -93,6 +93,6 @@ class sha256_two_to_one_hash_gadget : public gadget { } // libsnark -#include "gadgetlib1/gadgets/hashes/sha256/sha256_gadget.tcc" +#include #endif // SHA256_GADGET_HPP_ diff --git a/src/gadgetlib1/gadgets/hashes/sha256/sha256_gadget.tcc b/libsnark/gadgetlib1/gadgets/hashes/sha256/sha256_gadget.tcc similarity index 100% rename from src/gadgetlib1/gadgets/hashes/sha256/sha256_gadget.tcc rename to libsnark/gadgetlib1/gadgets/hashes/sha256/sha256_gadget.tcc diff --git a/src/gadgetlib1/gadgets/hashes/sha256/tests/generate_sha256_gadget_tests.py b/libsnark/gadgetlib1/gadgets/hashes/sha256/tests/generate_sha256_gadget_tests.py similarity index 100% rename from src/gadgetlib1/gadgets/hashes/sha256/tests/generate_sha256_gadget_tests.py rename to libsnark/gadgetlib1/gadgets/hashes/sha256/tests/generate_sha256_gadget_tests.py diff --git a/src/gadgetlib1/gadgets/hashes/sha256/tests/pypy_sha256.py b/libsnark/gadgetlib1/gadgets/hashes/sha256/tests/pypy_sha256.py similarity index 100% rename from src/gadgetlib1/gadgets/hashes/sha256/tests/pypy_sha256.py rename to libsnark/gadgetlib1/gadgets/hashes/sha256/tests/pypy_sha256.py diff --git a/src/gadgetlib1/gadgets/hashes/sha256/tests/test_sha256_gadget.cpp b/libsnark/gadgetlib1/gadgets/hashes/sha256/tests/test_sha256_gadget.cpp similarity index 96% rename from src/gadgetlib1/gadgets/hashes/sha256/tests/test_sha256_gadget.cpp rename to libsnark/gadgetlib1/gadgets/hashes/sha256/tests/test_sha256_gadget.cpp index 5046f3a6..bc430fc5 100644 --- a/src/gadgetlib1/gadgets/hashes/sha256/tests/test_sha256_gadget.cpp +++ b/libsnark/gadgetlib1/gadgets/hashes/sha256/tests/test_sha256_gadget.cpp @@ -8,7 +8,7 @@ #include #include #include -#include "gadgetlib1/gadgets/hashes/sha256/sha256_gadget.hpp" +#include using namespace libsnark; diff --git a/src/gadgetlib1/gadgets/merkle_tree/merkle_authentication_path_variable.hpp b/libsnark/gadgetlib1/gadgets/merkle_tree/merkle_authentication_path_variable.hpp similarity index 82% rename from src/gadgetlib1/gadgets/merkle_tree/merkle_authentication_path_variable.hpp rename to libsnark/gadgetlib1/gadgets/merkle_tree/merkle_authentication_path_variable.hpp index 0efa7cf4..c42e7edd 100644 --- a/src/gadgetlib1/gadgets/merkle_tree/merkle_authentication_path_variable.hpp +++ b/libsnark/gadgetlib1/gadgets/merkle_tree/merkle_authentication_path_variable.hpp @@ -8,9 +8,9 @@ #ifndef MERKLE_AUTHENTICATION_PATH_VARIABLE_HPP_ #define MERKLE_AUTHENTICATION_PATH_VARIABLE_HPP_ -#include "common/data_structures/merkle_tree.hpp" -#include "gadgetlib1/gadget.hpp" -#include "gadgetlib1/gadgets/hashes/hash_io.hpp" +#include +#include +#include namespace libsnark { @@ -33,6 +33,6 @@ class merkle_authentication_path_variable : public gadget { } // libsnark -#include "gadgetlib1/gadgets/merkle_tree/merkle_authentication_path_variable.tcc" +#include #endif // MERKLE_AUTHENTICATION_PATH_VARIABLE_HPP diff --git a/src/gadgetlib1/gadgets/merkle_tree/merkle_authentication_path_variable.tcc b/libsnark/gadgetlib1/gadgets/merkle_tree/merkle_authentication_path_variable.tcc similarity index 100% rename from src/gadgetlib1/gadgets/merkle_tree/merkle_authentication_path_variable.tcc rename to libsnark/gadgetlib1/gadgets/merkle_tree/merkle_authentication_path_variable.tcc diff --git a/src/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_read_gadget.hpp b/libsnark/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_read_gadget.hpp similarity index 84% rename from src/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_read_gadget.hpp rename to libsnark/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_read_gadget.hpp index 2663774c..3e625e47 100644 --- a/src/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_read_gadget.hpp +++ b/libsnark/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_read_gadget.hpp @@ -16,12 +16,12 @@ #ifndef MERKLE_TREE_CHECK_READ_GADGET_HPP_ #define MERKLE_TREE_CHECK_READ_GADGET_HPP_ -#include "common/data_structures/merkle_tree.hpp" -#include "gadgetlib1/gadget.hpp" -#include "gadgetlib1/gadgets/hashes/crh_gadget.hpp" -#include "gadgetlib1/gadgets/hashes/hash_io.hpp" -#include "gadgetlib1/gadgets/hashes/digest_selector_gadget.hpp" -#include "gadgetlib1/gadgets/merkle_tree/merkle_authentication_path_variable.hpp" +#include +#include +#include +#include +#include +#include namespace libsnark { @@ -69,6 +69,6 @@ void test_merkle_tree_check_read_gadget(); } // libsnark -#include "gadgetlib1/gadgets/merkle_tree/merkle_tree_check_read_gadget.tcc" +#include #endif // MERKLE_TREE_CHECK_READ_GADGET_HPP_ diff --git a/src/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_read_gadget.tcc b/libsnark/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_read_gadget.tcc similarity index 100% rename from src/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_read_gadget.tcc rename to libsnark/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_read_gadget.tcc diff --git a/src/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_update_gadget.hpp b/libsnark/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_update_gadget.hpp similarity index 88% rename from src/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_update_gadget.hpp rename to libsnark/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_update_gadget.hpp index 2d6840d6..eb4bcdf5 100644 --- a/src/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_update_gadget.hpp +++ b/libsnark/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_update_gadget.hpp @@ -17,12 +17,12 @@ #ifndef MERKLE_TREE_CHECK_UPDATE_GADGET_HPP_ #define MERKLE_TREE_CHECK_UPDATE_GADGET_HPP_ -#include "common/data_structures/merkle_tree.hpp" -#include "gadgetlib1/gadget.hpp" -#include "gadgetlib1/gadgets/hashes/crh_gadget.hpp" -#include "gadgetlib1/gadgets/hashes/hash_io.hpp" -#include "gadgetlib1/gadgets/hashes/digest_selector_gadget.hpp" -#include "gadgetlib1/gadgets/merkle_tree/merkle_authentication_path_variable.hpp" +#include +#include +#include +#include +#include +#include namespace libsnark { @@ -86,6 +86,6 @@ void test_merkle_tree_check_update_gadget(); } // libsnark -#include "gadgetlib1/gadgets/merkle_tree/merkle_tree_check_update_gadget.tcc" +#include #endif // MERKLE_TREE_CHECK_UPDATE_GADGET_HPP_ diff --git a/src/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_update_gadget.tcc b/libsnark/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_update_gadget.tcc similarity index 100% rename from src/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_update_gadget.tcc rename to libsnark/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_update_gadget.tcc diff --git a/src/gadgetlib1/gadgets/merkle_tree/tests/test_merkle_tree_gadgets.cpp b/libsnark/gadgetlib1/gadgets/merkle_tree/tests/test_merkle_tree_gadgets.cpp similarity index 86% rename from src/gadgetlib1/gadgets/merkle_tree/tests/test_merkle_tree_gadgets.cpp rename to libsnark/gadgetlib1/gadgets/merkle_tree/tests/test_merkle_tree_gadgets.cpp index 30399c6e..5ff19083 100644 --- a/src/gadgetlib1/gadgets/merkle_tree/tests/test_merkle_tree_gadgets.cpp +++ b/libsnark/gadgetlib1/gadgets/merkle_tree/tests/test_merkle_tree_gadgets.cpp @@ -11,9 +11,9 @@ #include #include #include -#include "gadgetlib1/gadgets/merkle_tree/merkle_tree_check_read_gadget.hpp" -#include "gadgetlib1/gadgets/merkle_tree/merkle_tree_check_update_gadget.hpp" -#include "gadgetlib1/gadgets/hashes/sha256/sha256_gadget.hpp" +#include +#include +#include using namespace libsnark; diff --git a/src/gadgetlib1/gadgets/pairing/mnt_pairing_params.hpp b/libsnark/gadgetlib1/gadgets/pairing/mnt_pairing_params.hpp similarity index 91% rename from src/gadgetlib1/gadgets/pairing/mnt_pairing_params.hpp rename to libsnark/gadgetlib1/gadgets/pairing/mnt_pairing_params.hpp index f521952f..a82c2c0d 100644 --- a/src/gadgetlib1/gadgets/pairing/mnt_pairing_params.hpp +++ b/libsnark/gadgetlib1/gadgets/pairing/mnt_pairing_params.hpp @@ -18,11 +18,11 @@ #include #include -#include "gadgetlib1/gadgets/pairing/pairing_params.hpp" -#include "gadgetlib1/gadgets/fields/fp2_gadgets.hpp" -#include "gadgetlib1/gadgets/fields/fp4_gadgets.hpp" -#include "gadgetlib1/gadgets/fields/fp3_gadgets.hpp" -#include "gadgetlib1/gadgets/fields/fp6_gadgets.hpp" +#include +#include +#include +#include +#include namespace libsnark { diff --git a/src/gadgetlib1/gadgets/pairing/pairing_checks.hpp b/libsnark/gadgetlib1/gadgets/pairing/pairing_checks.hpp similarity index 91% rename from src/gadgetlib1/gadgets/pairing/pairing_checks.hpp rename to libsnark/gadgetlib1/gadgets/pairing/pairing_checks.hpp index 19df93f5..b49b92c1 100644 --- a/src/gadgetlib1/gadgets/pairing/pairing_checks.hpp +++ b/libsnark/gadgetlib1/gadgets/pairing/pairing_checks.hpp @@ -17,9 +17,9 @@ #define PAIRING_CHECKS_HPP_ #include -#include "gadgetlib1/gadgets/pairing/pairing_params.hpp" -#include "gadgetlib1/gadgets/pairing/weierstrass_miller_loop.hpp" -#include "gadgetlib1/gadgets/pairing/weierstrass_final_exponentiation.hpp" +#include +#include +#include namespace libsnark { @@ -89,6 +89,6 @@ class check_e_equals_ee_gadget : public gadget > { } // libsnark -#include "gadgetlib1/gadgets/pairing/pairing_checks.tcc" +#include #endif // PAIRING_CHECKS_HPP_ diff --git a/src/gadgetlib1/gadgets/pairing/pairing_checks.tcc b/libsnark/gadgetlib1/gadgets/pairing/pairing_checks.tcc similarity index 100% rename from src/gadgetlib1/gadgets/pairing/pairing_checks.tcc rename to libsnark/gadgetlib1/gadgets/pairing/pairing_checks.tcc diff --git a/src/gadgetlib1/gadgets/pairing/pairing_params.hpp b/libsnark/gadgetlib1/gadgets/pairing/pairing_params.hpp similarity index 100% rename from src/gadgetlib1/gadgets/pairing/pairing_params.hpp rename to libsnark/gadgetlib1/gadgets/pairing/pairing_params.hpp diff --git a/src/gadgetlib1/gadgets/pairing/weierstrass_final_exponentiation.hpp b/libsnark/gadgetlib1/gadgets/pairing/weierstrass_final_exponentiation.hpp similarity index 95% rename from src/gadgetlib1/gadgets/pairing/weierstrass_final_exponentiation.hpp rename to libsnark/gadgetlib1/gadgets/pairing/weierstrass_final_exponentiation.hpp index 0d37353f..e93a21c1 100644 --- a/src/gadgetlib1/gadgets/pairing/weierstrass_final_exponentiation.hpp +++ b/libsnark/gadgetlib1/gadgets/pairing/weierstrass_final_exponentiation.hpp @@ -16,8 +16,8 @@ #define WEIERSTRASS_FINAL_EXPONENTIATION_HPP_ #include -#include "gadgetlib1/gadgets/pairing/mnt_pairing_params.hpp" -#include "gadgetlib1/gadgets/fields/exponentiation_gadget.hpp" +#include +#include namespace libsnark { @@ -105,6 +105,6 @@ class mnt6_final_exp_gadget : public gadget > { } // libsnark -#include "gadgetlib1/gadgets/pairing/weierstrass_final_exponentiation.tcc" +#include #endif // WEIERSTRASS_FINAL_EXPONENTIATION_HPP_ diff --git a/src/gadgetlib1/gadgets/pairing/weierstrass_final_exponentiation.tcc b/libsnark/gadgetlib1/gadgets/pairing/weierstrass_final_exponentiation.tcc similarity index 98% rename from src/gadgetlib1/gadgets/pairing/weierstrass_final_exponentiation.tcc rename to libsnark/gadgetlib1/gadgets/pairing/weierstrass_final_exponentiation.tcc index ba3f7cdc..a213e296 100644 --- a/src/gadgetlib1/gadgets/pairing/weierstrass_final_exponentiation.tcc +++ b/libsnark/gadgetlib1/gadgets/pairing/weierstrass_final_exponentiation.tcc @@ -14,8 +14,8 @@ #ifndef WEIERSTRASS_FINAL_EXPONENTIATION_TCC_ #define WEIERSTRASS_FINAL_EXPONENTIATION_TCC_ -#include "gadgetlib1/gadgets/basic_gadgets.hpp" -#include "gadgetlib1/gadgets/pairing/mnt_pairing_params.hpp" +#include +#include namespace libsnark { diff --git a/src/gadgetlib1/gadgets/pairing/weierstrass_miller_loop.hpp b/libsnark/gadgetlib1/gadgets/pairing/weierstrass_miller_loop.hpp similarity index 97% rename from src/gadgetlib1/gadgets/pairing/weierstrass_miller_loop.hpp rename to libsnark/gadgetlib1/gadgets/pairing/weierstrass_miller_loop.hpp index 9afa4bce..2ff438fa 100644 --- a/src/gadgetlib1/gadgets/pairing/weierstrass_miller_loop.hpp +++ b/libsnark/gadgetlib1/gadgets/pairing/weierstrass_miller_loop.hpp @@ -15,8 +15,8 @@ #define WEIERSTRASS_MILLER_LOOP_HPP_ #include -#include "gadgetlib1/gadgets/pairing/pairing_params.hpp" -#include "gadgetlib1/gadgets/pairing/weierstrass_precomputation.hpp" +#include +#include namespace libsnark { @@ -251,6 +251,6 @@ void test_mnt_e_times_e_over_e_miller_loop(const std::string &annotation); } // libsnark -#include "gadgetlib1/gadgets/pairing/weierstrass_miller_loop.tcc" +#include #endif // WEIERSTRASS_MILLER_LOOP_HPP_ diff --git a/src/gadgetlib1/gadgets/pairing/weierstrass_miller_loop.tcc b/libsnark/gadgetlib1/gadgets/pairing/weierstrass_miller_loop.tcc similarity index 99% rename from src/gadgetlib1/gadgets/pairing/weierstrass_miller_loop.tcc rename to libsnark/gadgetlib1/gadgets/pairing/weierstrass_miller_loop.tcc index e1b49b8d..a131e823 100644 --- a/src/gadgetlib1/gadgets/pairing/weierstrass_miller_loop.tcc +++ b/libsnark/gadgetlib1/gadgets/pairing/weierstrass_miller_loop.tcc @@ -15,8 +15,8 @@ #define WEIERSTRASS_MILLER_LOOP_TCC_ #include -#include "gadgetlib1/constraint_profiling.hpp" -#include "gadgetlib1/gadgets/basic_gadgets.hpp" +#include +#include namespace libsnark { diff --git a/src/gadgetlib1/gadgets/pairing/weierstrass_precomputation.hpp b/libsnark/gadgetlib1/gadgets/pairing/weierstrass_precomputation.hpp similarity index 97% rename from src/gadgetlib1/gadgets/pairing/weierstrass_precomputation.hpp rename to libsnark/gadgetlib1/gadgets/pairing/weierstrass_precomputation.hpp index ce018672..3799c008 100644 --- a/src/gadgetlib1/gadgets/pairing/weierstrass_precomputation.hpp +++ b/libsnark/gadgetlib1/gadgets/pairing/weierstrass_precomputation.hpp @@ -15,9 +15,9 @@ #define WEIERSTRASS_PRECOMPUTATION_HPP_ #include -#include "gadgetlib1/gadgets/curves/weierstrass_g1_gadget.hpp" -#include "gadgetlib1/gadgets/curves/weierstrass_g2_gadget.hpp" -#include "gadgetlib1/gadgets/pairing/pairing_params.hpp" +#include +#include +#include namespace libsnark { @@ -275,6 +275,6 @@ void test_G2_variable_precomp(const std::string &annotation); } // libsnark -#include "gadgetlib1/gadgets/pairing/weierstrass_precomputation.tcc" +#include #endif // WEIERSTRASS_PRECOMPUTATION_HPP_ diff --git a/src/gadgetlib1/gadgets/pairing/weierstrass_precomputation.tcc b/libsnark/gadgetlib1/gadgets/pairing/weierstrass_precomputation.tcc similarity index 99% rename from src/gadgetlib1/gadgets/pairing/weierstrass_precomputation.tcc rename to libsnark/gadgetlib1/gadgets/pairing/weierstrass_precomputation.tcc index eb8c4e95..44a460c5 100644 --- a/src/gadgetlib1/gadgets/pairing/weierstrass_precomputation.tcc +++ b/libsnark/gadgetlib1/gadgets/pairing/weierstrass_precomputation.tcc @@ -15,7 +15,7 @@ #define WEIERSTRASS_PRECOMPUTATION_TCC_ #include -#include "gadgetlib1/gadgets/pairing/mnt_pairing_params.hpp" +#include namespace libsnark { diff --git a/src/gadgetlib1/gadgets/routing/as_waksman_routing_gadget.hpp b/libsnark/gadgetlib1/gadgets/routing/as_waksman_routing_gadget.hpp similarity index 89% rename from src/gadgetlib1/gadgets/routing/as_waksman_routing_gadget.hpp rename to libsnark/gadgetlib1/gadgets/routing/as_waksman_routing_gadget.hpp index 8fc606d6..c6c98b60 100644 --- a/src/gadgetlib1/gadgets/routing/as_waksman_routing_gadget.hpp +++ b/libsnark/gadgetlib1/gadgets/routing/as_waksman_routing_gadget.hpp @@ -15,10 +15,10 @@ #ifndef AS_WAKSMAN_ROUTING_GADGET_HPP_ #define AS_WAKSMAN_ROUTING_GADGET_HPP_ -#include "gadgetlib1/protoboard.hpp" -#include "gadgetlib1/gadgets/basic_gadgets.hpp" -#include "common/data_structures/integer_permutation.hpp" -#include "common/routing_algorithms/as_waksman_routing_algorithm.hpp" +#include +#include +#include +#include namespace libsnark { @@ -77,6 +77,6 @@ void test_as_waksman_routing_gadget(const size_t num_packets, const size_t packe } // libsnark -#include "gadgetlib1/gadgets/routing/as_waksman_routing_gadget.tcc" +#include #endif // AS_WAKSMAN_ROUTING_GADGET_HPP_ diff --git a/src/gadgetlib1/gadgets/routing/as_waksman_routing_gadget.tcc b/libsnark/gadgetlib1/gadgets/routing/as_waksman_routing_gadget.tcc similarity index 99% rename from src/gadgetlib1/gadgets/routing/as_waksman_routing_gadget.tcc rename to libsnark/gadgetlib1/gadgets/routing/as_waksman_routing_gadget.tcc index cb7eb6be..d3bf0a38 100644 --- a/src/gadgetlib1/gadgets/routing/as_waksman_routing_gadget.tcc +++ b/libsnark/gadgetlib1/gadgets/routing/as_waksman_routing_gadget.tcc @@ -16,7 +16,7 @@ #include -#include "common/routing_algorithms/as_waksman_routing_algorithm.hpp" +#include #include namespace libsnark { diff --git a/src/gadgetlib1/gadgets/routing/benes_routing_gadget.hpp b/libsnark/gadgetlib1/gadgets/routing/benes_routing_gadget.hpp similarity index 89% rename from src/gadgetlib1/gadgets/routing/benes_routing_gadget.hpp rename to libsnark/gadgetlib1/gadgets/routing/benes_routing_gadget.hpp index 5d4edb4c..dea74dc7 100644 --- a/src/gadgetlib1/gadgets/routing/benes_routing_gadget.hpp +++ b/libsnark/gadgetlib1/gadgets/routing/benes_routing_gadget.hpp @@ -15,10 +15,10 @@ #ifndef BENES_ROUTING_GADGET_HPP_ #define BENES_ROUTING_GADGET_HPP_ -#include "common/data_structures/integer_permutation.hpp" -#include "common/routing_algorithms/benes_routing_algorithm.hpp" -#include "gadgetlib1/gadgets/basic_gadgets.hpp" -#include "gadgetlib1/protoboard.hpp" +#include +#include +#include +#include namespace libsnark { @@ -76,6 +76,6 @@ void test_benes_routing_gadget(const size_t num_packets, const size_t packet_siz } // libsnark -#include "gadgetlib1/gadgets/routing/benes_routing_gadget.tcc" +#include #endif // BENES_ROUTING_GADGET_HPP_ diff --git a/src/gadgetlib1/gadgets/routing/benes_routing_gadget.tcc b/libsnark/gadgetlib1/gadgets/routing/benes_routing_gadget.tcc similarity index 100% rename from src/gadgetlib1/gadgets/routing/benes_routing_gadget.tcc rename to libsnark/gadgetlib1/gadgets/routing/benes_routing_gadget.tcc diff --git a/src/gadgetlib1/gadgets/routing/profiling/profile_routing_gadgets.cpp b/libsnark/gadgetlib1/gadgets/routing/profiling/profile_routing_gadgets.cpp similarity index 96% rename from src/gadgetlib1/gadgets/routing/profiling/profile_routing_gadgets.cpp rename to libsnark/gadgetlib1/gadgets/routing/profiling/profile_routing_gadgets.cpp index 45b6d650..1bac6a7f 100644 --- a/src/gadgetlib1/gadgets/routing/profiling/profile_routing_gadgets.cpp +++ b/libsnark/gadgetlib1/gadgets/routing/profiling/profile_routing_gadgets.cpp @@ -13,8 +13,8 @@ #include #include -#include "gadgetlib1/gadgets/routing/benes_routing_gadget.hpp" -#include "gadgetlib1/gadgets/routing/as_waksman_routing_gadget.hpp" +#include +#include using namespace libsnark; diff --git a/src/gadgetlib1/gadgets/set_commitment/set_commitment_gadget.hpp b/libsnark/gadgetlib1/gadgets/set_commitment/set_commitment_gadget.hpp similarity index 81% rename from src/gadgetlib1/gadgets/set_commitment/set_commitment_gadget.hpp rename to libsnark/gadgetlib1/gadgets/set_commitment/set_commitment_gadget.hpp index faafa07d..41a57f66 100644 --- a/src/gadgetlib1/gadgets/set_commitment/set_commitment_gadget.hpp +++ b/libsnark/gadgetlib1/gadgets/set_commitment/set_commitment_gadget.hpp @@ -7,11 +7,11 @@ #ifndef SET_COMMITMENT_GADGET_HPP_ #define SET_COMMITMENT_GADGET_HPP_ -#include "gadgetlib1/gadget.hpp" -#include "gadgetlib1/gadgets/basic_gadgets.hpp" -#include "gadgetlib1/gadgets/hashes/hash_io.hpp" -#include "gadgetlib1/gadgets/merkle_tree/merkle_tree_check_read_gadget.hpp" -#include "gadgetlib1/gadgets/set_commitment/set_membership_proof_variable.hpp" +#include +#include +#include +#include +#include namespace libsnark { @@ -52,6 +52,6 @@ void test_set_commitment_gadget(); } // libsnark -#include "gadgetlib1/gadgets/set_commitment/set_commitment_gadget.tcc" +#include #endif // SET_COMMITMENT_GADGET_HPP_ diff --git a/src/gadgetlib1/gadgets/set_commitment/set_commitment_gadget.tcc b/libsnark/gadgetlib1/gadgets/set_commitment/set_commitment_gadget.tcc similarity index 99% rename from src/gadgetlib1/gadgets/set_commitment/set_commitment_gadget.tcc rename to libsnark/gadgetlib1/gadgets/set_commitment/set_commitment_gadget.tcc index 0a4cebc7..d1005e37 100644 --- a/src/gadgetlib1/gadgets/set_commitment/set_commitment_gadget.tcc +++ b/libsnark/gadgetlib1/gadgets/set_commitment/set_commitment_gadget.tcc @@ -7,7 +7,7 @@ #ifndef SET_COMMITMENT_GADGET_TCC_ #define SET_COMMITMENT_GADGET_TCC_ -#include "common/data_structures/set_commitment.hpp" +#include namespace libsnark { diff --git a/src/gadgetlib1/gadgets/set_commitment/set_membership_proof_variable.hpp b/libsnark/gadgetlib1/gadgets/set_commitment/set_membership_proof_variable.hpp similarity index 78% rename from src/gadgetlib1/gadgets/set_commitment/set_membership_proof_variable.hpp rename to libsnark/gadgetlib1/gadgets/set_commitment/set_membership_proof_variable.hpp index 4aa9a02b..8c6c1aa8 100644 --- a/src/gadgetlib1/gadgets/set_commitment/set_membership_proof_variable.hpp +++ b/libsnark/gadgetlib1/gadgets/set_commitment/set_membership_proof_variable.hpp @@ -8,10 +8,10 @@ #ifndef SET_MEMBERSHIP_PROOF_VARIABLE_HPP_ #define SET_MEMBERSHIP_PROOF_VARIABLE_HPP_ -#include "common/data_structures/set_commitment.hpp" -#include "gadgetlib1/gadget.hpp" -#include "gadgetlib1/gadgets/hashes/hash_io.hpp" -#include "gadgetlib1/gadgets/merkle_tree/merkle_authentication_path_variable.hpp" +#include +#include +#include +#include namespace libsnark { @@ -38,6 +38,6 @@ class set_membership_proof_variable : public gadget { } // libsnark -#include "gadgetlib1/gadgets/set_commitment/set_membership_proof_variable.tcc" +#include #endif // SET_MEMBERSHIP_PROOF_VARIABLE_HPP diff --git a/src/gadgetlib1/gadgets/set_commitment/set_membership_proof_variable.tcc b/libsnark/gadgetlib1/gadgets/set_commitment/set_membership_proof_variable.tcc similarity index 100% rename from src/gadgetlib1/gadgets/set_commitment/set_membership_proof_variable.tcc rename to libsnark/gadgetlib1/gadgets/set_commitment/set_membership_proof_variable.tcc diff --git a/src/gadgetlib1/gadgets/set_commitment/tests/test_set_commitment_gadget.cpp b/libsnark/gadgetlib1/gadgets/set_commitment/tests/test_set_commitment_gadget.cpp similarity index 90% rename from src/gadgetlib1/gadgets/set_commitment/tests/test_set_commitment_gadget.cpp rename to libsnark/gadgetlib1/gadgets/set_commitment/tests/test_set_commitment_gadget.cpp index f8fccfc9..b0985a8a 100644 --- a/src/gadgetlib1/gadgets/set_commitment/tests/test_set_commitment_gadget.cpp +++ b/libsnark/gadgetlib1/gadgets/set_commitment/tests/test_set_commitment_gadget.cpp @@ -11,8 +11,8 @@ #include #include #include -#include "gadgetlib1/gadgets/set_commitment/set_commitment_gadget.hpp" -#include "gadgetlib1/gadgets/hashes/sha256/sha256_gadget.hpp" +#include +#include using namespace libsnark; diff --git a/src/gadgetlib1/gadgets/verifiers/r1cs_ppzksnark_verifier_gadget.hpp b/libsnark/gadgetlib1/gadgets/verifiers/r1cs_ppzksnark_verifier_gadget.hpp similarity index 95% rename from src/gadgetlib1/gadgets/verifiers/r1cs_ppzksnark_verifier_gadget.hpp rename to libsnark/gadgetlib1/gadgets/verifiers/r1cs_ppzksnark_verifier_gadget.hpp index c786977b..1f03057e 100644 --- a/src/gadgetlib1/gadgets/verifiers/r1cs_ppzksnark_verifier_gadget.hpp +++ b/libsnark/gadgetlib1/gadgets/verifiers/r1cs_ppzksnark_verifier_gadget.hpp @@ -18,12 +18,12 @@ #ifndef R1CS_PPZKSNARK_VERIFIER_GADGET_HPP_ #define R1CS_PPZKSNARK_VERIFIER_GADGET_HPP_ -#include "gadgetlib1/gadgets/basic_gadgets.hpp" -#include "gadgetlib1/gadgets/curves/weierstrass_g1_gadget.hpp" -#include "gadgetlib1/gadgets/curves/weierstrass_g2_gadget.hpp" -#include "gadgetlib1/gadgets/pairing/pairing_checks.hpp" -#include "gadgetlib1/gadgets/pairing/pairing_params.hpp" -#include "zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp" +#include +#include +#include +#include +#include +#include namespace libsnark { @@ -245,6 +245,6 @@ class r1cs_ppzksnark_verifier_gadget : public gadget > { } // libsnark -#include "gadgetlib1/gadgets/verifiers/r1cs_ppzksnark_verifier_gadget.tcc" +#include #endif // R1CS_PPZKSNARK_VERIFIER_GADGET_HPP_ diff --git a/src/gadgetlib1/gadgets/verifiers/r1cs_ppzksnark_verifier_gadget.tcc b/libsnark/gadgetlib1/gadgets/verifiers/r1cs_ppzksnark_verifier_gadget.tcc similarity index 99% rename from src/gadgetlib1/gadgets/verifiers/r1cs_ppzksnark_verifier_gadget.tcc rename to libsnark/gadgetlib1/gadgets/verifiers/r1cs_ppzksnark_verifier_gadget.tcc index 1439e9df..651d0bed 100644 --- a/src/gadgetlib1/gadgets/verifiers/r1cs_ppzksnark_verifier_gadget.tcc +++ b/libsnark/gadgetlib1/gadgets/verifiers/r1cs_ppzksnark_verifier_gadget.tcc @@ -14,7 +14,7 @@ #ifndef R1CS_PPZKSNARK_VERIFIER_GADGET_TCC_ #define R1CS_PPZKSNARK_VERIFIER_GADGET_TCC_ -#include "gadgetlib1/constraint_profiling.hpp" +#include namespace libsnark { diff --git a/src/gadgetlib1/gadgets/verifiers/tests/test_r1cs_ppzksnark_verifier_gadget.cpp b/libsnark/gadgetlib1/gadgets/verifiers/tests/test_r1cs_ppzksnark_verifier_gadget.cpp similarity index 97% rename from src/gadgetlib1/gadgets/verifiers/tests/test_r1cs_ppzksnark_verifier_gadget.cpp rename to libsnark/gadgetlib1/gadgets/verifiers/tests/test_r1cs_ppzksnark_verifier_gadget.cpp index 6cf947e6..12be73b3 100644 --- a/src/gadgetlib1/gadgets/verifiers/tests/test_r1cs_ppzksnark_verifier_gadget.cpp +++ b/libsnark/gadgetlib1/gadgets/verifiers/tests/test_r1cs_ppzksnark_verifier_gadget.cpp @@ -7,13 +7,13 @@ #include #include #include -#include "gadgetlib1/gadgets/fields/fp2_gadgets.hpp" -#include "gadgetlib1/gadgets/fields/fp3_gadgets.hpp" -#include "gadgetlib1/gadgets/fields/fp4_gadgets.hpp" -#include "gadgetlib1/gadgets/fields/fp6_gadgets.hpp" -#include "gadgetlib1/gadgets/verifiers/r1cs_ppzksnark_verifier_gadget.hpp" -#include "relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp" -#include "zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp" +#include +#include +#include +#include +#include +#include +#include using namespace libsnark; diff --git a/src/gadgetlib1/pb_variable.hpp b/libsnark/gadgetlib1/pb_variable.hpp similarity index 98% rename from src/gadgetlib1/pb_variable.hpp rename to libsnark/gadgetlib1/pb_variable.hpp index d4406bbb..85b18bc1 100644 --- a/src/gadgetlib1/pb_variable.hpp +++ b/libsnark/gadgetlib1/pb_variable.hpp @@ -12,7 +12,7 @@ #include #include #include -#include "relations/variable.hpp" +#include namespace libsnark { @@ -139,6 +139,6 @@ template linear_combination pb_coeff_sum(const pb_linear_combination_array &v, const std::vector &coeffs); } // libsnark -#include "gadgetlib1/pb_variable.tcc" +#include #endif // PB_VARIABLE_HPP_ diff --git a/src/gadgetlib1/pb_variable.tcc b/libsnark/gadgetlib1/pb_variable.tcc similarity index 99% rename from src/gadgetlib1/pb_variable.tcc rename to libsnark/gadgetlib1/pb_variable.tcc index 705dda3a..0a38aaf2 100644 --- a/src/gadgetlib1/pb_variable.tcc +++ b/libsnark/gadgetlib1/pb_variable.tcc @@ -8,7 +8,7 @@ #ifndef PB_VARIABLE_TCC_ #define PB_VARIABLE_TCC_ #include -#include "gadgetlib1/protoboard.hpp" +#include #include namespace libsnark { diff --git a/src/gadgetlib1/protoboard.hpp b/libsnark/gadgetlib1/protoboard.hpp similarity index 93% rename from src/gadgetlib1/protoboard.hpp rename to libsnark/gadgetlib1/protoboard.hpp index 411120a6..92eeb1a5 100644 --- a/src/gadgetlib1/protoboard.hpp +++ b/libsnark/gadgetlib1/protoboard.hpp @@ -13,8 +13,8 @@ #include #include #include -#include "gadgetlib1/pb_variable.hpp" -#include "relations/constraint_satisfaction_problems/r1cs/r1cs.hpp" +#include +#include #include namespace libsnark { @@ -71,5 +71,5 @@ class protoboard { }; } // libsnark -#include "gadgetlib1/protoboard.tcc" +#include #endif // PROTOBOARD_HPP_ diff --git a/src/gadgetlib1/protoboard.tcc b/libsnark/gadgetlib1/protoboard.tcc similarity index 100% rename from src/gadgetlib1/protoboard.tcc rename to libsnark/gadgetlib1/protoboard.tcc diff --git a/src/gadgetlib1/tests/gadgetlib1_test.cpp b/libsnark/gadgetlib1/tests/gadgetlib1_test.cpp similarity index 88% rename from src/gadgetlib1/tests/gadgetlib1_test.cpp rename to libsnark/gadgetlib1/tests/gadgetlib1_test.cpp index 664f243c..4de56bbf 100644 --- a/src/gadgetlib1/tests/gadgetlib1_test.cpp +++ b/libsnark/gadgetlib1/tests/gadgetlib1_test.cpp @@ -8,8 +8,8 @@ *****************************************************************************/ #include -#include "gadgetlib1/examples/simple_example.hpp" -#include "zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.hpp" +#include +#include namespace { diff --git a/src/gadgetlib2/adapters.cpp b/libsnark/gadgetlib2/adapters.cpp similarity index 98% rename from src/gadgetlib2/adapters.cpp rename to libsnark/gadgetlib2/adapters.cpp index 03d4d5dd..331884c6 100644 --- a/src/gadgetlib2/adapters.cpp +++ b/libsnark/gadgetlib2/adapters.cpp @@ -7,7 +7,7 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include "adapters.hpp" +#include using gadgetlib2::Variable; using gadgetlib2::Rank1Constraint; diff --git a/src/gadgetlib2/adapters.hpp b/libsnark/gadgetlib2/adapters.hpp similarity index 94% rename from src/gadgetlib2/adapters.hpp rename to libsnark/gadgetlib2/adapters.hpp index ba4678de..c923337e 100644 --- a/src/gadgetlib2/adapters.hpp +++ b/libsnark/gadgetlib2/adapters.hpp @@ -13,10 +13,10 @@ #include #include #include -#include "pp.hpp" -#include "variable.hpp" -#include "constraint.hpp" -#include "protoboard.hpp" +#include +#include +#include +#include using gadgetlib2::LinearTerm; using gadgetlib2::LinearCombination; diff --git a/src/gadgetlib2/constraint.cpp b/libsnark/gadgetlib2/constraint.cpp similarity index 98% rename from src/gadgetlib2/constraint.cpp rename to libsnark/gadgetlib2/constraint.cpp index e4884b59..23c6388a 100644 --- a/src/gadgetlib2/constraint.cpp +++ b/libsnark/gadgetlib2/constraint.cpp @@ -12,8 +12,8 @@ #include #include #include -#include "constraint.hpp" -#include "variable.hpp" +#include +#include using ::std::string; using ::std::vector; diff --git a/src/gadgetlib2/constraint.hpp b/libsnark/gadgetlib2/constraint.hpp similarity index 99% rename from src/gadgetlib2/constraint.hpp rename to libsnark/gadgetlib2/constraint.hpp index 5b51e446..fc76024e 100644 --- a/src/gadgetlib2/constraint.hpp +++ b/libsnark/gadgetlib2/constraint.hpp @@ -16,7 +16,7 @@ #include #include -#include "variable.hpp" +#include namespace gadgetlib2 { diff --git a/src/gadgetlib2/examples/simple_example.cpp b/libsnark/gadgetlib2/examples/simple_example.cpp similarity index 92% rename from src/gadgetlib2/examples/simple_example.cpp rename to libsnark/gadgetlib2/examples/simple_example.cpp index 105c603a..dc224a0b 100644 --- a/src/gadgetlib2/examples/simple_example.cpp +++ b/libsnark/gadgetlib2/examples/simple_example.cpp @@ -5,11 +5,11 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include "gadgetlib2/examples/simple_example.hpp" +#include -#include "gadgetlib2/adapters.hpp" -#include "gadgetlib2/gadget.hpp" -#include "gadgetlib2/integration.hpp" +#include +#include +#include namespace libsnark { diff --git a/src/gadgetlib2/examples/simple_example.hpp b/libsnark/gadgetlib2/examples/simple_example.hpp similarity index 86% rename from src/gadgetlib2/examples/simple_example.hpp rename to libsnark/gadgetlib2/examples/simple_example.hpp index 25e6d0c8..64d547b0 100644 --- a/src/gadgetlib2/examples/simple_example.hpp +++ b/libsnark/gadgetlib2/examples/simple_example.hpp @@ -9,7 +9,7 @@ #define SIMPLE_EXAMPLE_HPP_ #include -#include "relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp" +#include namespace libsnark { diff --git a/src/gadgetlib2/examples/tutorial.cpp b/libsnark/gadgetlib2/examples/tutorial.cpp similarity index 99% rename from src/gadgetlib2/examples/tutorial.cpp rename to libsnark/gadgetlib2/examples/tutorial.cpp index 31680f27..aaf6b4f9 100644 --- a/src/gadgetlib2/examples/tutorial.cpp +++ b/libsnark/gadgetlib2/examples/tutorial.cpp @@ -10,10 +10,10 @@ This file is meant to be read top-down as a tutorial for gadget writing. * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include "gadgetlib2/examples/simple_example.hpp" -#include "relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp" +#include +#include #include "third_party/gtest/googletest/include/gtest/gtest.h" -#include "zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.hpp" +#include #include namespace gadgetExamples { diff --git a/src/gadgetlib2/gadget.cpp b/libsnark/gadgetlib2/gadget.cpp similarity index 99% rename from src/gadgetlib2/gadget.cpp rename to libsnark/gadgetlib2/gadget.cpp index 71a0409c..7fff1699 100644 --- a/src/gadgetlib2/gadget.cpp +++ b/libsnark/gadgetlib2/gadget.cpp @@ -12,7 +12,7 @@ #include #include -#include "gadget.hpp" +#include using ::std::shared_ptr; using ::std::string; diff --git a/src/gadgetlib2/gadget.hpp b/libsnark/gadgetlib2/gadget.hpp similarity index 99% rename from src/gadgetlib2/gadget.hpp rename to libsnark/gadgetlib2/gadget.hpp index dbd23e9f..5c832166 100644 --- a/src/gadgetlib2/gadget.hpp +++ b/libsnark/gadgetlib2/gadget.hpp @@ -37,9 +37,9 @@ #define LIBSNARK_GADGETLIB2_INCLUDE_GADGETLIB2_GADGET_HPP_ #include -#include "variable.hpp" -#include "protoboard.hpp" -#include "gadgetMacros.hpp" +#include +#include +#include namespace gadgetlib2 { diff --git a/src/gadgetlib2/gadgetMacros.hpp b/libsnark/gadgetlib2/gadgetMacros.hpp similarity index 100% rename from src/gadgetlib2/gadgetMacros.hpp rename to libsnark/gadgetlib2/gadgetMacros.hpp diff --git a/src/gadgetlib2/infrastructure.cpp b/libsnark/gadgetlib2/infrastructure.cpp similarity index 98% rename from src/gadgetlib2/infrastructure.cpp rename to libsnark/gadgetlib2/infrastructure.cpp index a195b493..b8202d95 100644 --- a/src/gadgetlib2/infrastructure.cpp +++ b/libsnark/gadgetlib2/infrastructure.cpp @@ -7,7 +7,7 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include "infrastructure.hpp" +#include #include #include diff --git a/src/gadgetlib2/infrastructure.hpp b/libsnark/gadgetlib2/infrastructure.hpp similarity index 100% rename from src/gadgetlib2/infrastructure.hpp rename to libsnark/gadgetlib2/infrastructure.hpp diff --git a/src/gadgetlib2/integration.cpp b/libsnark/gadgetlib2/integration.cpp similarity index 97% rename from src/gadgetlib2/integration.cpp rename to libsnark/gadgetlib2/integration.cpp index 059c40d4..c9bfc02c 100644 --- a/src/gadgetlib2/integration.cpp +++ b/libsnark/gadgetlib2/integration.cpp @@ -5,8 +5,8 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include "gadgetlib2/adapters.hpp" -#include "gadgetlib2/integration.hpp" +#include +#include namespace libsnark { diff --git a/src/gadgetlib2/integration.hpp b/libsnark/gadgetlib2/integration.hpp similarity index 86% rename from src/gadgetlib2/integration.hpp rename to libsnark/gadgetlib2/integration.hpp index 730212ca..de7e8ec3 100644 --- a/src/gadgetlib2/integration.hpp +++ b/libsnark/gadgetlib2/integration.hpp @@ -9,8 +9,8 @@ #define INTEGRATION_HPP_ #include -#include "relations/constraint_satisfaction_problems/r1cs/r1cs.hpp" -#include "gadgetlib2/protoboard.hpp" +#include +#include namespace libsnark { diff --git a/src/gadgetlib2/pp.cpp b/libsnark/gadgetlib2/pp.cpp similarity index 96% rename from src/gadgetlib2/pp.cpp rename to libsnark/gadgetlib2/pp.cpp index 08f77d73..18477954 100644 --- a/src/gadgetlib2/pp.cpp +++ b/libsnark/gadgetlib2/pp.cpp @@ -9,7 +9,7 @@ #include #include -#include "pp.hpp" +#include namespace gadgetlib2 { diff --git a/src/gadgetlib2/pp.hpp b/libsnark/gadgetlib2/pp.hpp similarity index 100% rename from src/gadgetlib2/pp.hpp rename to libsnark/gadgetlib2/pp.hpp diff --git a/src/gadgetlib2/protoboard.cpp b/libsnark/gadgetlib2/protoboard.cpp similarity index 99% rename from src/gadgetlib2/protoboard.cpp rename to libsnark/gadgetlib2/protoboard.cpp index e1d0b339..b41eff1c 100644 --- a/src/gadgetlib2/protoboard.cpp +++ b/libsnark/gadgetlib2/protoboard.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ #include -#include "protoboard.hpp" +#include using ::std::string; using ::std::cout; diff --git a/src/gadgetlib2/protoboard.hpp b/libsnark/gadgetlib2/protoboard.hpp similarity index 97% rename from src/gadgetlib2/protoboard.hpp rename to libsnark/gadgetlib2/protoboard.hpp index 53aac521..97716602 100644 --- a/src/gadgetlib2/protoboard.hpp +++ b/libsnark/gadgetlib2/protoboard.hpp @@ -11,9 +11,9 @@ #define LIBSNARK_GADGETLIB2_INCLUDE_GADGETLIB2_PROTOBOARD_HPP_ #include -#include "pp.hpp" -#include "variable.hpp" -#include "constraint.hpp" +#include +#include +#include #define ASSERT_CONSTRAINTS_SATISFIED(pb) \ ASSERT_TRUE(pb->isSatisfied(PrintOptions::DBG_PRINT_IF_NOT_SATISFIED)) diff --git a/src/gadgetlib2/tests/adapters_UTEST.cpp b/libsnark/gadgetlib2/tests/adapters_UTEST.cpp similarity index 100% rename from src/gadgetlib2/tests/adapters_UTEST.cpp rename to libsnark/gadgetlib2/tests/adapters_UTEST.cpp diff --git a/src/gadgetlib2/tests/constraint_UTEST.cpp b/libsnark/gadgetlib2/tests/constraint_UTEST.cpp similarity index 100% rename from src/gadgetlib2/tests/constraint_UTEST.cpp rename to libsnark/gadgetlib2/tests/constraint_UTEST.cpp diff --git a/src/gadgetlib2/tests/gadget_UTEST.cpp b/libsnark/gadgetlib2/tests/gadget_UTEST.cpp similarity index 100% rename from src/gadgetlib2/tests/gadget_UTEST.cpp rename to libsnark/gadgetlib2/tests/gadget_UTEST.cpp diff --git a/src/gadgetlib2/tests/gadgetlib2_test.cpp b/libsnark/gadgetlib2/tests/gadgetlib2_test.cpp similarity index 100% rename from src/gadgetlib2/tests/gadgetlib2_test.cpp rename to libsnark/gadgetlib2/tests/gadgetlib2_test.cpp diff --git a/src/gadgetlib2/tests/integration_UTEST.cpp b/libsnark/gadgetlib2/tests/integration_UTEST.cpp similarity index 75% rename from src/gadgetlib2/tests/integration_UTEST.cpp rename to libsnark/gadgetlib2/tests/integration_UTEST.cpp index e596f7c3..f2ba3a86 100644 --- a/src/gadgetlib2/tests/integration_UTEST.cpp +++ b/libsnark/gadgetlib2/tests/integration_UTEST.cpp @@ -11,11 +11,11 @@ #include #include -#include "common/default_types/r1cs_ppzksnark_pp.hpp" -#include "gadgetlib2/examples/simple_example.hpp" -#include "relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp" +#include +#include +#include #include "third_party/gtest/googletest/include/gtest/gtest.h" -#include "zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.hpp" +#include using namespace gadgetlib2; diff --git a/src/gadgetlib2/tests/protoboard_UTEST.cpp b/libsnark/gadgetlib2/tests/protoboard_UTEST.cpp similarity index 100% rename from src/gadgetlib2/tests/protoboard_UTEST.cpp rename to libsnark/gadgetlib2/tests/protoboard_UTEST.cpp diff --git a/src/gadgetlib2/tests/variable_UTEST.cpp b/libsnark/gadgetlib2/tests/variable_UTEST.cpp similarity index 100% rename from src/gadgetlib2/tests/variable_UTEST.cpp rename to libsnark/gadgetlib2/tests/variable_UTEST.cpp diff --git a/src/gadgetlib2/variable.cpp b/libsnark/gadgetlib2/variable.cpp similarity index 99% rename from src/gadgetlib2/variable.cpp rename to libsnark/gadgetlib2/variable.cpp index d423a746..a961e17b 100644 --- a/src/gadgetlib2/variable.cpp +++ b/libsnark/gadgetlib2/variable.cpp @@ -12,9 +12,9 @@ #include #include #include -#include "variable.hpp" -#include "pp.hpp" -#include "infrastructure.hpp" +#include +#include +#include using ::std::string; using ::std::stringstream; diff --git a/src/gadgetlib2/variable.hpp b/libsnark/gadgetlib2/variable.hpp similarity index 99% rename from src/gadgetlib2/variable.hpp rename to libsnark/gadgetlib2/variable.hpp index 722942a5..6e7fd56c 100644 --- a/src/gadgetlib2/variable.hpp +++ b/libsnark/gadgetlib2/variable.hpp @@ -18,8 +18,8 @@ #include #include #include -#include "pp.hpp" -#include "infrastructure.hpp" +#include +#include namespace gadgetlib2 { @@ -567,6 +567,6 @@ inline Polynomial operator-(const Polynomial& src) {return Polynomial(FElem(0)) } // namespace gadgetlib2 -#include "variable_operators.hpp" +#include #endif // LIBSNARK_GADGETLIB2_INCLUDE_GADGETLIB2_VARIABLE_HPP_ diff --git a/src/gadgetlib2/variable_operators.hpp b/libsnark/gadgetlib2/variable_operators.hpp similarity index 99% rename from src/gadgetlib2/variable_operators.hpp rename to libsnark/gadgetlib2/variable_operators.hpp index 87f23438..3f9596e3 100644 --- a/src/gadgetlib2/variable_operators.hpp +++ b/libsnark/gadgetlib2/variable_operators.hpp @@ -13,7 +13,7 @@ #ifndef LIBSNARK_GADGETLIB2_INCLUDE_GADGETLIB2_VARIABLEOPERATORS_HPP_ #define LIBSNARK_GADGETLIB2_INCLUDE_GADGETLIB2_VARIABLEOPERATORS_HPP_ -#include "variable.hpp" +#include namespace gadgetlib2 { diff --git a/src/knowledge_commitment/kc_multiexp.hpp b/libsnark/knowledge_commitment/kc_multiexp.hpp similarity index 95% rename from src/knowledge_commitment/kc_multiexp.hpp rename to libsnark/knowledge_commitment/kc_multiexp.hpp index f97380e8..34a2b53f 100644 --- a/src/knowledge_commitment/kc_multiexp.hpp +++ b/libsnark/knowledge_commitment/kc_multiexp.hpp @@ -17,7 +17,7 @@ Will probably go away in more general exp refactoring. */ -#include "knowledge_commitment/knowledge_commitment.hpp" +#include namespace libsnark { @@ -50,6 +50,6 @@ knowledge_commitment_vector kc_batch_exp(const size_t scalar_size, } // libsnark -#include "knowledge_commitment/kc_multiexp.tcc" +#include #endif // KC_MULTIEXP_HPP_ diff --git a/src/knowledge_commitment/kc_multiexp.tcc b/libsnark/knowledge_commitment/kc_multiexp.tcc similarity index 100% rename from src/knowledge_commitment/kc_multiexp.tcc rename to libsnark/knowledge_commitment/kc_multiexp.tcc diff --git a/src/knowledge_commitment/knowledge_commitment.hpp b/libsnark/knowledge_commitment/knowledge_commitment.hpp similarity index 95% rename from src/knowledge_commitment/knowledge_commitment.hpp rename to libsnark/knowledge_commitment/knowledge_commitment.hpp index 9bac87aa..b3002144 100644 --- a/src/knowledge_commitment/knowledge_commitment.hpp +++ b/libsnark/knowledge_commitment/knowledge_commitment.hpp @@ -15,7 +15,7 @@ #define KNOWLEDGE_COMMITMENT_HPP_ #include -#include "common/data_structures/sparse_vector.hpp" +#include namespace libsnark { @@ -79,6 +79,6 @@ using knowledge_commitment_vector = sparse_vector > } // libsnark -#include "knowledge_commitment/knowledge_commitment.tcc" +#include #endif // KNOWLEDGE_COMMITMENT_HPP_ diff --git a/src/knowledge_commitment/knowledge_commitment.tcc b/libsnark/knowledge_commitment/knowledge_commitment.tcc similarity index 100% rename from src/knowledge_commitment/knowledge_commitment.tcc rename to libsnark/knowledge_commitment/knowledge_commitment.tcc diff --git a/src/reductions/bacs_to_r1cs/bacs_to_r1cs.hpp b/libsnark/reductions/bacs_to_r1cs/bacs_to_r1cs.hpp similarity index 87% rename from src/reductions/bacs_to_r1cs/bacs_to_r1cs.hpp rename to libsnark/reductions/bacs_to_r1cs/bacs_to_r1cs.hpp index 87599ce3..ab7ac7c0 100644 --- a/src/reductions/bacs_to_r1cs/bacs_to_r1cs.hpp +++ b/libsnark/reductions/bacs_to_r1cs/bacs_to_r1cs.hpp @@ -18,8 +18,8 @@ #ifndef BACS_TO_R1CS_HPP_ #define BACS_TO_R1CS_HPP_ -#include "relations/circuit_satisfaction_problems/bacs/bacs.hpp" -#include "relations/constraint_satisfaction_problems/r1cs/r1cs.hpp" +#include +#include namespace libsnark { @@ -39,6 +39,6 @@ r1cs_variable_assignment bacs_to_r1cs_witness_map(const bacs_circuit #endif // BACS_TO_R1CS_HPP_ diff --git a/src/reductions/bacs_to_r1cs/bacs_to_r1cs.tcc b/libsnark/reductions/bacs_to_r1cs/bacs_to_r1cs.tcc similarity index 94% rename from src/reductions/bacs_to_r1cs/bacs_to_r1cs.tcc rename to libsnark/reductions/bacs_to_r1cs/bacs_to_r1cs.tcc index 2c71b008..63f09807 100644 --- a/src/reductions/bacs_to_r1cs/bacs_to_r1cs.tcc +++ b/libsnark/reductions/bacs_to_r1cs/bacs_to_r1cs.tcc @@ -14,8 +14,8 @@ See bacs_to_r1cs.hpp . #ifndef BACS_TO_R1CS_TCC_ #define BACS_TO_R1CS_TCC_ -#include "relations/circuit_satisfaction_problems/bacs/bacs.hpp" -#include "relations/constraint_satisfaction_problems/r1cs/r1cs.hpp" +#include +#include namespace libsnark { diff --git a/src/reductions/r1cs_to_qap/r1cs_to_qap.hpp b/libsnark/reductions/r1cs_to_qap/r1cs_to_qap.hpp similarity index 92% rename from src/reductions/r1cs_to_qap/r1cs_to_qap.hpp rename to libsnark/reductions/r1cs_to_qap/r1cs_to_qap.hpp index b3cde710..37ca2e60 100644 --- a/src/reductions/r1cs_to_qap/r1cs_to_qap.hpp +++ b/libsnark/reductions/r1cs_to_qap/r1cs_to_qap.hpp @@ -32,8 +32,8 @@ #ifndef R1CS_TO_QAP_HPP_ #define R1CS_TO_QAP_HPP_ -#include "relations/arithmetic_programs/qap/qap.hpp" -#include "relations/constraint_satisfaction_problems/r1cs/r1cs.hpp" +#include +#include namespace libsnark { @@ -65,6 +65,6 @@ qap_witness r1cs_to_qap_witness_map(const r1cs_constraint_system } // libsnark -#include "reductions/r1cs_to_qap/r1cs_to_qap.tcc" +#include #endif // R1CS_TO_QAP_HPP_ diff --git a/src/reductions/r1cs_to_qap/r1cs_to_qap.tcc b/libsnark/reductions/r1cs_to_qap/r1cs_to_qap.tcc similarity index 100% rename from src/reductions/r1cs_to_qap/r1cs_to_qap.tcc rename to libsnark/reductions/r1cs_to_qap/r1cs_to_qap.tcc diff --git a/src/reductions/ram_to_r1cs/examples/demo_arithmetization.cpp b/libsnark/reductions/ram_to_r1cs/examples/demo_arithmetization.cpp similarity index 95% rename from src/reductions/ram_to_r1cs/examples/demo_arithmetization.cpp rename to libsnark/reductions/ram_to_r1cs/examples/demo_arithmetization.cpp index 5c578cc2..733c0a90 100644 --- a/src/reductions/ram_to_r1cs/examples/demo_arithmetization.cpp +++ b/libsnark/reductions/ram_to_r1cs/examples/demo_arithmetization.cpp @@ -13,11 +13,11 @@ #include #endif -#include "common/default_types/tinyram_ppzksnark_pp.hpp" +#include #include -#include "reductions/ram_to_r1cs/ram_to_r1cs.hpp" -#include "relations/ram_computations/rams/tinyram/tinyram_params.hpp" -#include "zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark.hpp" +#include +#include +#include #ifndef MINDEPS namespace po = boost::program_options; diff --git a/src/reductions/ram_to_r1cs/gadgets/memory_checker_gadget.hpp b/libsnark/reductions/ram_to_r1cs/gadgets/memory_checker_gadget.hpp similarity index 92% rename from src/reductions/ram_to_r1cs/gadgets/memory_checker_gadget.hpp rename to libsnark/reductions/ram_to_r1cs/gadgets/memory_checker_gadget.hpp index 7ec8fcd7..da846ece 100644 --- a/src/reductions/ram_to_r1cs/gadgets/memory_checker_gadget.hpp +++ b/libsnark/reductions/ram_to_r1cs/gadgets/memory_checker_gadget.hpp @@ -13,7 +13,7 @@ #ifndef MEMORY_CHECKER_GADGET_HPP_ #define MEMORY_CHECKER_GADGET_HPP_ -#include "reductions/ram_to_r1cs/gadgets/trace_lines.hpp" +#include namespace libsnark { @@ -53,6 +53,6 @@ class memory_checker_gadget : public ram_gadget_base { } // libsnark -#include "reductions/ram_to_r1cs/gadgets/memory_checker_gadget.tcc" +#include #endif // MEMORY_CHECKER_GADGET_HPP_ diff --git a/src/reductions/ram_to_r1cs/gadgets/memory_checker_gadget.tcc b/libsnark/reductions/ram_to_r1cs/gadgets/memory_checker_gadget.tcc similarity index 100% rename from src/reductions/ram_to_r1cs/gadgets/memory_checker_gadget.tcc rename to libsnark/reductions/ram_to_r1cs/gadgets/memory_checker_gadget.tcc diff --git a/src/reductions/ram_to_r1cs/gadgets/ram_universal_gadget.hpp b/libsnark/reductions/ram_to_r1cs/gadgets/ram_universal_gadget.hpp similarity index 93% rename from src/reductions/ram_to_r1cs/gadgets/ram_universal_gadget.hpp rename to libsnark/reductions/ram_to_r1cs/gadgets/ram_universal_gadget.hpp index c6d05c27..4802dfe3 100644 --- a/src/reductions/ram_to_r1cs/gadgets/ram_universal_gadget.hpp +++ b/libsnark/reductions/ram_to_r1cs/gadgets/ram_universal_gadget.hpp @@ -42,10 +42,10 @@ #ifndef RAM_UNIVERSAL_GADGET_HPP_ #define RAM_UNIVERSAL_GADGET_HPP_ -#include "gadgetlib1/gadgets/routing/as_waksman_routing_gadget.hpp" -#include "reductions/ram_to_r1cs/gadgets/memory_checker_gadget.hpp" -#include "reductions/ram_to_r1cs/gadgets/trace_lines.hpp" -#include "relations/ram_computations/rams/ram_params.hpp" +#include +#include +#include +#include namespace libsnark { @@ -133,6 +133,6 @@ class ram_universal_gadget : public ram_gadget_base { } // libsnark -#include "reductions/ram_to_r1cs/gadgets/ram_universal_gadget.tcc" +#include #endif // RAM_UNIVERSAL_GADGET_HPP_ diff --git a/src/reductions/ram_to_r1cs/gadgets/ram_universal_gadget.tcc b/libsnark/reductions/ram_to_r1cs/gadgets/ram_universal_gadget.tcc similarity index 99% rename from src/reductions/ram_to_r1cs/gadgets/ram_universal_gadget.tcc rename to libsnark/reductions/ram_to_r1cs/gadgets/ram_universal_gadget.tcc index 3fa25eda..059b96ac 100644 --- a/src/reductions/ram_to_r1cs/gadgets/ram_universal_gadget.tcc +++ b/libsnark/reductions/ram_to_r1cs/gadgets/ram_universal_gadget.tcc @@ -14,11 +14,11 @@ #ifndef RAM_UNIVERSAL_GADGET_TCC_ #define RAM_UNIVERSAL_GADGET_TCC_ -#include "common/data_structures/integer_permutation.hpp" +#include #include #include #include -#include "relations/ram_computations/memory/ra_memory.hpp" +#include namespace libsnark { diff --git a/src/reductions/ram_to_r1cs/gadgets/trace_lines.hpp b/libsnark/reductions/ram_to_r1cs/gadgets/trace_lines.hpp similarity index 94% rename from src/reductions/ram_to_r1cs/gadgets/trace_lines.hpp rename to libsnark/reductions/ram_to_r1cs/gadgets/trace_lines.hpp index f14eceb6..cfd77b09 100644 --- a/src/reductions/ram_to_r1cs/gadgets/trace_lines.hpp +++ b/libsnark/reductions/ram_to_r1cs/gadgets/trace_lines.hpp @@ -13,7 +13,7 @@ #define TRACE_LINES_HPP_ #include -#include "relations/ram_computations/rams/ram_params.hpp" +#include namespace libsnark { @@ -74,6 +74,6 @@ class execution_line_variable_gadget : public memory_line_variable_gadget } // libsnark -#include "reductions/ram_to_r1cs/gadgets/trace_lines.tcc" +#include #endif // TRACE_LINES_HPP_ diff --git a/src/reductions/ram_to_r1cs/gadgets/trace_lines.tcc b/libsnark/reductions/ram_to_r1cs/gadgets/trace_lines.tcc similarity index 100% rename from src/reductions/ram_to_r1cs/gadgets/trace_lines.tcc rename to libsnark/reductions/ram_to_r1cs/gadgets/trace_lines.tcc diff --git a/src/reductions/ram_to_r1cs/ram_to_r1cs.hpp b/libsnark/reductions/ram_to_r1cs/ram_to_r1cs.hpp similarity index 94% rename from src/reductions/ram_to_r1cs/ram_to_r1cs.hpp rename to libsnark/reductions/ram_to_r1cs/ram_to_r1cs.hpp index df24d5de..17bc0464 100644 --- a/src/reductions/ram_to_r1cs/ram_to_r1cs.hpp +++ b/libsnark/reductions/ram_to_r1cs/ram_to_r1cs.hpp @@ -16,7 +16,7 @@ #ifndef RAM_TO_R1CS_HPP_ #define RAM_TO_R1CS_HPP_ -#include "reductions/ram_to_r1cs/gadgets/ram_universal_gadget.hpp" +#include namespace libsnark { @@ -54,6 +54,6 @@ class ram_to_r1cs { } // libsnark -#include "reductions/ram_to_r1cs/ram_to_r1cs.tcc" +#include #endif // RAM_TO_R1CS_HPP_ diff --git a/src/reductions/ram_to_r1cs/ram_to_r1cs.tcc b/libsnark/reductions/ram_to_r1cs/ram_to_r1cs.tcc similarity index 100% rename from src/reductions/ram_to_r1cs/ram_to_r1cs.tcc rename to libsnark/reductions/ram_to_r1cs/ram_to_r1cs.tcc diff --git a/src/reductions/tbcs_to_uscs/get_tbcs_reduction.py b/libsnark/reductions/tbcs_to_uscs/get_tbcs_reduction.py similarity index 100% rename from src/reductions/tbcs_to_uscs/get_tbcs_reduction.py rename to libsnark/reductions/tbcs_to_uscs/get_tbcs_reduction.py diff --git a/src/reductions/tbcs_to_uscs/tbcs_reduction.txt b/libsnark/reductions/tbcs_to_uscs/tbcs_reduction.txt similarity index 100% rename from src/reductions/tbcs_to_uscs/tbcs_reduction.txt rename to libsnark/reductions/tbcs_to_uscs/tbcs_reduction.txt diff --git a/src/reductions/tbcs_to_uscs/tbcs_to_uscs.hpp b/libsnark/reductions/tbcs_to_uscs/tbcs_to_uscs.hpp similarity index 89% rename from src/reductions/tbcs_to_uscs/tbcs_to_uscs.hpp rename to libsnark/reductions/tbcs_to_uscs/tbcs_to_uscs.hpp index 92fe6424..5564b477 100644 --- a/src/reductions/tbcs_to_uscs/tbcs_to_uscs.hpp +++ b/libsnark/reductions/tbcs_to_uscs/tbcs_to_uscs.hpp @@ -29,8 +29,8 @@ #ifndef TBCS_TO_USCS_HPP_ #define TBCS_TO_USCS_HPP_ -#include "relations/constraint_satisfaction_problems/uscs/uscs.hpp" -#include "relations/circuit_satisfaction_problems/tbcs/tbcs.hpp" +#include +#include namespace libsnark { @@ -50,6 +50,6 @@ uscs_variable_assignment tbcs_to_uscs_witness_map(const tbcs_circuit &ci } // libsnark -#include "reductions/tbcs_to_uscs/tbcs_to_uscs.tcc" +#include #endif // TBCS_TO_USCS_HPP_ diff --git a/src/reductions/tbcs_to_uscs/tbcs_to_uscs.tcc b/libsnark/reductions/tbcs_to_uscs/tbcs_to_uscs.tcc similarity index 100% rename from src/reductions/tbcs_to_uscs/tbcs_to_uscs.tcc rename to libsnark/reductions/tbcs_to_uscs/tbcs_to_uscs.tcc diff --git a/src/reductions/uscs_to_ssp/uscs_to_ssp.hpp b/libsnark/reductions/uscs_to_ssp/uscs_to_ssp.hpp similarity index 92% rename from src/reductions/uscs_to_ssp/uscs_to_ssp.hpp rename to libsnark/reductions/uscs_to_ssp/uscs_to_ssp.hpp index d6352dbf..aae8815b 100644 --- a/src/reductions/uscs_to_ssp/uscs_to_ssp.hpp +++ b/libsnark/reductions/uscs_to_ssp/uscs_to_ssp.hpp @@ -32,8 +32,8 @@ #ifndef USCS_TO_SSP_HPP_ #define USCS_TO_SSP_HPP_ -#include "relations/arithmetic_programs/ssp/ssp.hpp" -#include "relations/constraint_satisfaction_problems/uscs/uscs.hpp" +#include +#include namespace libsnark { @@ -63,6 +63,6 @@ ssp_witness uscs_to_ssp_witness_map(const uscs_constraint_system } // libsnark -#include "reductions/uscs_to_ssp/uscs_to_ssp.tcc" +#include #endif // USCS_TO_SSP_HPP_ diff --git a/src/reductions/uscs_to_ssp/uscs_to_ssp.tcc b/libsnark/reductions/uscs_to_ssp/uscs_to_ssp.tcc similarity index 100% rename from src/reductions/uscs_to_ssp/uscs_to_ssp.tcc rename to libsnark/reductions/uscs_to_ssp/uscs_to_ssp.tcc diff --git a/src/relations/arithmetic_programs/qap/qap.hpp b/libsnark/relations/arithmetic_programs/qap/qap.hpp similarity index 99% rename from src/relations/arithmetic_programs/qap/qap.hpp rename to libsnark/relations/arithmetic_programs/qap/qap.hpp index adcf4355..154d8a99 100644 --- a/src/relations/arithmetic_programs/qap/qap.hpp +++ b/libsnark/relations/arithmetic_programs/qap/qap.hpp @@ -188,6 +188,6 @@ class qap_witness { } // libsnark -#include "relations/arithmetic_programs/qap/qap.tcc" +#include #endif // QAP_HPP_ diff --git a/src/relations/arithmetic_programs/qap/qap.tcc b/libsnark/relations/arithmetic_programs/qap/qap.tcc similarity index 100% rename from src/relations/arithmetic_programs/qap/qap.tcc rename to libsnark/relations/arithmetic_programs/qap/qap.tcc diff --git a/src/relations/arithmetic_programs/qap/tests/test_qap.cpp b/libsnark/relations/arithmetic_programs/qap/tests/test_qap.cpp similarity index 96% rename from src/relations/arithmetic_programs/qap/tests/test_qap.cpp rename to libsnark/relations/arithmetic_programs/qap/tests/test_qap.cpp index 1421c00d..46f2421e 100644 --- a/src/relations/arithmetic_programs/qap/tests/test_qap.cpp +++ b/libsnark/relations/arithmetic_programs/qap/tests/test_qap.cpp @@ -14,8 +14,8 @@ #include #include #include -#include "reductions/r1cs_to_qap/r1cs_to_qap.hpp" -#include "relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp" +#include +#include using namespace libsnark; diff --git a/src/relations/arithmetic_programs/ssp/ssp.hpp b/libsnark/relations/arithmetic_programs/ssp/ssp.hpp similarity index 98% rename from src/relations/arithmetic_programs/ssp/ssp.hpp rename to libsnark/relations/arithmetic_programs/ssp/ssp.hpp index f2fe9758..5e545825 100644 --- a/src/relations/arithmetic_programs/ssp/ssp.hpp +++ b/libsnark/relations/arithmetic_programs/ssp/ssp.hpp @@ -173,6 +173,6 @@ class ssp_witness { } // libsnark -#include "relations/arithmetic_programs/ssp/ssp.tcc" +#include #endif // SSP_HPP_ diff --git a/src/relations/arithmetic_programs/ssp/ssp.tcc b/libsnark/relations/arithmetic_programs/ssp/ssp.tcc similarity index 100% rename from src/relations/arithmetic_programs/ssp/ssp.tcc rename to libsnark/relations/arithmetic_programs/ssp/ssp.tcc diff --git a/src/relations/arithmetic_programs/ssp/tests/test_ssp.cpp b/libsnark/relations/arithmetic_programs/ssp/tests/test_ssp.cpp similarity index 96% rename from src/relations/arithmetic_programs/ssp/tests/test_ssp.cpp rename to libsnark/relations/arithmetic_programs/ssp/tests/test_ssp.cpp index d7a403f2..b2da6dcd 100644 --- a/src/relations/arithmetic_programs/ssp/tests/test_ssp.cpp +++ b/libsnark/relations/arithmetic_programs/ssp/tests/test_ssp.cpp @@ -14,8 +14,8 @@ #include #include #include -#include "reductions/uscs_to_ssp/uscs_to_ssp.hpp" -#include "relations/constraint_satisfaction_problems/uscs/examples/uscs_examples.hpp" +#include +#include using namespace libsnark; diff --git a/src/relations/circuit_satisfaction_problems/bacs/bacs.hpp b/libsnark/relations/circuit_satisfaction_problems/bacs/bacs.hpp similarity index 97% rename from src/relations/circuit_satisfaction_problems/bacs/bacs.hpp rename to libsnark/relations/circuit_satisfaction_problems/bacs/bacs.hpp index 274c9ecd..fcd432f5 100644 --- a/src/relations/circuit_satisfaction_problems/bacs/bacs.hpp +++ b/libsnark/relations/circuit_satisfaction_problems/bacs/bacs.hpp @@ -21,7 +21,7 @@ #include -#include "relations/variable.hpp" +#include namespace libsnark { @@ -150,6 +150,6 @@ class bacs_circuit { } // libsnark -#include "relations/circuit_satisfaction_problems/bacs/bacs.tcc" +#include #endif // BACS_HPP_ diff --git a/src/relations/circuit_satisfaction_problems/bacs/bacs.tcc b/libsnark/relations/circuit_satisfaction_problems/bacs/bacs.tcc similarity index 100% rename from src/relations/circuit_satisfaction_problems/bacs/bacs.tcc rename to libsnark/relations/circuit_satisfaction_problems/bacs/bacs.tcc diff --git a/src/relations/circuit_satisfaction_problems/bacs/examples/bacs_examples.hpp b/libsnark/relations/circuit_satisfaction_problems/bacs/examples/bacs_examples.hpp similarity index 94% rename from src/relations/circuit_satisfaction_problems/bacs/examples/bacs_examples.hpp rename to libsnark/relations/circuit_satisfaction_problems/bacs/examples/bacs_examples.hpp index 565cf4bc..3dbd51b8 100644 --- a/src/relations/circuit_satisfaction_problems/bacs/examples/bacs_examples.hpp +++ b/libsnark/relations/circuit_satisfaction_problems/bacs/examples/bacs_examples.hpp @@ -13,7 +13,7 @@ #ifndef BACS_EXAMPLES_HPP_ #define BACS_EXAMPLES_HPP_ -#include "relations/circuit_satisfaction_problems/bacs/bacs.hpp" +#include namespace libsnark { @@ -66,6 +66,6 @@ bacs_example generate_bacs_example(const size_t primary_input_size, } // libsnark -#include "relations/circuit_satisfaction_problems/bacs/examples/bacs_examples.tcc" +#include #endif // BACS_EXAMPLES_HPP_ diff --git a/src/relations/circuit_satisfaction_problems/bacs/examples/bacs_examples.tcc b/libsnark/relations/circuit_satisfaction_problems/bacs/examples/bacs_examples.tcc similarity index 100% rename from src/relations/circuit_satisfaction_problems/bacs/examples/bacs_examples.tcc rename to libsnark/relations/circuit_satisfaction_problems/bacs/examples/bacs_examples.tcc diff --git a/src/relations/circuit_satisfaction_problems/tbcs/examples/tbcs_examples.cpp b/libsnark/relations/circuit_satisfaction_problems/tbcs/examples/tbcs_examples.cpp similarity index 96% rename from src/relations/circuit_satisfaction_problems/tbcs/examples/tbcs_examples.cpp rename to libsnark/relations/circuit_satisfaction_problems/tbcs/examples/tbcs_examples.cpp index 1b5ab1dc..bbfb953c 100644 --- a/src/relations/circuit_satisfaction_problems/tbcs/examples/tbcs_examples.cpp +++ b/libsnark/relations/circuit_satisfaction_problems/tbcs/examples/tbcs_examples.cpp @@ -12,7 +12,7 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include "relations/circuit_satisfaction_problems/tbcs/examples/tbcs_examples.hpp" +#include #include diff --git a/src/relations/circuit_satisfaction_problems/tbcs/examples/tbcs_examples.hpp b/libsnark/relations/circuit_satisfaction_problems/tbcs/examples/tbcs_examples.hpp similarity index 97% rename from src/relations/circuit_satisfaction_problems/tbcs/examples/tbcs_examples.hpp rename to libsnark/relations/circuit_satisfaction_problems/tbcs/examples/tbcs_examples.hpp index f236f749..e948dad0 100644 --- a/src/relations/circuit_satisfaction_problems/tbcs/examples/tbcs_examples.hpp +++ b/libsnark/relations/circuit_satisfaction_problems/tbcs/examples/tbcs_examples.hpp @@ -13,7 +13,7 @@ #ifndef TBCS_EXAMPLES_HPP_ #define TBCS_EXAMPLES_HPP_ -#include "relations/circuit_satisfaction_problems/tbcs/tbcs.hpp" +#include namespace libsnark { diff --git a/src/relations/circuit_satisfaction_problems/tbcs/tbcs.cpp b/libsnark/relations/circuit_satisfaction_problems/tbcs/tbcs.cpp similarity index 99% rename from src/relations/circuit_satisfaction_problems/tbcs/tbcs.cpp rename to libsnark/relations/circuit_satisfaction_problems/tbcs/tbcs.cpp index a6945fd3..a87594b3 100644 --- a/src/relations/circuit_satisfaction_problems/tbcs/tbcs.cpp +++ b/libsnark/relations/circuit_satisfaction_problems/tbcs/tbcs.cpp @@ -14,7 +14,7 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include "relations/circuit_satisfaction_problems/tbcs/tbcs.hpp" +#include #include #include diff --git a/src/relations/circuit_satisfaction_problems/tbcs/tbcs.hpp b/libsnark/relations/circuit_satisfaction_problems/tbcs/tbcs.hpp similarity index 99% rename from src/relations/circuit_satisfaction_problems/tbcs/tbcs.hpp rename to libsnark/relations/circuit_satisfaction_problems/tbcs/tbcs.hpp index dc7d2aed..1da3e5ce 100644 --- a/src/relations/circuit_satisfaction_problems/tbcs/tbcs.hpp +++ b/libsnark/relations/circuit_satisfaction_problems/tbcs/tbcs.hpp @@ -18,7 +18,7 @@ #define TBCS_HPP_ #include -#include "relations/variable.hpp" +#include namespace libsnark { diff --git a/src/relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp b/libsnark/relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp similarity index 94% rename from src/relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp rename to libsnark/relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp index 47003e95..8131f052 100644 --- a/src/relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp +++ b/libsnark/relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp @@ -13,7 +13,7 @@ #ifndef R1CS_EXAMPLES_HPP_ #define R1CS_EXAMPLES_HPP_ -#include "relations/constraint_satisfaction_problems/r1cs/r1cs.hpp" +#include namespace libsnark { @@ -68,6 +68,6 @@ r1cs_example generate_r1cs_example_with_binary_input(const size_t num_co } // libsnark -#include "relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.tcc" +#include #endif // R1CS_EXAMPLES_HPP_ diff --git a/src/relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.tcc b/libsnark/relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.tcc similarity index 100% rename from src/relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.tcc rename to libsnark/relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.tcc diff --git a/src/relations/constraint_satisfaction_problems/r1cs/r1cs.hpp b/libsnark/relations/constraint_satisfaction_problems/r1cs/r1cs.hpp similarity index 97% rename from src/relations/constraint_satisfaction_problems/r1cs/r1cs.hpp rename to libsnark/relations/constraint_satisfaction_problems/r1cs/r1cs.hpp index ca3acb3a..2d247161 100644 --- a/src/relations/constraint_satisfaction_problems/r1cs/r1cs.hpp +++ b/libsnark/relations/constraint_satisfaction_problems/r1cs/r1cs.hpp @@ -23,7 +23,7 @@ #include #include -#include "relations/variable.hpp" +#include namespace libsnark { @@ -148,6 +148,6 @@ class r1cs_constraint_system { } // libsnark -#include "relations/constraint_satisfaction_problems/r1cs/r1cs.tcc" +#include #endif // R1CS_HPP_ diff --git a/src/relations/constraint_satisfaction_problems/r1cs/r1cs.tcc b/libsnark/relations/constraint_satisfaction_problems/r1cs/r1cs.tcc similarity index 100% rename from src/relations/constraint_satisfaction_problems/r1cs/r1cs.tcc rename to libsnark/relations/constraint_satisfaction_problems/r1cs/r1cs.tcc diff --git a/src/relations/constraint_satisfaction_problems/uscs/examples/uscs_examples.hpp b/libsnark/relations/constraint_satisfaction_problems/uscs/examples/uscs_examples.hpp similarity index 94% rename from src/relations/constraint_satisfaction_problems/uscs/examples/uscs_examples.hpp rename to libsnark/relations/constraint_satisfaction_problems/uscs/examples/uscs_examples.hpp index 9edebef2..c8788840 100644 --- a/src/relations/constraint_satisfaction_problems/uscs/examples/uscs_examples.hpp +++ b/libsnark/relations/constraint_satisfaction_problems/uscs/examples/uscs_examples.hpp @@ -12,7 +12,7 @@ #ifndef USCS_EXAMPLES_HPP_ #define USCS_EXAMPLES_HPP_ -#include "relations/constraint_satisfaction_problems/uscs/uscs.hpp" +#include namespace libsnark { @@ -67,6 +67,6 @@ uscs_example generate_uscs_example_with_binary_input(const size_t num_co } // libsnark -#include "relations/constraint_satisfaction_problems/uscs/examples/uscs_examples.tcc" +#include #endif // USCS_EXAMPLES_HPP_ diff --git a/src/relations/constraint_satisfaction_problems/uscs/examples/uscs_examples.tcc b/libsnark/relations/constraint_satisfaction_problems/uscs/examples/uscs_examples.tcc similarity index 100% rename from src/relations/constraint_satisfaction_problems/uscs/examples/uscs_examples.tcc rename to libsnark/relations/constraint_satisfaction_problems/uscs/examples/uscs_examples.tcc diff --git a/src/relations/constraint_satisfaction_problems/uscs/uscs.hpp b/libsnark/relations/constraint_satisfaction_problems/uscs/uscs.hpp similarity index 96% rename from src/relations/constraint_satisfaction_problems/uscs/uscs.hpp rename to libsnark/relations/constraint_satisfaction_problems/uscs/uscs.hpp index 9a189e0e..ddfd341b 100644 --- a/src/relations/constraint_satisfaction_problems/uscs/uscs.hpp +++ b/libsnark/relations/constraint_satisfaction_problems/uscs/uscs.hpp @@ -23,7 +23,7 @@ #include #include -#include "relations/variable.hpp" +#include namespace libsnark { @@ -119,6 +119,6 @@ class uscs_constraint_system { } // libsnark -#include "relations/constraint_satisfaction_problems/uscs/uscs.tcc" +#include #endif // USCS_HPP_ diff --git a/src/relations/constraint_satisfaction_problems/uscs/uscs.tcc b/libsnark/relations/constraint_satisfaction_problems/uscs/uscs.tcc similarity index 100% rename from src/relations/constraint_satisfaction_problems/uscs/uscs.tcc rename to libsnark/relations/constraint_satisfaction_problems/uscs/uscs.tcc diff --git a/src/relations/ram_computations/memory/delegated_ra_memory.hpp b/libsnark/relations/ram_computations/memory/delegated_ra_memory.hpp similarity index 87% rename from src/relations/ram_computations/memory/delegated_ra_memory.hpp rename to libsnark/relations/ram_computations/memory/delegated_ra_memory.hpp index b01e09bf..dc3eac33 100644 --- a/src/relations/ram_computations/memory/delegated_ra_memory.hpp +++ b/libsnark/relations/ram_computations/memory/delegated_ra_memory.hpp @@ -16,8 +16,8 @@ #include #include -#include "common/data_structures/merkle_tree.hpp" -#include "relations/ram_computations/memory/memory_interface.hpp" +#include +#include namespace libsnark { @@ -45,6 +45,6 @@ class delegated_ra_memory : public memory_interface { } // libsnark -#include "relations/ram_computations/memory/delegated_ra_memory.tcc" +#include #endif // DELEGATED_RA_MEMORY_HPP_ diff --git a/src/relations/ram_computations/memory/delegated_ra_memory.tcc b/libsnark/relations/ram_computations/memory/delegated_ra_memory.tcc similarity index 100% rename from src/relations/ram_computations/memory/delegated_ra_memory.tcc rename to libsnark/relations/ram_computations/memory/delegated_ra_memory.tcc diff --git a/src/relations/ram_computations/memory/examples/memory_contents_examples.cpp b/libsnark/relations/ram_computations/memory/examples/memory_contents_examples.cpp similarity index 95% rename from src/relations/ram_computations/memory/examples/memory_contents_examples.cpp rename to libsnark/relations/ram_computations/memory/examples/memory_contents_examples.cpp index 336958ea..95649861 100644 --- a/src/relations/ram_computations/memory/examples/memory_contents_examples.cpp +++ b/libsnark/relations/ram_computations/memory/examples/memory_contents_examples.cpp @@ -11,7 +11,7 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include "relations/ram_computations/memory/examples/memory_contents_examples.hpp" +#include #include #include diff --git a/src/relations/ram_computations/memory/examples/memory_contents_examples.hpp b/libsnark/relations/ram_computations/memory/examples/memory_contents_examples.hpp similarity index 95% rename from src/relations/ram_computations/memory/examples/memory_contents_examples.hpp rename to libsnark/relations/ram_computations/memory/examples/memory_contents_examples.hpp index 6fbffea0..eae61252 100644 --- a/src/relations/ram_computations/memory/examples/memory_contents_examples.hpp +++ b/libsnark/relations/ram_computations/memory/examples/memory_contents_examples.hpp @@ -12,7 +12,7 @@ #ifndef MEMORY_CONTENTS_EXAMPLES_HPP_ #define MEMORY_CONTENTS_EXAMPLES_HPP_ -#include "relations/ram_computations/memory/memory_interface.hpp" +#include namespace libsnark { diff --git a/src/relations/ram_computations/memory/memory_interface.hpp b/libsnark/relations/ram_computations/memory/memory_interface.hpp similarity index 100% rename from src/relations/ram_computations/memory/memory_interface.hpp rename to libsnark/relations/ram_computations/memory/memory_interface.hpp diff --git a/src/relations/ram_computations/memory/memory_store_trace.cpp b/libsnark/relations/ram_computations/memory/memory_store_trace.cpp similarity index 94% rename from src/relations/ram_computations/memory/memory_store_trace.cpp rename to libsnark/relations/ram_computations/memory/memory_store_trace.cpp index e1159623..2b341042 100644 --- a/src/relations/ram_computations/memory/memory_store_trace.cpp +++ b/libsnark/relations/ram_computations/memory/memory_store_trace.cpp @@ -11,7 +11,7 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include "relations/ram_computations/memory/memory_store_trace.hpp" +#include namespace libsnark { diff --git a/src/relations/ram_computations/memory/memory_store_trace.hpp b/libsnark/relations/ram_computations/memory/memory_store_trace.hpp similarity index 94% rename from src/relations/ram_computations/memory/memory_store_trace.hpp rename to libsnark/relations/ram_computations/memory/memory_store_trace.hpp index dd88f353..95ee586e 100644 --- a/src/relations/ram_computations/memory/memory_store_trace.hpp +++ b/libsnark/relations/ram_computations/memory/memory_store_trace.hpp @@ -12,7 +12,7 @@ #ifndef MEMORY_STORE_TRACE_HPP_ #define MEMORY_STORE_TRACE_HPP_ -#include "relations/ram_computations/memory/memory_interface.hpp" +#include namespace libsnark { diff --git a/src/relations/ram_computations/memory/ra_memory.cpp b/libsnark/relations/ram_computations/memory/ra_memory.cpp similarity index 95% rename from src/relations/ram_computations/memory/ra_memory.cpp rename to libsnark/relations/ram_computations/memory/ra_memory.cpp index d16ddcde..c7894aa9 100644 --- a/src/relations/ram_computations/memory/ra_memory.cpp +++ b/libsnark/relations/ram_computations/memory/ra_memory.cpp @@ -13,7 +13,7 @@ #include -#include "relations/ram_computations/memory/ra_memory.hpp" +#include namespace libsnark { diff --git a/src/relations/ram_computations/memory/ra_memory.hpp b/libsnark/relations/ram_computations/memory/ra_memory.hpp similarity index 93% rename from src/relations/ram_computations/memory/ra_memory.hpp rename to libsnark/relations/ram_computations/memory/ra_memory.hpp index 21abd6ed..1b6229ea 100644 --- a/src/relations/ram_computations/memory/ra_memory.hpp +++ b/libsnark/relations/ram_computations/memory/ra_memory.hpp @@ -12,7 +12,7 @@ #ifndef RA_MEMORY_HPP_ #define RA_MEMORY_HPP_ -#include "relations/ram_computations/memory/memory_interface.hpp" +#include namespace libsnark { diff --git a/src/relations/ram_computations/rams/examples/ram_examples.hpp b/libsnark/relations/ram_computations/rams/examples/ram_examples.hpp similarity index 90% rename from src/relations/ram_computations/rams/examples/ram_examples.hpp rename to libsnark/relations/ram_computations/rams/examples/ram_examples.hpp index 93c9bf62..726c3f93 100644 --- a/src/relations/ram_computations/rams/examples/ram_examples.hpp +++ b/libsnark/relations/ram_computations/rams/examples/ram_examples.hpp @@ -13,7 +13,7 @@ #ifndef RAM_EXAMPLES_HPP_ #define RAM_EXAMPLES_HPP_ -#include "relations/ram_computations/rams/ram_params.hpp" +#include namespace libsnark { @@ -40,6 +40,6 @@ ram_example gen_ram_example_complex(const ram_architecture_params &a } // libsnark -#include "relations/ram_computations/rams/examples/ram_examples.tcc" +#include #endif // RAM_EXAMPLES_HPP_ diff --git a/src/relations/ram_computations/rams/examples/ram_examples.tcc b/libsnark/relations/ram_computations/rams/examples/ram_examples.tcc similarity index 98% rename from src/relations/ram_computations/rams/examples/ram_examples.tcc rename to libsnark/relations/ram_computations/rams/examples/ram_examples.tcc index 3b5b520d..9fa8ed9f 100644 --- a/src/relations/ram_computations/rams/examples/ram_examples.tcc +++ b/libsnark/relations/ram_computations/rams/examples/ram_examples.tcc @@ -15,7 +15,7 @@ #ifndef RAM_EXAMPLES_TCC_ #define RAM_EXAMPLES_TCC_ -#include "relations/ram_computations/rams/tinyram/tinyram_aux.hpp" +#include namespace libsnark { diff --git a/src/relations/ram_computations/rams/fooram/fooram_aux.cpp b/libsnark/relations/ram_computations/rams/fooram/fooram_aux.cpp similarity index 96% rename from src/relations/ram_computations/rams/fooram/fooram_aux.cpp rename to libsnark/relations/ram_computations/rams/fooram/fooram_aux.cpp index c557ca4b..6007aa57 100644 --- a/src/relations/ram_computations/rams/fooram/fooram_aux.cpp +++ b/libsnark/relations/ram_computations/rams/fooram/fooram_aux.cpp @@ -11,7 +11,7 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include "relations/ram_computations/rams/fooram/fooram_aux.hpp" +#include #include diff --git a/src/relations/ram_computations/rams/fooram/fooram_aux.hpp b/libsnark/relations/ram_computations/rams/fooram/fooram_aux.hpp similarity index 95% rename from src/relations/ram_computations/rams/fooram/fooram_aux.hpp rename to libsnark/relations/ram_computations/rams/fooram/fooram_aux.hpp index dfee38c5..e96ca351 100644 --- a/src/relations/ram_computations/rams/fooram/fooram_aux.hpp +++ b/libsnark/relations/ram_computations/rams/fooram/fooram_aux.hpp @@ -16,7 +16,7 @@ #include #include -#include "relations/ram_computations/memory/memory_interface.hpp" +#include namespace libsnark { diff --git a/src/relations/ram_computations/rams/fooram/fooram_params.hpp b/libsnark/relations/ram_computations/rams/fooram/fooram_params.hpp similarity index 82% rename from src/relations/ram_computations/rams/fooram/fooram_params.hpp rename to libsnark/relations/ram_computations/rams/fooram/fooram_params.hpp index 3a505017..a537f0b6 100644 --- a/src/relations/ram_computations/rams/fooram/fooram_params.hpp +++ b/libsnark/relations/ram_computations/rams/fooram/fooram_params.hpp @@ -12,9 +12,9 @@ #ifndef FOORAM_PARAMS_HPP_ #define FOORAM_PARAMS_HPP_ -#include "gadgetlib1/gadgets/cpu_checkers/fooram/fooram_cpu_checker.hpp" -#include "relations/ram_computations/rams/fooram/fooram_aux.hpp" -#include "relations/ram_computations/rams/ram_params.hpp" +#include +#include +#include namespace libsnark { diff --git a/src/relations/ram_computations/rams/ram_params.hpp b/libsnark/relations/ram_computations/rams/ram_params.hpp similarity index 96% rename from src/relations/ram_computations/rams/ram_params.hpp rename to libsnark/relations/ram_computations/rams/ram_params.hpp index 3c451827..7b137260 100644 --- a/src/relations/ram_computations/rams/ram_params.hpp +++ b/libsnark/relations/ram_computations/rams/ram_params.hpp @@ -14,7 +14,7 @@ #include -#include "relations/ram_computations/memory/memory_store_trace.hpp" +#include namespace libsnark { diff --git a/src/relations/ram_computations/rams/tinyram/tinyram_aux.cpp b/libsnark/relations/ram_computations/rams/tinyram/tinyram_aux.cpp similarity index 99% rename from src/relations/ram_computations/rams/tinyram/tinyram_aux.cpp rename to libsnark/relations/ram_computations/rams/tinyram/tinyram_aux.cpp index 411e7be2..7b21c121 100644 --- a/src/relations/ram_computations/rams/tinyram/tinyram_aux.cpp +++ b/libsnark/relations/ram_computations/rams/tinyram/tinyram_aux.cpp @@ -16,7 +16,7 @@ #include #include -#include "relations/ram_computations/rams/tinyram/tinyram_aux.hpp" +#include #include namespace libsnark { diff --git a/src/relations/ram_computations/rams/tinyram/tinyram_aux.hpp b/libsnark/relations/ram_computations/rams/tinyram/tinyram_aux.hpp similarity index 96% rename from src/relations/ram_computations/rams/tinyram/tinyram_aux.hpp rename to libsnark/relations/ram_computations/rams/tinyram/tinyram_aux.hpp index fd0ec7d5..c6cc4557 100644 --- a/src/relations/ram_computations/rams/tinyram/tinyram_aux.hpp +++ b/libsnark/relations/ram_computations/rams/tinyram/tinyram_aux.hpp @@ -17,9 +17,9 @@ #include #include -#include "relations/constraint_satisfaction_problems/r1cs/r1cs.hpp" -#include "relations/ram_computations/memory/memory_interface.hpp" -#include "relations/ram_computations/rams/ram_params.hpp" +#include +#include +#include namespace libsnark { diff --git a/src/relations/ram_computations/rams/tinyram/tinyram_params.hpp b/libsnark/relations/ram_computations/rams/tinyram/tinyram_params.hpp similarity index 81% rename from src/relations/ram_computations/rams/tinyram/tinyram_params.hpp rename to libsnark/relations/ram_computations/rams/tinyram/tinyram_params.hpp index 35147b4f..3040f008 100644 --- a/src/relations/ram_computations/rams/tinyram/tinyram_params.hpp +++ b/libsnark/relations/ram_computations/rams/tinyram/tinyram_params.hpp @@ -12,9 +12,9 @@ #ifndef TINYRAM_PARAMS_HPP_ #define TINYRAM_PARAMS_HPP_ -#include "relations/ram_computations/rams/ram_params.hpp" -#include "relations/ram_computations/rams/tinyram/tinyram_aux.hpp" -#include "gadgetlib1/gadgets/cpu_checkers/tinyram/tinyram_cpu_checker.hpp" +#include +#include +#include namespace libsnark { diff --git a/src/relations/variable.hpp b/libsnark/relations/variable.hpp similarity index 99% rename from src/relations/variable.hpp rename to libsnark/relations/variable.hpp index df82ac4d..5f63263e 100644 --- a/src/relations/variable.hpp +++ b/libsnark/relations/variable.hpp @@ -208,6 +208,6 @@ linear_combination operator-(const FieldT &field_coeff, const linear_com } // libsnark -#include "relations/variable.tcc" +#include #endif // VARIABLE_HPP_ diff --git a/src/relations/variable.tcc b/libsnark/relations/variable.tcc similarity index 100% rename from src/relations/variable.tcc rename to libsnark/relations/variable.tcc diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/compliance_predicate.hpp b/libsnark/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/compliance_predicate.hpp similarity index 97% rename from src/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/compliance_predicate.hpp rename to libsnark/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/compliance_predicate.hpp index 4488d482..ea2c8f4b 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/compliance_predicate.hpp +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/compliance_predicate.hpp @@ -17,7 +17,7 @@ #ifndef COMPLIANCE_PREDICATE_HPP_ #define COMPLIANCE_PREDICATE_HPP_ -#include "relations/constraint_satisfaction_problems/r1cs/r1cs.hpp" +#include namespace libsnark { @@ -155,6 +155,6 @@ class r1cs_pcd_compliance_predicate { } // libsnark -#include "zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/compliance_predicate.tcc" +#include #endif // COMPLIANCE_PREDICATE_HPP_ diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/compliance_predicate.tcc b/libsnark/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/compliance_predicate.tcc similarity index 99% rename from src/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/compliance_predicate.tcc rename to libsnark/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/compliance_predicate.tcc index 75d08441..365ba29e 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/compliance_predicate.tcc +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/compliance_predicate.tcc @@ -15,7 +15,7 @@ #define COMPLIANCE_PREDICATE_TCC_ #include -#include "zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd_params.hpp" +#include namespace libsnark { diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/cp_handler.hpp b/libsnark/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/cp_handler.hpp similarity index 94% rename from src/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/cp_handler.hpp rename to libsnark/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/cp_handler.hpp index 5b841c00..083e6f54 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/cp_handler.hpp +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/cp_handler.hpp @@ -15,8 +15,8 @@ #ifndef CP_HANDLER_HPP_ #define CP_HANDLER_HPP_ -#include "zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/compliance_predicate.hpp" -#include "gadgetlib1/protoboard.hpp" +#include +#include namespace libsnark { @@ -109,6 +109,6 @@ class compliance_predicate_handler { } // libsnark -#include "zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/cp_handler.tcc" +#include #endif // CP_HANDLER_HPP_ diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/cp_handler.tcc b/libsnark/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/cp_handler.tcc similarity index 100% rename from src/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/cp_handler.tcc rename to libsnark/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/cp_handler.tcc diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/examples/tally_cp.hpp b/libsnark/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/examples/tally_cp.hpp similarity index 86% rename from src/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/examples/tally_cp.hpp rename to libsnark/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/examples/tally_cp.hpp index 2a6f2377..5120176c 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/examples/tally_cp.hpp +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/examples/tally_cp.hpp @@ -8,8 +8,8 @@ (2) it enables us to test r1cs_pcd functionalities. See - - src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/examples/run_r1cs_sp_ppzkpcd.hpp - - src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/examples/run_r1cs_mp_ppzkpcd.hpp + - libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/examples/run_r1cs_sp_ppzkpcd.hpp + - libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/examples/run_r1cs_mp_ppzkpcd.hpp for code that uses the tally compliance predicate. ***************************************************************************** @@ -21,9 +21,9 @@ #ifndef TALLY_CP_HPP_ #define TALLY_CP_HPP_ -#include "gadgetlib1/gadgets/basic_gadgets.hpp" -#include "zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/compliance_predicate.hpp" -#include "zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/cp_handler.hpp" +#include +#include +#include namespace libsnark { @@ -105,6 +105,6 @@ class tally_cp_handler : public compliance_predicate_handler #endif // TALLY_CP_HPP_ diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/examples/tally_cp.tcc b/libsnark/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/examples/tally_cp.tcc similarity index 100% rename from src/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/examples/tally_cp.tcc rename to libsnark/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/examples/tally_cp.tcc diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/ppzkpcd_compliance_predicate.hpp b/libsnark/zk_proof_systems/pcd/r1cs_pcd/ppzkpcd_compliance_predicate.hpp similarity index 92% rename from src/zk_proof_systems/pcd/r1cs_pcd/ppzkpcd_compliance_predicate.hpp rename to libsnark/zk_proof_systems/pcd/r1cs_pcd/ppzkpcd_compliance_predicate.hpp index 354601f9..1a280350 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/ppzkpcd_compliance_predicate.hpp +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/ppzkpcd_compliance_predicate.hpp @@ -13,7 +13,7 @@ #define PPZKPCD_COMPLIANCE_PREDICATE_HPP_ #include -#include "zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/compliance_predicate.hpp" +#include namespace libsnark { diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/examples/run_r1cs_mp_ppzkpcd.hpp b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/examples/run_r1cs_mp_ppzkpcd.hpp similarity index 93% rename from src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/examples/run_r1cs_mp_ppzkpcd.hpp rename to libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/examples/run_r1cs_mp_ppzkpcd.hpp index 961bdd71..841b99ad 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/examples/run_r1cs_mp_ppzkpcd.hpp +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/examples/run_r1cs_mp_ppzkpcd.hpp @@ -34,6 +34,6 @@ bool run_r1cs_mp_ppzkpcd_tally_example(const size_t wordsize, } // libsnark -#include "zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/examples/run_r1cs_mp_ppzkpcd.tcc" +#include #endif // RUN_R1CS_MP_PPZKPCD_HPP_ diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/examples/run_r1cs_mp_ppzkpcd.tcc b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/examples/run_r1cs_mp_ppzkpcd.tcc similarity index 97% rename from src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/examples/run_r1cs_mp_ppzkpcd.tcc rename to libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/examples/run_r1cs_mp_ppzkpcd.tcc index 62671915..e5fc00c8 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/examples/run_r1cs_mp_ppzkpcd.tcc +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/examples/run_r1cs_mp_ppzkpcd.tcc @@ -15,9 +15,9 @@ #ifndef RUN_R1CS_MP_PPZKPCD_TCC_ #define RUN_R1CS_MP_PPZKPCD_TCC_ -#include "zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd.hpp" +#include -#include "zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/examples/tally_cp.hpp" +#include namespace libsnark { diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/mp_pcd_circuits.hpp b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/mp_pcd_circuits.hpp similarity index 93% rename from src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/mp_pcd_circuits.hpp rename to libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/mp_pcd_circuits.hpp index 9a5f2d47..0e2491c4 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/mp_pcd_circuits.hpp +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/mp_pcd_circuits.hpp @@ -25,12 +25,12 @@ #ifndef MP_PCD_CIRCUITS_HPP_ #define MP_PCD_CIRCUITS_HPP_ -#include "gadgetlib1/gadget.hpp" -#include "gadgetlib1/gadgets/gadget_from_r1cs.hpp" -#include "gadgetlib1/gadgets/hashes/crh_gadget.hpp" -#include "gadgetlib1/gadgets/set_commitment/set_commitment_gadget.hpp" -#include "gadgetlib1/gadgets/verifiers/r1cs_ppzksnark_verifier_gadget.hpp" -#include "zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/cp_handler.hpp" +#include +#include +#include +#include +#include +#include namespace libsnark { @@ -178,6 +178,6 @@ r1cs_primary_input > get_mp_translation_step_pcd_circuit_input(co } // libsnark -#include "zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/mp_pcd_circuits.tcc" +#include #endif // MP_PCD_CIRCUITS_HPP_ diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/mp_pcd_circuits.tcc b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/mp_pcd_circuits.tcc similarity index 99% rename from src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/mp_pcd_circuits.tcc rename to libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/mp_pcd_circuits.tcc index 7f6f029a..738de670 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/mp_pcd_circuits.tcc +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/mp_pcd_circuits.tcc @@ -17,7 +17,7 @@ #include #include -#include "gadgetlib1/constraint_profiling.hpp" +#include namespace libsnark { diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/profiling/profile_r1cs_mp_ppzkpcd.cpp b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/profiling/profile_r1cs_mp_ppzkpcd.cpp similarity index 80% rename from src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/profiling/profile_r1cs_mp_ppzkpcd.cpp rename to libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/profiling/profile_r1cs_mp_ppzkpcd.cpp index 3779e4f8..a14fb33b 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/profiling/profile_r1cs_mp_ppzkpcd.cpp +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/profiling/profile_r1cs_mp_ppzkpcd.cpp @@ -4,9 +4,9 @@ * and contributors (see AUTHORS). * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include "common/default_types/r1cs_ppzkpcd_pp.hpp" -#include "zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd.hpp" -#include "zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/examples/run_r1cs_mp_ppzkpcd.hpp" +#include +#include +#include using namespace libsnark; diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd.hpp b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd.hpp similarity index 97% rename from src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd.hpp rename to libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd.hpp index 0dc0fc96..14be53c1 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd.hpp +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd.hpp @@ -41,10 +41,10 @@ #include #include -#include "common/data_structures/set_commitment.hpp" -#include "zk_proof_systems/pcd/r1cs_pcd/ppzkpcd_compliance_predicate.hpp" -#include "zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd_params.hpp" -#include "zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp" +#include +#include +#include +#include namespace libsnark { @@ -323,6 +323,6 @@ bool r1cs_mp_ppzkpcd_online_verifier(const r1cs_mp_ppzkpcd_processed_verificatio } // libsnark -#include "zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd.tcc" +#include #endif // R1CS_MP_PPZKPCD_HPP_ diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd.tcc b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd.tcc similarity index 99% rename from src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd.tcc rename to libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd.tcc index df4ec3d4..f84843e9 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd.tcc +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd.tcc @@ -20,8 +20,8 @@ #include #include -#include "common/libsnark_serialization.hpp" -#include "zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/mp_pcd_circuits.hpp" +#include +#include namespace libsnark { diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd_params.hpp b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd_params.hpp similarity index 89% rename from src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd_params.hpp rename to libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd_params.hpp index bdefd7c4..79a6eb55 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd_params.hpp +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd_params.hpp @@ -13,8 +13,8 @@ #define R1CS_MP_PPZKPCD_PARAMS_HPP_ #include -#include "zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/compliance_predicate.hpp" -#include "zk_proof_systems/pcd/r1cs_pcd/r1cs_pcd_params.hpp" +#include +#include namespace libsnark { diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/tests/test_r1cs_mp_ppzkpcd.cpp b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/tests/test_r1cs_mp_ppzkpcd.cpp similarity index 88% rename from src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/tests/test_r1cs_mp_ppzkpcd.cpp rename to libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/tests/test_r1cs_mp_ppzkpcd.cpp index 6ca0cac9..14eb6ff9 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/tests/test_r1cs_mp_ppzkpcd.cpp +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/tests/test_r1cs_mp_ppzkpcd.cpp @@ -4,8 +4,8 @@ * and contributors (see AUTHORS). * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include "common/default_types/r1cs_ppzkpcd_pp.hpp" -#include "zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/examples/run_r1cs_mp_ppzkpcd.hpp" +#include +#include using namespace libsnark; diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_pcd_params.hpp b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_pcd_params.hpp similarity index 91% rename from src/zk_proof_systems/pcd/r1cs_pcd/r1cs_pcd_params.hpp rename to libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_pcd_params.hpp index 6f634a39..2d969fbc 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_pcd_params.hpp +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_pcd_params.hpp @@ -8,7 +8,7 @@ #define R1CS_PCD_PARAMS_HPP_ #include -#include "zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/compliance_predicate.hpp" +#include namespace libsnark { @@ -38,6 +38,6 @@ class r1cs_pcd_compliance_predicate_auxiliary_input { } // libsnark -#include "zk_proof_systems/pcd/r1cs_pcd/r1cs_pcd_params.tcc" +#include #endif // R1CS_PCD_PARAMS_HPP_ diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_pcd_params.tcc b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_pcd_params.tcc similarity index 100% rename from src/zk_proof_systems/pcd/r1cs_pcd/r1cs_pcd_params.tcc rename to libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_pcd_params.tcc diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/examples/run_r1cs_sp_ppzkpcd.hpp b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/examples/run_r1cs_sp_ppzkpcd.hpp similarity index 92% rename from src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/examples/run_r1cs_sp_ppzkpcd.hpp rename to libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/examples/run_r1cs_sp_ppzkpcd.hpp index 1ccd3dd1..2386a8e0 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/examples/run_r1cs_sp_ppzkpcd.hpp +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/examples/run_r1cs_sp_ppzkpcd.hpp @@ -30,6 +30,6 @@ bool run_r1cs_sp_ppzkpcd_tally_example(const size_t wordsize, } // libsnark -#include "zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/examples/run_r1cs_sp_ppzkpcd.tcc" +#include #endif // RUN_R1CS_SP_PPZKPCD_HPP_ diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/examples/run_r1cs_sp_ppzkpcd.tcc b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/examples/run_r1cs_sp_ppzkpcd.tcc similarity index 97% rename from src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/examples/run_r1cs_sp_ppzkpcd.tcc rename to libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/examples/run_r1cs_sp_ppzkpcd.tcc index 88314544..f22eeb00 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/examples/run_r1cs_sp_ppzkpcd.tcc +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/examples/run_r1cs_sp_ppzkpcd.tcc @@ -15,9 +15,9 @@ #ifndef RUN_R1CS_SP_PPZKPCD_TCC_ #define RUN_R1CS_SP_PPZKPCD_TCC_ -#include "zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd.hpp" +#include -#include "zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/examples/tally_cp.hpp" +#include namespace libsnark { diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/profiling/profile_r1cs_sp_ppzkpcd.cpp b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/profiling/profile_r1cs_sp_ppzkpcd.cpp similarity index 78% rename from src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/profiling/profile_r1cs_sp_ppzkpcd.cpp rename to libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/profiling/profile_r1cs_sp_ppzkpcd.cpp index becfd1ab..f6b36e6d 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/profiling/profile_r1cs_sp_ppzkpcd.cpp +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/profiling/profile_r1cs_sp_ppzkpcd.cpp @@ -4,9 +4,9 @@ * and contributors (see AUTHORS). * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include "common/default_types/r1cs_ppzkpcd_pp.hpp" -#include "zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd.hpp" -#include "zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/examples/run_r1cs_sp_ppzkpcd.hpp" +#include +#include +#include using namespace libsnark; diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd.hpp b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd.hpp similarity index 98% rename from src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd.hpp rename to libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd.hpp index 821586f1..e5efdec7 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd.hpp +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd.hpp @@ -42,8 +42,8 @@ #include -#include "zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp" -#include "zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd_params.hpp" +#include +#include namespace libsnark { @@ -303,6 +303,6 @@ bool r1cs_sp_ppzkpcd_online_verifier(const r1cs_sp_ppzkpcd_processed_verificatio } // libsnark -#include "zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd.tcc" +#include #endif // R1CS_SP_PPZKPCD_HPP_ diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd.tcc b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd.tcc similarity index 99% rename from src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd.tcc rename to libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd.tcc index bf500b62..c2cbac1b 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd.tcc +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd.tcc @@ -20,7 +20,7 @@ #include #include -#include "zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/sp_pcd_circuits.hpp" +#include namespace libsnark { diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd_params.hpp b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd_params.hpp similarity index 89% rename from src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd_params.hpp rename to libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd_params.hpp index 1f3ae212..2f0cddf2 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd_params.hpp +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd_params.hpp @@ -13,8 +13,8 @@ #define R1CS_SP_PPZKPCD_PARAMS_HPP_ #include -#include "zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/compliance_predicate.hpp" -#include "zk_proof_systems/pcd/r1cs_pcd/r1cs_pcd_params.hpp" +#include +#include namespace libsnark { diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/sp_pcd_circuits.hpp b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/sp_pcd_circuits.hpp similarity index 93% rename from src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/sp_pcd_circuits.hpp rename to libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/sp_pcd_circuits.hpp index 881bfd59..b9473f62 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/sp_pcd_circuits.hpp +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/sp_pcd_circuits.hpp @@ -26,12 +26,12 @@ #ifndef SP_PCD_CIRCUITS_HPP_ #define SP_PCD_CIRCUITS_HPP_ -#include "gadgetlib1/protoboard.hpp" -#include "gadgetlib1/gadgets/gadget_from_r1cs.hpp" -#include "gadgetlib1/gadgets/hashes/crh_gadget.hpp" -#include "gadgetlib1/gadgets/pairing/pairing_params.hpp" -#include "gadgetlib1/gadgets/verifiers/r1cs_ppzksnark_verifier_gadget.hpp" -#include "zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/cp_handler.hpp" +#include +#include +#include +#include +#include +#include namespace libsnark { @@ -169,6 +169,6 @@ r1cs_primary_input > get_sp_translation_step_pcd_circuit_input(co } // libsnark -#include "zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/sp_pcd_circuits.tcc" +#include #endif // SP_PCD_CIRCUITS_HPP_ diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/sp_pcd_circuits.tcc b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/sp_pcd_circuits.tcc similarity index 99% rename from src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/sp_pcd_circuits.tcc rename to libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/sp_pcd_circuits.tcc index 471423f5..5f33f09c 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/sp_pcd_circuits.tcc +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/sp_pcd_circuits.tcc @@ -16,7 +16,7 @@ #define SP_PCD_CIRCUITS_TCC_ #include -#include "gadgetlib1/constraint_profiling.hpp" +#include namespace libsnark { diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/tests/test_r1cs_sp_ppzkpcd.cpp b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/tests/test_r1cs_sp_ppzkpcd.cpp similarity index 84% rename from src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/tests/test_r1cs_sp_ppzkpcd.cpp rename to libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/tests/test_r1cs_sp_ppzkpcd.cpp index 6676df3b..5995df44 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/tests/test_r1cs_sp_ppzkpcd.cpp +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/tests/test_r1cs_sp_ppzkpcd.cpp @@ -4,8 +4,8 @@ * and contributors (see AUTHORS). * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include "common/default_types/r1cs_ppzkpcd_pp.hpp" -#include "zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/examples/run_r1cs_sp_ppzkpcd.hpp" +#include +#include using namespace libsnark; diff --git a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/demo_r1cs_ppzkadsnark.cpp b/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/demo_r1cs_ppzkadsnark.cpp similarity index 91% rename from src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/demo_r1cs_ppzkadsnark.cpp rename to libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/demo_r1cs_ppzkadsnark.cpp index 41a4562d..de74daa5 100644 --- a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/demo_r1cs_ppzkadsnark.cpp +++ b/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/demo_r1cs_ppzkadsnark.cpp @@ -10,9 +10,9 @@ #include #include -#include "common/default_types/r1cs_ppzkadsnark_pp.hpp" +#include #include -#include "zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/run_r1cs_ppzkadsnark.hpp" +#include using namespace libsnark; diff --git a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/prf/aes_ctr_prf.hpp b/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/prf/aes_ctr_prf.hpp similarity index 87% rename from src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/prf/aes_ctr_prf.hpp rename to libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/prf/aes_ctr_prf.hpp index 28a655d2..f3ab0377 100644 --- a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/prf/aes_ctr_prf.hpp +++ b/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/prf/aes_ctr_prf.hpp @@ -12,7 +12,7 @@ #ifndef AESCTRPRF_HPP_ #define AESCTRPRF_HPP_ -#include "zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark_prf.hpp" +#include namespace libsnark { diff --git a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/prf/aes_ctr_prf.tcc b/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/prf/aes_ctr_prf.tcc similarity index 97% rename from src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/prf/aes_ctr_prf.tcc rename to libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/prf/aes_ctr_prf.tcc index f14eebb2..6ef3f3c0 100644 --- a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/prf/aes_ctr_prf.tcc +++ b/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/prf/aes_ctr_prf.tcc @@ -10,7 +10,7 @@ *****************************************************************************/ #include "gmp.h" -#include "common/default_types/r1cs_ppzkadsnark_pp.hpp" +#include #include "third_party/libsnark-supercop/include/crypto_core_aes128encrypt.h" #include "third_party/libsnark-supercop/include/randombytes.h" diff --git a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/run_r1cs_ppzkadsnark.hpp b/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/run_r1cs_ppzkadsnark.hpp similarity index 84% rename from src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/run_r1cs_ppzkadsnark.hpp rename to libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/run_r1cs_ppzkadsnark.hpp index f09f8409..e5d88294 100644 --- a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/run_r1cs_ppzkadsnark.hpp +++ b/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/run_r1cs_ppzkadsnark.hpp @@ -13,7 +13,7 @@ #ifndef RUN_R1CS_PPZKADSNARK_HPP_ #define RUN_R1CS_PPZKADSNARK_HPP_ -#include "relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp" +#include namespace libsnark { @@ -30,6 +30,6 @@ bool run_r1cs_ppzkadsnark(const r1cs_example> > &example } // libsnark -#include "zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/run_r1cs_ppzkadsnark.tcc" +#include #endif // RUN_R1CS_PPZKADSNARK_HPP_ diff --git a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/run_r1cs_ppzkadsnark.tcc b/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/run_r1cs_ppzkadsnark.tcc similarity index 94% rename from src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/run_r1cs_ppzkadsnark.tcc rename to libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/run_r1cs_ppzkadsnark.tcc index 12927a12..c902b3b9 100644 --- a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/run_r1cs_ppzkadsnark.tcc +++ b/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/run_r1cs_ppzkadsnark.tcc @@ -15,9 +15,9 @@ #ifndef RUN_R1CS_PPZKADSNARK_TCC_ #define RUN_R1CS_PPZKADSNARK_TCC_ -#include "zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark.hpp" -#include "zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/prf/aes_ctr_prf.tcc" -#include "zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/signature/ed25519_signature.tcc" +#include +#include +#include #include #include diff --git a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/signature/ed25519_signature.hpp b/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/signature/ed25519_signature.hpp similarity index 91% rename from src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/signature/ed25519_signature.hpp rename to libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/signature/ed25519_signature.hpp index 560b08c6..6def02ba 100644 --- a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/signature/ed25519_signature.hpp +++ b/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/signature/ed25519_signature.hpp @@ -18,7 +18,7 @@ #ifndef ED25519SIG_HPP_ #define ED25519SIG_HPP_ -#include "zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark_signature.hpp" +#include namespace libsnark { diff --git a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/signature/ed25519_signature.tcc b/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/signature/ed25519_signature.tcc similarity index 98% rename from src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/signature/ed25519_signature.tcc rename to libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/signature/ed25519_signature.tcc index 8064eab3..a06c1fb0 100644 --- a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/signature/ed25519_signature.tcc +++ b/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/signature/ed25519_signature.tcc @@ -15,7 +15,7 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include "common/default_types/r1cs_ppzkadsnark_pp.hpp" +#include #include "third_party/libsnark-supercop/include/crypto_sign.h" namespace libsnark { diff --git a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark.hpp b/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark.hpp similarity index 97% rename from src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark.hpp rename to libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark.hpp index b7f53f25..3b224f80 100644 --- a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark.hpp +++ b/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark.hpp @@ -46,12 +46,12 @@ IEEE Symposium on Security and Privacy 2015, #include #include -#include "common/data_structures/accumulation_vector.hpp" -#include "knowledge_commitment/knowledge_commitment.hpp" -#include "relations/constraint_satisfaction_problems/r1cs/r1cs.hpp" -#include "zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark_params.hpp" -#include "zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark_signature.hpp" -#include "zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark_prf.hpp" +#include +#include +#include +#include +#include +#include namespace libsnark { @@ -669,6 +669,6 @@ bool r1cs_ppzkadsnark_online_verifier(const r1cs_ppzkadsnark_processed_verificat } // libsnark -#include "zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark.tcc" +#include #endif // R1CS_PPZKSNARK_HPP_ diff --git a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark.tcc b/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark.tcc similarity index 99% rename from src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark.tcc rename to libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark.tcc index a3d9aa06..1a2539a9 100644 --- a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark.tcc +++ b/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark.tcc @@ -23,8 +23,8 @@ See r1cs_ppzkadsnark.hpp . #include #include #include -#include "knowledge_commitment/kc_multiexp.hpp" -#include "reductions/r1cs_to_qap/r1cs_to_qap.hpp" +#include +#include namespace libsnark { diff --git a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark_params.hpp b/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark_params.hpp similarity index 95% rename from src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark_params.hpp rename to libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark_params.hpp index 257885b8..c4f365e1 100644 --- a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark_params.hpp +++ b/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark_params.hpp @@ -12,7 +12,7 @@ #ifndef R1CS_PPZKADSNARK_PARAMS_HPP_ #define R1CS_PPZKADSNARK_PARAMS_HPP_ -#include "relations/constraint_satisfaction_problems/r1cs/r1cs.hpp" +#include namespace libsnark { diff --git a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark_prf.hpp b/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark_prf.hpp similarity index 88% rename from src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark_prf.hpp rename to libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark_prf.hpp index 9c83b276..689199f4 100644 --- a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark_prf.hpp +++ b/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark_prf.hpp @@ -12,7 +12,7 @@ #ifndef PRF_HPP_ #define PRF_HPP_ -#include "zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark_params.hpp" +#include namespace libsnark { diff --git a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark_signature.hpp b/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark_signature.hpp similarity index 94% rename from src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark_signature.hpp rename to libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark_signature.hpp index 13345c76..4c6d6412 100644 --- a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark_signature.hpp +++ b/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark_signature.hpp @@ -18,7 +18,7 @@ #ifndef SIGNATURE_HPP_ #define SIGNATURE_HPP_ -#include "zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark_params.hpp" +#include namespace libsnark { diff --git a/src/zk_proof_systems/ppzksnark/bacs_ppzksnark/bacs_ppzksnark.hpp b/libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/bacs_ppzksnark.hpp similarity index 96% rename from src/zk_proof_systems/ppzksnark/bacs_ppzksnark/bacs_ppzksnark.hpp rename to libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/bacs_ppzksnark.hpp index 139c083a..c4f66e52 100644 --- a/src/zk_proof_systems/ppzksnark/bacs_ppzksnark/bacs_ppzksnark.hpp +++ b/libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/bacs_ppzksnark.hpp @@ -34,9 +34,9 @@ #ifndef BACS_PPZKSNARK_HPP_ #define BACS_PPZKSNARK_HPP_ -#include "relations/circuit_satisfaction_problems/bacs/bacs.hpp" -#include "zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp" -#include "zk_proof_systems/ppzksnark/bacs_ppzksnark/bacs_ppzksnark_params.hpp" +#include +#include +#include namespace libsnark { @@ -253,6 +253,6 @@ bool bacs_ppzksnark_online_verifier_strong_IC(const bacs_ppzksnark_processed_ver } // libsnark -#include "zk_proof_systems/ppzksnark/bacs_ppzksnark/bacs_ppzksnark.tcc" +#include #endif // BACS_PPZKSNARK_HPP_ diff --git a/src/zk_proof_systems/ppzksnark/bacs_ppzksnark/bacs_ppzksnark.tcc b/libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/bacs_ppzksnark.tcc similarity index 98% rename from src/zk_proof_systems/ppzksnark/bacs_ppzksnark/bacs_ppzksnark.tcc rename to libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/bacs_ppzksnark.tcc index b1ae5799..b092425f 100644 --- a/src/zk_proof_systems/ppzksnark/bacs_ppzksnark/bacs_ppzksnark.tcc +++ b/libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/bacs_ppzksnark.tcc @@ -14,7 +14,7 @@ #ifndef BACS_PPZKSNARK_TCC_ #define BACS_PPZKSNARK_TCC_ -#include "reductions/bacs_to_r1cs/bacs_to_r1cs.hpp" +#include namespace libsnark { diff --git a/src/zk_proof_systems/ppzksnark/bacs_ppzksnark/bacs_ppzksnark_params.hpp b/libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/bacs_ppzksnark_params.hpp similarity index 92% rename from src/zk_proof_systems/ppzksnark/bacs_ppzksnark/bacs_ppzksnark_params.hpp rename to libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/bacs_ppzksnark_params.hpp index d6e14fc7..f8d7d00f 100644 --- a/src/zk_proof_systems/ppzksnark/bacs_ppzksnark/bacs_ppzksnark_params.hpp +++ b/libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/bacs_ppzksnark_params.hpp @@ -12,7 +12,7 @@ #ifndef BACS_PPZKSNARK_PARAMS_HPP_ #define BACS_PPZKSNARK_PARAMS_HPP_ -#include "relations/circuit_satisfaction_problems/bacs/bacs.hpp" +#include namespace libsnark { diff --git a/src/zk_proof_systems/ppzksnark/bacs_ppzksnark/examples/run_bacs_ppzksnark.hpp b/libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/examples/run_bacs_ppzksnark.hpp similarity index 84% rename from src/zk_proof_systems/ppzksnark/bacs_ppzksnark/examples/run_bacs_ppzksnark.hpp rename to libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/examples/run_bacs_ppzksnark.hpp index cbf0ac0f..861d67b7 100644 --- a/src/zk_proof_systems/ppzksnark/bacs_ppzksnark/examples/run_bacs_ppzksnark.hpp +++ b/libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/examples/run_bacs_ppzksnark.hpp @@ -13,7 +13,7 @@ #ifndef RUN_BACS_PPZKSNARK_HPP_ #define RUN_BACS_PPZKSNARK_HPP_ -#include "relations/circuit_satisfaction_problems/bacs/examples/bacs_examples.hpp" +#include namespace libsnark { @@ -30,6 +30,6 @@ bool run_bacs_ppzksnark(const bacs_example > &example, } // libsnark -#include "zk_proof_systems/ppzksnark/bacs_ppzksnark/examples/run_bacs_ppzksnark.tcc" +#include #endif // RUN_BACS_PPZKSNARK_HPP_ diff --git a/src/zk_proof_systems/ppzksnark/bacs_ppzksnark/examples/run_bacs_ppzksnark.tcc b/libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/examples/run_bacs_ppzksnark.tcc similarity index 97% rename from src/zk_proof_systems/ppzksnark/bacs_ppzksnark/examples/run_bacs_ppzksnark.tcc rename to libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/examples/run_bacs_ppzksnark.tcc index e63520f6..c0900e17 100644 --- a/src/zk_proof_systems/ppzksnark/bacs_ppzksnark/examples/run_bacs_ppzksnark.tcc +++ b/libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/examples/run_bacs_ppzksnark.tcc @@ -15,7 +15,7 @@ #ifndef RUN_BACS_PPZKSNARK_TCC_ #define RUN_BACS_PPZKSNARK_TCC_ -#include "zk_proof_systems/ppzksnark/bacs_ppzksnark/bacs_ppzksnark.hpp" +#include #include diff --git a/src/zk_proof_systems/ppzksnark/bacs_ppzksnark/profiling/profile_bacs_ppzksnark.cpp b/libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/profiling/profile_bacs_ppzksnark.cpp similarity index 85% rename from src/zk_proof_systems/ppzksnark/bacs_ppzksnark/profiling/profile_bacs_ppzksnark.cpp rename to libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/profiling/profile_bacs_ppzksnark.cpp index 025aeaa6..6a9430e1 100644 --- a/src/zk_proof_systems/ppzksnark/bacs_ppzksnark/profiling/profile_bacs_ppzksnark.cpp +++ b/libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/profiling/profile_bacs_ppzksnark.cpp @@ -5,7 +5,7 @@ The command - $ src/zk_proof_systems/bacs_ppzksnark/profiling/profile_bacs_ppzksnark 1000 10 + $ libsnark/zk_proof_systems/bacs_ppzksnark/profiling/profile_bacs_ppzksnark 1000 10 exercises the ppzkSNARK (first generator, then prover, then verifier) on an BACS instance with 1000 gates and an input consisting of 10 Field elements @@ -19,10 +19,10 @@ #include -#include "common/default_types/bacs_ppzksnark_pp.hpp" +#include #include -#include "relations/circuit_satisfaction_problems/bacs/examples/bacs_examples.hpp" -#include "zk_proof_systems/ppzksnark/bacs_ppzksnark/examples/run_bacs_ppzksnark.hpp" +#include +#include using namespace libsnark; diff --git a/src/zk_proof_systems/ppzksnark/bacs_ppzksnark/tests/test_bacs_ppzksnark.cpp b/libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/tests/test_bacs_ppzksnark.cpp similarity index 85% rename from src/zk_proof_systems/ppzksnark/bacs_ppzksnark/tests/test_bacs_ppzksnark.cpp rename to libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/tests/test_bacs_ppzksnark.cpp index 95c009c5..e13674d5 100644 --- a/src/zk_proof_systems/ppzksnark/bacs_ppzksnark/tests/test_bacs_ppzksnark.cpp +++ b/libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/tests/test_bacs_ppzksnark.cpp @@ -11,10 +11,10 @@ #include #include -#include "common/default_types/bacs_ppzksnark_pp.hpp" +#include #include -#include "relations/circuit_satisfaction_problems/bacs/examples/bacs_examples.hpp" -#include "zk_proof_systems/ppzksnark/bacs_ppzksnark/examples/run_bacs_ppzksnark.hpp" +#include +#include using namespace libsnark; diff --git a/src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/examples/run_r1cs_gg_ppzksnark.hpp b/libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/examples/run_r1cs_gg_ppzksnark.hpp similarity index 84% rename from src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/examples/run_r1cs_gg_ppzksnark.hpp rename to libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/examples/run_r1cs_gg_ppzksnark.hpp index 3ee9708c..49cb1544 100644 --- a/src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/examples/run_r1cs_gg_ppzksnark.hpp +++ b/libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/examples/run_r1cs_gg_ppzksnark.hpp @@ -13,7 +13,7 @@ #ifndef RUN_R1CS_GG_PPZKSNARK_HPP_ #define RUN_R1CS_GG_PPZKSNARK_HPP_ -#include "relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp" +#include namespace libsnark { @@ -30,6 +30,6 @@ bool run_r1cs_gg_ppzksnark(const r1cs_example > &example, } // libsnark -#include "zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/examples/run_r1cs_gg_ppzksnark.tcc" +#include #endif // RUN_R1CS_GG_PPZKSNARK_HPP_ diff --git a/src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/examples/run_r1cs_gg_ppzksnark.tcc b/libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/examples/run_r1cs_gg_ppzksnark.tcc similarity index 98% rename from src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/examples/run_r1cs_gg_ppzksnark.tcc rename to libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/examples/run_r1cs_gg_ppzksnark.tcc index 13cc01e7..bcbf8851 100644 --- a/src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/examples/run_r1cs_gg_ppzksnark.tcc +++ b/libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/examples/run_r1cs_gg_ppzksnark.tcc @@ -15,7 +15,7 @@ #ifndef RUN_R1CS_GG_PPZKSNARK_TCC_ #define RUN_R1CS_GG_PPZKSNARK_TCC_ -#include "zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark.hpp" +#include #include #include diff --git a/src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/profiling/profile_r1cs_gg_ppzksnark.cpp b/libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/profiling/profile_r1cs_gg_ppzksnark.cpp similarity index 82% rename from src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/profiling/profile_r1cs_gg_ppzksnark.cpp rename to libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/profiling/profile_r1cs_gg_ppzksnark.cpp index 93d6365b..b099e9db 100644 --- a/src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/profiling/profile_r1cs_gg_ppzksnark.cpp +++ b/libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/profiling/profile_r1cs_gg_ppzksnark.cpp @@ -5,7 +5,7 @@ The command - $ src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/profiling/profile_r1cs_gg_ppzksnark 1000 10 Fr + $ libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/profiling/profile_r1cs_gg_ppzksnark 1000 10 Fr exercises the ppzkSNARK (first generator, then prover, then verifier) on an R1CS instance with 1000 equations and an input consisting of 10 field elements. @@ -13,7 +13,7 @@ The command - $ src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/profiling/profile_r1cs_gg_ppzksnark 1000 10 bytes + $ libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/profiling/profile_r1cs_gg_ppzksnark 1000 10 bytes does the same but now the input consists of 10 bytes. @@ -25,11 +25,11 @@ #include #include -#include "common/default_types/r1cs_gg_ppzksnark_pp.hpp" +#include #include #include -#include "relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp" -#include "zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/examples/run_r1cs_gg_ppzksnark.hpp" +#include +#include using namespace libsnark; diff --git a/src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark.hpp b/libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark.hpp similarity index 97% rename from src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark.hpp rename to libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark.hpp index b7b63dc8..aec93353 100644 --- a/src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark.hpp +++ b/libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark.hpp @@ -44,10 +44,10 @@ The implementation instantiates the protocol of \[Gro16]. #include #include -#include "common/data_structures/accumulation_vector.hpp" -#include "knowledge_commitment/knowledge_commitment.hpp" -#include "relations/constraint_satisfaction_problems/r1cs/r1cs.hpp" -#include "zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark_params.hpp" +#include +#include +#include +#include namespace libsnark { @@ -452,6 +452,6 @@ bool r1cs_gg_ppzksnark_affine_verifier_weak_IC(const r1cs_gg_ppzksnark_verificat } // libsnark -#include "zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark.tcc" +#include #endif // R1CS_GG_PPZKSNARK_HPP_ diff --git a/src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark.tcc b/libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark.tcc similarity index 99% rename from src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark.tcc rename to libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark.tcc index cc619400..53307b03 100644 --- a/src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark.tcc +++ b/libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark.tcc @@ -23,8 +23,8 @@ See r1cs_gg_ppzksnark.hpp . #include #include #include -#include "knowledge_commitment/kc_multiexp.hpp" -#include "reductions/r1cs_to_qap/r1cs_to_qap.hpp" +#include +#include namespace libsnark { diff --git a/src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark_params.hpp b/libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark_params.hpp similarity index 93% rename from src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark_params.hpp rename to libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark_params.hpp index 6526e436..80f81ad3 100644 --- a/src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark_params.hpp +++ b/libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark_params.hpp @@ -12,7 +12,7 @@ #ifndef R1CS_GG_PPZKSNARK_PARAMS_HPP_ #define R1CS_GG_PPZKSNARK_PARAMS_HPP_ -#include "relations/constraint_satisfaction_problems/r1cs/r1cs.hpp" +#include namespace libsnark { diff --git a/src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/tests/test_r1cs_gg_ppzksnark.cpp b/libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/tests/test_r1cs_gg_ppzksnark.cpp similarity index 83% rename from src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/tests/test_r1cs_gg_ppzksnark.cpp rename to libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/tests/test_r1cs_gg_ppzksnark.cpp index 5cc2c1aa..11526634 100644 --- a/src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/tests/test_r1cs_gg_ppzksnark.cpp +++ b/libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/tests/test_r1cs_gg_ppzksnark.cpp @@ -11,11 +11,11 @@ #include #include -#include "common/default_types/r1cs_gg_ppzksnark_pp.hpp" +#include #include #include -#include "relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp" -#include "zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/examples/run_r1cs_gg_ppzksnark.hpp" +#include +#include using namespace libsnark; diff --git a/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.hpp b/libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.hpp similarity index 85% rename from src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.hpp rename to libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.hpp index c370afec..f098c5c2 100644 --- a/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.hpp +++ b/libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.hpp @@ -14,7 +14,7 @@ #define RUN_R1CS_PPZKSNARK_HPP_ #include -#include "relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp" +#include namespace libsnark { @@ -31,6 +31,6 @@ bool run_r1cs_ppzksnark(const r1cs_example > &example, } // libsnark -#include "zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.tcc" +#include #endif // RUN_R1CS_PPZKSNARK_HPP_ diff --git a/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.tcc b/libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.tcc similarity index 98% rename from src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.tcc rename to libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.tcc index f4860a1a..03ba81a2 100644 --- a/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.tcc +++ b/libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.tcc @@ -15,7 +15,7 @@ #ifndef RUN_R1CS_PPZKSNARK_TCC_ #define RUN_R1CS_PPZKSNARK_TCC_ -#include "zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp" +#include #include #include diff --git a/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/profiling/profile_r1cs_ppzksnark.cpp b/libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/profiling/profile_r1cs_ppzksnark.cpp similarity index 83% rename from src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/profiling/profile_r1cs_ppzksnark.cpp rename to libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/profiling/profile_r1cs_ppzksnark.cpp index ce5e80f2..c7a4830a 100644 --- a/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/profiling/profile_r1cs_ppzksnark.cpp +++ b/libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/profiling/profile_r1cs_ppzksnark.cpp @@ -5,7 +5,7 @@ The command - $ src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/profiling/profile_r1cs_ppzksnark 1000 10 Fr + $ libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/profiling/profile_r1cs_ppzksnark 1000 10 Fr exercises the ppzkSNARK (first generator, then prover, then verifier) on an R1CS instance with 1000 equations and an input consisting of 10 field elements. @@ -13,7 +13,7 @@ The command - $ src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/profiling/profile_r1cs_ppzksnark 1000 10 bytes + $ libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/profiling/profile_r1cs_ppzksnark 1000 10 bytes does the same but now the input consists of 10 bytes. @@ -25,11 +25,11 @@ #include #include -#include "common/default_types/r1cs_ppzksnark_pp.hpp" +#include #include #include -#include "relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp" -#include "zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.hpp" +#include +#include using namespace libsnark; diff --git a/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp b/libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp similarity index 97% rename from src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp rename to libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp index 83b4693d..81670b73 100644 --- a/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp +++ b/libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp @@ -49,10 +49,10 @@ #include #include -#include "common/data_structures/accumulation_vector.hpp" -#include "knowledge_commitment/knowledge_commitment.hpp" -#include "relations/constraint_satisfaction_problems/r1cs/r1cs.hpp" -#include "zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark_params.hpp" +#include +#include +#include +#include namespace libsnark { @@ -465,6 +465,6 @@ bool r1cs_ppzksnark_affine_verifier_weak_IC(const r1cs_ppzksnark_verification_ke } // libsnark -#include "zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.tcc" +#include #endif // R1CS_PPZKSNARK_HPP_ diff --git a/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.tcc b/libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.tcc similarity index 99% rename from src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.tcc rename to libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.tcc index 984e7d9a..51959993 100644 --- a/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.tcc +++ b/libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.tcc @@ -23,8 +23,8 @@ See r1cs_ppzksnark.hpp . #include #include #include -#include "knowledge_commitment/kc_multiexp.hpp" -#include "reductions/r1cs_to_qap/r1cs_to_qap.hpp" +#include +#include namespace libsnark { diff --git a/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark_params.hpp b/libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark_params.hpp similarity index 92% rename from src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark_params.hpp rename to libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark_params.hpp index 3e00475f..05bd6e73 100644 --- a/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark_params.hpp +++ b/libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark_params.hpp @@ -12,7 +12,7 @@ #ifndef R1CS_PPZKSNARK_PARAMS_HPP_ #define R1CS_PPZKSNARK_PARAMS_HPP_ -#include "relations/constraint_satisfaction_problems/r1cs/r1cs.hpp" +#include namespace libsnark { diff --git a/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/tests/test_r1cs_ppzksnark.cpp b/libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/tests/test_r1cs_ppzksnark.cpp similarity index 84% rename from src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/tests/test_r1cs_ppzksnark.cpp rename to libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/tests/test_r1cs_ppzksnark.cpp index 36dc6f6b..7502ae8f 100644 --- a/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/tests/test_r1cs_ppzksnark.cpp +++ b/libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/tests/test_r1cs_ppzksnark.cpp @@ -11,11 +11,11 @@ #include #include -#include "common/default_types/r1cs_ppzksnark_pp.hpp" +#include #include #include -#include "relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp" -#include "zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.hpp" +#include +#include using namespace libsnark; diff --git a/src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark.cpp b/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark.cpp similarity index 96% rename from src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark.cpp rename to libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark.cpp index 0aec09f4..34d28a90 100644 --- a/src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark.cpp +++ b/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark.cpp @@ -13,11 +13,11 @@ #include #endif -#include "common/default_types/tinyram_ppzksnark_pp.hpp" +#include #include -#include "reductions/ram_to_r1cs/ram_to_r1cs.hpp" -#include "zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark.hpp" -#include "relations/ram_computations/rams/tinyram/tinyram_params.hpp" +#include +#include +#include #ifndef MINDEPS namespace po = boost::program_options; diff --git a/src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_generator.cpp b/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_generator.cpp similarity index 93% rename from src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_generator.cpp rename to libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_generator.cpp index 2b899b14..ba611761 100644 --- a/src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_generator.cpp +++ b/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_generator.cpp @@ -10,9 +10,9 @@ #include #endif -#include "common/default_types/ram_ppzksnark_pp.hpp" -#include "zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark.hpp" -#include "relations/ram_computations/rams/tinyram/tinyram_params.hpp" +#include +#include +#include #ifndef MINDEPS namespace po = boost::program_options; diff --git a/src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_prover.cpp b/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_prover.cpp similarity index 94% rename from src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_prover.cpp rename to libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_prover.cpp index 1ebddfbd..0db443ee 100644 --- a/src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_prover.cpp +++ b/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_prover.cpp @@ -10,9 +10,9 @@ #include #endif -#include "common/default_types/tinyram_ppzksnark_pp.hpp" -#include "zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark.hpp" -#include "relations/ram_computations/rams/tinyram/tinyram_params.hpp" +#include +#include +#include #ifndef MINDEPS namespace po = boost::program_options; diff --git a/src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_verifier.cpp b/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_verifier.cpp similarity index 94% rename from src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_verifier.cpp rename to libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_verifier.cpp index 2f273f75..aea91bba 100644 --- a/src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_verifier.cpp +++ b/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_verifier.cpp @@ -10,9 +10,9 @@ #include #endif -#include "common/default_types/tinyram_ppzksnark_pp.hpp" -#include "zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark.hpp" -#include "relations/ram_computations/rams/tinyram/tinyram_params.hpp" +#include +#include +#include #ifndef MINDEPS namespace po = boost::program_options; diff --git a/src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/run_ram_ppzksnark.hpp b/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/run_ram_ppzksnark.hpp similarity index 81% rename from src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/run_ram_ppzksnark.hpp rename to libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/run_ram_ppzksnark.hpp index 5bb47475..9c998623 100644 --- a/src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/run_ram_ppzksnark.hpp +++ b/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/run_ram_ppzksnark.hpp @@ -13,8 +13,8 @@ #ifndef RUN_RAM_PPZKSNARK_HPP_ #define RUN_RAM_PPZKSNARK_HPP_ -#include "relations/ram_computations/rams/examples/ram_examples.hpp" -#include "zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark_params.hpp" +#include +#include namespace libsnark { @@ -31,6 +31,6 @@ bool run_ram_ppzksnark(const ram_example #endif // RUN_RAM_PPZKSNARK_HPP_ diff --git a/src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/run_ram_ppzksnark.tcc b/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/run_ram_ppzksnark.tcc similarity index 97% rename from src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/run_ram_ppzksnark.tcc rename to libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/run_ram_ppzksnark.tcc index 73663541..cb675b6a 100644 --- a/src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/run_ram_ppzksnark.tcc +++ b/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/run_ram_ppzksnark.tcc @@ -15,7 +15,7 @@ #ifndef RUN_RAM_PPZKSNARK_TCC_ #define RUN_RAM_PPZKSNARK_TCC_ -#include "zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark.hpp" +#include #include diff --git a/src/zk_proof_systems/ppzksnark/ram_ppzksnark/profiling/profile_ram_ppzksnark.cpp b/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/profiling/profile_ram_ppzksnark.cpp similarity index 85% rename from src/zk_proof_systems/ppzksnark/ram_ppzksnark/profiling/profile_ram_ppzksnark.cpp rename to libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/profiling/profile_ram_ppzksnark.cpp index 3ddcaa39..a9b1ec0c 100644 --- a/src/zk_proof_systems/ppzksnark/ram_ppzksnark/profiling/profile_ram_ppzksnark.cpp +++ b/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/profiling/profile_ram_ppzksnark.cpp @@ -11,11 +11,11 @@ #include #include -#include "common/default_types/ram_ppzksnark_pp.hpp" +#include #include -#include "relations/ram_computations/rams/examples/ram_examples.hpp" -#include "zk_proof_systems/ppzksnark/ram_ppzksnark/examples/run_ram_ppzksnark.hpp" -#include "relations/ram_computations/rams/tinyram/tinyram_params.hpp" +#include +#include +#include using namespace libsnark; diff --git a/src/zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark.hpp b/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark.hpp similarity index 96% rename from src/zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark.hpp rename to libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark.hpp index 79502774..f9dcb883 100644 --- a/src/zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark.hpp +++ b/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark.hpp @@ -48,9 +48,9 @@ #include -#include "reductions/ram_to_r1cs/ram_to_r1cs.hpp" -#include "zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp" -#include "zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark_params.hpp" +#include +#include +#include namespace libsnark { @@ -222,6 +222,6 @@ bool ram_ppzksnark_verifier(const ram_ppzksnark_verification_key #endif // RAM_PPZKSNARK_HPP_ diff --git a/src/zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark.tcc b/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark.tcc similarity index 99% rename from src/zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark.tcc rename to libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark.tcc index f57ab02f..6d5c60f0 100644 --- a/src/zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark.tcc +++ b/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark.tcc @@ -15,7 +15,7 @@ #define RAM_PPZKSNARK_TCC_ #include -#include "reductions/ram_to_r1cs/ram_to_r1cs.hpp" +#include namespace libsnark { diff --git a/src/zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark_params.hpp b/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark_params.hpp similarity index 100% rename from src/zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark_params.hpp rename to libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark_params.hpp diff --git a/src/zk_proof_systems/ppzksnark/ram_ppzksnark/tests/test_ram_ppzksnark.cpp b/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/tests/test_ram_ppzksnark.cpp similarity index 88% rename from src/zk_proof_systems/ppzksnark/ram_ppzksnark/tests/test_ram_ppzksnark.cpp rename to libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/tests/test_ram_ppzksnark.cpp index f07d4112..1e7ac354 100644 --- a/src/zk_proof_systems/ppzksnark/ram_ppzksnark/tests/test_ram_ppzksnark.cpp +++ b/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/tests/test_ram_ppzksnark.cpp @@ -10,10 +10,10 @@ #include #include -#include "common/default_types/ram_ppzksnark_pp.hpp" +#include #include -#include "relations/ram_computations/rams/examples/ram_examples.hpp" -#include "zk_proof_systems/ppzksnark/ram_ppzksnark/examples/run_ram_ppzksnark.hpp" +#include +#include using namespace libsnark; diff --git a/src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/examples/run_tbcs_ppzksnark.hpp b/libsnark/zk_proof_systems/ppzksnark/tbcs_ppzksnark/examples/run_tbcs_ppzksnark.hpp similarity index 84% rename from src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/examples/run_tbcs_ppzksnark.hpp rename to libsnark/zk_proof_systems/ppzksnark/tbcs_ppzksnark/examples/run_tbcs_ppzksnark.hpp index ff4b0620..151b5029 100644 --- a/src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/examples/run_tbcs_ppzksnark.hpp +++ b/libsnark/zk_proof_systems/ppzksnark/tbcs_ppzksnark/examples/run_tbcs_ppzksnark.hpp @@ -13,7 +13,7 @@ #ifndef RUN_TBCS_PPZKSNARK_HPP_ #define RUN_TBCS_PPZKSNARK_HPP_ -#include "relations/circuit_satisfaction_problems/tbcs/examples/tbcs_examples.hpp" +#include namespace libsnark { @@ -30,6 +30,6 @@ bool run_tbcs_ppzksnark(const tbcs_example &example, } // libsnark -#include "zk_proof_systems/ppzksnark/tbcs_ppzksnark/examples/run_tbcs_ppzksnark.tcc" +#include #endif // RUN_TBCS_PPZKSNARK_HPP_ diff --git a/src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/examples/run_tbcs_ppzksnark.tcc b/libsnark/zk_proof_systems/ppzksnark/tbcs_ppzksnark/examples/run_tbcs_ppzksnark.tcc similarity index 97% rename from src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/examples/run_tbcs_ppzksnark.tcc rename to libsnark/zk_proof_systems/ppzksnark/tbcs_ppzksnark/examples/run_tbcs_ppzksnark.tcc index 9b05fe52..492f933c 100644 --- a/src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/examples/run_tbcs_ppzksnark.tcc +++ b/libsnark/zk_proof_systems/ppzksnark/tbcs_ppzksnark/examples/run_tbcs_ppzksnark.tcc @@ -15,7 +15,7 @@ #ifndef RUN_TBCS_PPZKSNARK_TCC_ #define RUN_TBCS_PPZKSNARK_TCC_ -#include "zk_proof_systems/ppzksnark/tbcs_ppzksnark/tbcs_ppzksnark.hpp" +#include #include diff --git a/src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/profiling/profile_tbcs_ppzksnark.cpp b/libsnark/zk_proof_systems/ppzksnark/tbcs_ppzksnark/profiling/profile_tbcs_ppzksnark.cpp similarity index 84% rename from src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/profiling/profile_tbcs_ppzksnark.cpp rename to libsnark/zk_proof_systems/ppzksnark/tbcs_ppzksnark/profiling/profile_tbcs_ppzksnark.cpp index 08a3f9e9..e4652b25 100644 --- a/src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/profiling/profile_tbcs_ppzksnark.cpp +++ b/libsnark/zk_proof_systems/ppzksnark/tbcs_ppzksnark/profiling/profile_tbcs_ppzksnark.cpp @@ -5,7 +5,7 @@ The command - $ src/tbcs_ppzksnark/examples/profile_tbcs_ppzksnark 1000 10 + $ libsnark/tbcs_ppzksnark/examples/profile_tbcs_ppzksnark 1000 10 exercises the ppzkSNARK (first generator, then prover, then verifier) on an TBCS instance with 1000 gates and an input consisting of 10 bits. @@ -17,11 +17,11 @@ #include -#include "common/default_types/tbcs_ppzksnark_pp.hpp" +#include #include #include -#include "relations/circuit_satisfaction_problems/tbcs/examples/tbcs_examples.hpp" -#include "zk_proof_systems/ppzksnark/tbcs_ppzksnark/examples/run_tbcs_ppzksnark.hpp" +#include +#include using namespace libsnark; diff --git a/src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tbcs_ppzksnark.hpp b/libsnark/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tbcs_ppzksnark.hpp similarity index 96% rename from src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tbcs_ppzksnark.hpp rename to libsnark/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tbcs_ppzksnark.hpp index 1c38b19e..9f9acaf0 100644 --- a/src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tbcs_ppzksnark.hpp +++ b/libsnark/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tbcs_ppzksnark.hpp @@ -34,9 +34,9 @@ #ifndef TBCS_PPZKSNARK_HPP_ #define TBCS_PPZKSNARK_HPP_ -#include "relations/circuit_satisfaction_problems/tbcs/tbcs.hpp" -#include "zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark.hpp" -#include "zk_proof_systems/ppzksnark/tbcs_ppzksnark/tbcs_ppzksnark_params.hpp" +#include +#include +#include namespace libsnark { @@ -255,6 +255,6 @@ bool tbcs_ppzksnark_online_verifier_strong_IC(const tbcs_ppzksnark_processed_ver } // libsnark -#include "zk_proof_systems/ppzksnark/tbcs_ppzksnark/tbcs_ppzksnark.tcc" +#include #endif // TBCS_PPZKSNARK_HPP_ diff --git a/src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tbcs_ppzksnark.tcc b/libsnark/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tbcs_ppzksnark.tcc similarity index 99% rename from src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tbcs_ppzksnark.tcc rename to libsnark/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tbcs_ppzksnark.tcc index b6d089dc..bce82ea1 100644 --- a/src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tbcs_ppzksnark.tcc +++ b/libsnark/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tbcs_ppzksnark.tcc @@ -14,7 +14,7 @@ #ifndef TBCS_PPZKSNARK_TCC_ #define TBCS_PPZKSNARK_TCC_ -#include "reductions/tbcs_to_uscs/tbcs_to_uscs.hpp" +#include namespace libsnark { diff --git a/src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tbcs_ppzksnark_params.hpp b/libsnark/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tbcs_ppzksnark_params.hpp similarity index 92% rename from src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tbcs_ppzksnark_params.hpp rename to libsnark/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tbcs_ppzksnark_params.hpp index 4214b241..7e804267 100644 --- a/src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tbcs_ppzksnark_params.hpp +++ b/libsnark/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tbcs_ppzksnark_params.hpp @@ -12,7 +12,7 @@ #ifndef TBCS_PPZKSNARK_PARAMS_HPP_ #define TBCS_PPZKSNARK_PARAMS_HPP_ -#include "relations/circuit_satisfaction_problems/tbcs/tbcs.hpp" +#include namespace libsnark { diff --git a/src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tests/test_tbcs_ppzksnark.cpp b/libsnark/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tests/test_tbcs_ppzksnark.cpp similarity index 85% rename from src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tests/test_tbcs_ppzksnark.cpp rename to libsnark/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tests/test_tbcs_ppzksnark.cpp index 8d2da46d..d4c42038 100644 --- a/src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tests/test_tbcs_ppzksnark.cpp +++ b/libsnark/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tests/test_tbcs_ppzksnark.cpp @@ -11,10 +11,10 @@ #include #include -#include "common/default_types/tbcs_ppzksnark_pp.hpp" +#include #include -#include "relations/circuit_satisfaction_problems/tbcs/examples/tbcs_examples.hpp" -#include "zk_proof_systems/ppzksnark/tbcs_ppzksnark/examples/run_tbcs_ppzksnark.hpp" +#include +#include using namespace libsnark; diff --git a/src/zk_proof_systems/ppzksnark/uscs_ppzksnark/examples/run_uscs_ppzksnark.hpp b/libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/examples/run_uscs_ppzksnark.hpp similarity index 84% rename from src/zk_proof_systems/ppzksnark/uscs_ppzksnark/examples/run_uscs_ppzksnark.hpp rename to libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/examples/run_uscs_ppzksnark.hpp index 9d7c8448..b3cd3d7b 100644 --- a/src/zk_proof_systems/ppzksnark/uscs_ppzksnark/examples/run_uscs_ppzksnark.hpp +++ b/libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/examples/run_uscs_ppzksnark.hpp @@ -13,7 +13,7 @@ #ifndef RUN_USCS_PPZKSNARK_HPP_ #define RUN_USCS_PPZKSNARK_HPP_ -#include "relations/constraint_satisfaction_problems/uscs/examples/uscs_examples.hpp" +#include namespace libsnark { @@ -30,6 +30,6 @@ bool run_uscs_ppzksnark(const uscs_example > &example, } // libsnark -#include "zk_proof_systems/ppzksnark/uscs_ppzksnark/examples/run_uscs_ppzksnark.tcc" +#include #endif // RUN_USCS_PPZKSNARK_HPP_ diff --git a/src/zk_proof_systems/ppzksnark/uscs_ppzksnark/examples/run_uscs_ppzksnark.tcc b/libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/examples/run_uscs_ppzksnark.tcc similarity index 97% rename from src/zk_proof_systems/ppzksnark/uscs_ppzksnark/examples/run_uscs_ppzksnark.tcc rename to libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/examples/run_uscs_ppzksnark.tcc index c891325b..8b1d3d3b 100644 --- a/src/zk_proof_systems/ppzksnark/uscs_ppzksnark/examples/run_uscs_ppzksnark.tcc +++ b/libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/examples/run_uscs_ppzksnark.tcc @@ -15,7 +15,7 @@ #ifndef RUN_USCS_PPZKSNARK_TCC_ #define RUN_USCS_PPZKSNARK_TCC_ -#include "zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark.hpp" +#include #include diff --git a/src/zk_proof_systems/ppzksnark/uscs_ppzksnark/profiling/profile_uscs_ppzksnark.cpp b/libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/profiling/profile_uscs_ppzksnark.cpp similarity index 81% rename from src/zk_proof_systems/ppzksnark/uscs_ppzksnark/profiling/profile_uscs_ppzksnark.cpp rename to libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/profiling/profile_uscs_ppzksnark.cpp index fe531b52..68263b05 100644 --- a/src/zk_proof_systems/ppzksnark/uscs_ppzksnark/profiling/profile_uscs_ppzksnark.cpp +++ b/libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/profiling/profile_uscs_ppzksnark.cpp @@ -5,7 +5,7 @@ The command - $ src/zk_proof_systems/ppzksnark/uscs_ppzksnark/profiling/profile_uscs_ppzksnark 1000 10 Fr + $ libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/profiling/profile_uscs_ppzksnark 1000 10 Fr exercises the ppzkSNARK (first generator, then prover, then verifier) on an USCS instance with 1000 equations and an input consisting of 10 field elements. @@ -13,7 +13,7 @@ The command - $ src/zk_proof_systems/ppzksnark/uscs_ppzksnark/profiling/profile_uscs_ppzksnark 1000 10 bytes + $ libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/profiling/profile_uscs_ppzksnark 1000 10 bytes does the same but now the input consists of 10 bytes. @@ -26,11 +26,11 @@ #include #include -#include "common/default_types/uscs_ppzksnark_pp.hpp" +#include #include #include -#include "relations/constraint_satisfaction_problems/uscs/examples/uscs_examples.hpp" -#include "zk_proof_systems/ppzksnark/uscs_ppzksnark/examples/run_uscs_ppzksnark.hpp" +#include +#include using namespace libsnark; diff --git a/src/zk_proof_systems/ppzksnark/uscs_ppzksnark/tests/test_uscs_ppzksnark.cpp b/libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/tests/test_uscs_ppzksnark.cpp similarity index 84% rename from src/zk_proof_systems/ppzksnark/uscs_ppzksnark/tests/test_uscs_ppzksnark.cpp rename to libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/tests/test_uscs_ppzksnark.cpp index 366288a0..a331dd24 100644 --- a/src/zk_proof_systems/ppzksnark/uscs_ppzksnark/tests/test_uscs_ppzksnark.cpp +++ b/libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/tests/test_uscs_ppzksnark.cpp @@ -11,11 +11,11 @@ #include #include -#include "common/default_types/uscs_ppzksnark_pp.hpp" +#include #include #include -#include "relations/constraint_satisfaction_problems/uscs/examples/uscs_examples.hpp" -#include "zk_proof_systems/ppzksnark/uscs_ppzksnark/examples/run_uscs_ppzksnark.hpp" +#include +#include using namespace libsnark; diff --git a/src/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark.hpp b/libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark.hpp similarity index 97% rename from src/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark.hpp rename to libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark.hpp index 16c600a2..7e7af551 100644 --- a/src/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark.hpp +++ b/libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark.hpp @@ -49,10 +49,10 @@ #include #include -#include "common/data_structures/accumulation_vector.hpp" -#include "knowledge_commitment/knowledge_commitment.hpp" -#include "relations/constraint_satisfaction_problems/uscs/uscs.hpp" -#include "zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark_params.hpp" +#include +#include +#include +#include namespace libsnark { @@ -423,6 +423,6 @@ bool uscs_ppzksnark_online_verifier_strong_IC(const uscs_ppzksnark_processed_ver } // libsnark -#include "zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark.tcc" +#include #endif // USCS_PPZKSNARK_HPP_ diff --git a/src/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark.tcc b/libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark.tcc similarity index 99% rename from src/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark.tcc rename to libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark.tcc index be01cdad..afaeeeaa 100644 --- a/src/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark.tcc +++ b/libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark.tcc @@ -18,11 +18,11 @@ #include #include -#include "reductions/uscs_to_ssp/uscs_to_ssp.hpp" +#include #include #include #include -#include "relations/arithmetic_programs/ssp/ssp.hpp" +#include namespace libsnark { diff --git a/src/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark_params.hpp b/libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark_params.hpp similarity index 92% rename from src/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark_params.hpp rename to libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark_params.hpp index 7d6303fb..3022cfea 100644 --- a/src/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark_params.hpp +++ b/libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark_params.hpp @@ -12,7 +12,7 @@ #ifndef USCS_PPZKSNARK_PARAMS_HPP_ #define USCS_PPZKSNARK_PARAMS_HPP_ -#include "relations/constraint_satisfaction_problems/uscs/uscs.hpp" +#include namespace libsnark { diff --git a/src/zk_proof_systems/zksnark/ram_zksnark/examples/run_ram_zksnark.hpp b/libsnark/zk_proof_systems/zksnark/ram_zksnark/examples/run_ram_zksnark.hpp similarity index 81% rename from src/zk_proof_systems/zksnark/ram_zksnark/examples/run_ram_zksnark.hpp rename to libsnark/zk_proof_systems/zksnark/ram_zksnark/examples/run_ram_zksnark.hpp index db1a34c7..743853cd 100644 --- a/src/zk_proof_systems/zksnark/ram_zksnark/examples/run_ram_zksnark.hpp +++ b/libsnark/zk_proof_systems/zksnark/ram_zksnark/examples/run_ram_zksnark.hpp @@ -13,8 +13,8 @@ #ifndef RUN_RAM_ZKSNARK_HPP_ #define RUN_RAM_ZKSNARK_HPP_ -#include "relations/ram_computations/rams/examples/ram_examples.hpp" -#include "zk_proof_systems/zksnark/ram_zksnark/ram_zksnark_params.hpp" +#include +#include namespace libsnark { @@ -31,6 +31,6 @@ bool run_ram_zksnark(const ram_example > } // libsnark -#include "zk_proof_systems/zksnark/ram_zksnark/examples/run_ram_zksnark.tcc" +#include #endif // RUN_RAM_ZKSNARK_HPP_ diff --git a/src/zk_proof_systems/zksnark/ram_zksnark/examples/run_ram_zksnark.tcc b/libsnark/zk_proof_systems/zksnark/ram_zksnark/examples/run_ram_zksnark.tcc similarity index 97% rename from src/zk_proof_systems/zksnark/ram_zksnark/examples/run_ram_zksnark.tcc rename to libsnark/zk_proof_systems/zksnark/ram_zksnark/examples/run_ram_zksnark.tcc index a4b83e1b..c1c2a278 100644 --- a/src/zk_proof_systems/zksnark/ram_zksnark/examples/run_ram_zksnark.tcc +++ b/libsnark/zk_proof_systems/zksnark/ram_zksnark/examples/run_ram_zksnark.tcc @@ -15,7 +15,7 @@ #ifndef RUN_RAM_ZKSNARK_TCC_ #define RUN_RAM_ZKSNARK_TCC_ -#include "zk_proof_systems/zksnark/ram_zksnark/ram_zksnark.hpp" +#include #include diff --git a/src/zk_proof_systems/zksnark/ram_zksnark/profiling/profile_ram_zksnark.cpp b/libsnark/zk_proof_systems/zksnark/ram_zksnark/profiling/profile_ram_zksnark.cpp similarity index 93% rename from src/zk_proof_systems/zksnark/ram_zksnark/profiling/profile_ram_zksnark.cpp rename to libsnark/zk_proof_systems/zksnark/ram_zksnark/profiling/profile_ram_zksnark.cpp index 3285064a..75f3bb74 100644 --- a/src/zk_proof_systems/zksnark/ram_zksnark/profiling/profile_ram_zksnark.cpp +++ b/libsnark/zk_proof_systems/zksnark/ram_zksnark/profiling/profile_ram_zksnark.cpp @@ -4,12 +4,12 @@ * and contributors (see AUTHORS). * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include "common/default_types/ram_zksnark_pp.hpp" -#include "relations/ram_computations/memory/examples/memory_contents_examples.hpp" -#include "relations/ram_computations/rams/examples/ram_examples.hpp" -#include "zk_proof_systems/zksnark/ram_zksnark/ram_zksnark.hpp" -#include "zk_proof_systems/zksnark/ram_zksnark/examples/run_ram_zksnark.hpp" -#include "relations/ram_computations/rams/tinyram/tinyram_params.hpp" +#include +#include +#include +#include +#include +#include #include diff --git a/src/zk_proof_systems/zksnark/ram_zksnark/ram_compliance_predicate.hpp b/libsnark/zk_proof_systems/zksnark/ram_zksnark/ram_compliance_predicate.hpp similarity index 94% rename from src/zk_proof_systems/zksnark/ram_zksnark/ram_compliance_predicate.hpp rename to libsnark/zk_proof_systems/zksnark/ram_zksnark/ram_compliance_predicate.hpp index 91bc8899..8e88c1bb 100644 --- a/src/zk_proof_systems/zksnark/ram_zksnark/ram_compliance_predicate.hpp +++ b/libsnark/zk_proof_systems/zksnark/ram_zksnark/ram_compliance_predicate.hpp @@ -37,12 +37,12 @@ #ifndef RAM_COMPLIANCE_PREDICATE_HPP_ #define RAM_COMPLIANCE_PREDICATE_HPP_ -#include "gadgetlib1/gadgets/delegated_ra_memory/memory_load_gadget.hpp" -#include "gadgetlib1/gadgets/delegated_ra_memory/memory_load_store_gadget.hpp" -#include "relations/ram_computations/memory/delegated_ra_memory.hpp" -#include "relations/ram_computations/rams/ram_params.hpp" -#include "zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/compliance_predicate.hpp" -#include "zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/cp_handler.hpp" +#include +#include +#include +#include +#include +#include namespace libsnark { @@ -243,6 +243,6 @@ class ram_compliance_predicate_handler : public compliance_predicate_handler #endif // RAM_COMPLIANCE_PREDICATE_HPP_ diff --git a/src/zk_proof_systems/zksnark/ram_zksnark/ram_compliance_predicate.tcc b/libsnark/zk_proof_systems/zksnark/ram_zksnark/ram_compliance_predicate.tcc similarity index 100% rename from src/zk_proof_systems/zksnark/ram_zksnark/ram_compliance_predicate.tcc rename to libsnark/zk_proof_systems/zksnark/ram_zksnark/ram_compliance_predicate.tcc diff --git a/src/zk_proof_systems/zksnark/ram_zksnark/ram_zksnark.hpp b/libsnark/zk_proof_systems/zksnark/ram_zksnark/ram_zksnark.hpp similarity index 96% rename from src/zk_proof_systems/zksnark/ram_zksnark/ram_zksnark.hpp rename to libsnark/zk_proof_systems/zksnark/ram_zksnark/ram_zksnark.hpp index 27eddb4a..9b6f2929 100644 --- a/src/zk_proof_systems/zksnark/ram_zksnark/ram_zksnark.hpp +++ b/libsnark/zk_proof_systems/zksnark/ram_zksnark/ram_zksnark.hpp @@ -42,9 +42,9 @@ #include -#include "zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd.hpp" -#include "zk_proof_systems/zksnark/ram_zksnark/ram_compliance_predicate.hpp" -#include "zk_proof_systems/zksnark/ram_zksnark/ram_zksnark_params.hpp" +#include +#include +#include namespace libsnark { @@ -219,6 +219,6 @@ bool ram_zksnark_verifier(const ram_zksnark_verification_key &v } // libsnark -#include "zk_proof_systems/zksnark/ram_zksnark/ram_zksnark.tcc" +#include #endif // RAM_ZKSNARK_HPP_ diff --git a/src/zk_proof_systems/zksnark/ram_zksnark/ram_zksnark.tcc b/libsnark/zk_proof_systems/zksnark/ram_zksnark/ram_zksnark.tcc similarity index 100% rename from src/zk_proof_systems/zksnark/ram_zksnark/ram_zksnark.tcc rename to libsnark/zk_proof_systems/zksnark/ram_zksnark/ram_zksnark.tcc diff --git a/src/zk_proof_systems/zksnark/ram_zksnark/ram_zksnark_params.hpp b/libsnark/zk_proof_systems/zksnark/ram_zksnark/ram_zksnark_params.hpp similarity index 100% rename from src/zk_proof_systems/zksnark/ram_zksnark/ram_zksnark_params.hpp rename to libsnark/zk_proof_systems/zksnark/ram_zksnark/ram_zksnark_params.hpp diff --git a/src/zk_proof_systems/zksnark/ram_zksnark/tests/test_ram_zksnark.cpp b/libsnark/zk_proof_systems/zksnark/ram_zksnark/tests/test_ram_zksnark.cpp similarity index 80% rename from src/zk_proof_systems/zksnark/ram_zksnark/tests/test_ram_zksnark.cpp rename to libsnark/zk_proof_systems/zksnark/ram_zksnark/tests/test_ram_zksnark.cpp index 8cf7c368..73dfc321 100644 --- a/src/zk_proof_systems/zksnark/ram_zksnark/tests/test_ram_zksnark.cpp +++ b/libsnark/zk_proof_systems/zksnark/ram_zksnark/tests/test_ram_zksnark.cpp @@ -5,10 +5,10 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ #include -#include "common/default_types/ram_zksnark_pp.hpp" -#include "relations/ram_computations/rams/tinyram/tinyram_params.hpp" -#include "zk_proof_systems/zksnark/ram_zksnark/examples/run_ram_zksnark.hpp" -#include "relations/ram_computations/rams/examples/ram_examples.hpp" +#include +#include +#include +#include using namespace libsnark; From c1df6b5a027762545b821921bf0eec17c7bda0ec Mon Sep 17 00:00:00 2001 From: Aleksejs Popovs Date: Wed, 21 Jun 2017 22:51:16 -0400 Subject: [PATCH 4/4] Fix some gadgetlib2 includes I missed. --- libsnark/gadgetlib2/tests/adapters_UTEST.cpp | 7 +++---- libsnark/gadgetlib2/tests/constraint_UTEST.cpp | 4 ++-- libsnark/gadgetlib2/tests/gadget_UTEST.cpp | 6 +++--- libsnark/gadgetlib2/tests/integration_UTEST.cpp | 6 +++--- libsnark/gadgetlib2/tests/protoboard_UTEST.cpp | 4 ++-- libsnark/gadgetlib2/tests/variable_UTEST.cpp | 4 ++-- 6 files changed, 15 insertions(+), 16 deletions(-) diff --git a/libsnark/gadgetlib2/tests/adapters_UTEST.cpp b/libsnark/gadgetlib2/tests/adapters_UTEST.cpp index dd34df39..d07eba04 100644 --- a/libsnark/gadgetlib2/tests/adapters_UTEST.cpp +++ b/libsnark/gadgetlib2/tests/adapters_UTEST.cpp @@ -1,5 +1,4 @@ -/** @file - ***************************************************************************** +/** @file ***************************************************************************** Unit tests for gadgetlib2 ***************************************************************************** * @author This file is part of libsnark, developed by SCIPR Lab @@ -8,8 +7,8 @@ *****************************************************************************/ #include -#include -#include +#include +#include using namespace gadgetlib2; diff --git a/libsnark/gadgetlib2/tests/constraint_UTEST.cpp b/libsnark/gadgetlib2/tests/constraint_UTEST.cpp index be7b31ec..94b74890 100644 --- a/libsnark/gadgetlib2/tests/constraint_UTEST.cpp +++ b/libsnark/gadgetlib2/tests/constraint_UTEST.cpp @@ -8,8 +8,8 @@ *****************************************************************************/ #include -#include -#include +#include +#include #include "third_party/gtest/googletest/include/gtest/gtest.h" diff --git a/libsnark/gadgetlib2/tests/gadget_UTEST.cpp b/libsnark/gadgetlib2/tests/gadget_UTEST.cpp index 44aaf01c..d34bc91c 100644 --- a/libsnark/gadgetlib2/tests/gadget_UTEST.cpp +++ b/libsnark/gadgetlib2/tests/gadget_UTEST.cpp @@ -10,9 +10,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include using ::std::cerr; using ::std::cout; diff --git a/libsnark/gadgetlib2/tests/integration_UTEST.cpp b/libsnark/gadgetlib2/tests/integration_UTEST.cpp index f2ba3a86..39fb356e 100644 --- a/libsnark/gadgetlib2/tests/integration_UTEST.cpp +++ b/libsnark/gadgetlib2/tests/integration_UTEST.cpp @@ -7,9 +7,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/libsnark/gadgetlib2/tests/protoboard_UTEST.cpp b/libsnark/gadgetlib2/tests/protoboard_UTEST.cpp index 3cad068a..5ff85b1f 100644 --- a/libsnark/gadgetlib2/tests/protoboard_UTEST.cpp +++ b/libsnark/gadgetlib2/tests/protoboard_UTEST.cpp @@ -8,8 +8,8 @@ *****************************************************************************/ #include -#include -#include +#include +#include using namespace gadgetlib2; diff --git a/libsnark/gadgetlib2/tests/variable_UTEST.cpp b/libsnark/gadgetlib2/tests/variable_UTEST.cpp index 3848f8ee..100b79a1 100644 --- a/libsnark/gadgetlib2/tests/variable_UTEST.cpp +++ b/libsnark/gadgetlib2/tests/variable_UTEST.cpp @@ -8,8 +8,8 @@ *****************************************************************************/ #include -#include -#include +#include +#include #include "third_party/gtest/googletest/include/gtest/gtest.h"