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/CMakeLists.txt b/src/CMakeLists.txt index 077fc301..3919e73b 100644 --- a/src/CMakeLists.txt +++ b/src/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/src/common/data_structures/accumulation_vector.hpp index 37e0c984..685aa904 100644 --- a/src/common/data_structures/accumulation_vector.hpp +++ b/src/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 "sparse_vector.hpp" namespace libsnark { @@ -69,6 +69,6 @@ std::istream& operator>>(std::istream &in, accumulation_vector &v); } // libsnark -#include "common/data_structures/accumulation_vector.tcc" +#include "accumulation_vector.tcc" #endif // ACCUMULATION_VECTOR_HPP_ diff --git a/src/common/data_structures/integer_permutation.cpp b/src/common/data_structures/integer_permutation.cpp index 378ea7ee..c044d45c 100644 --- a/src/common/data_structures/integer_permutation.cpp +++ b/src/common/data_structures/integer_permutation.cpp @@ -11,7 +11,7 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include "common/data_structures/integer_permutation.hpp" +#include "integer_permutation.hpp" #include #include diff --git a/src/common/data_structures/merkle_tree.hpp b/src/common/data_structures/merkle_tree.hpp index 46787ee7..e9449849 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 { @@ -66,6 +66,6 @@ class merkle_tree { } // libsnark -#include "common/data_structures/merkle_tree.tcc" +#include "merkle_tree.tcc" #endif // MERKLE_TREE_HPP_ 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..45c81a95 100644 --- a/src/common/data_structures/set_commitment.cpp +++ b/src/common/data_structures/set_commitment.cpp @@ -5,8 +5,8 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include "common/data_structures/set_commitment.hpp" -#include "common/serialization.hpp" +#include "set_commitment.hpp" +#include namespace libsnark { diff --git a/src/common/data_structures/set_commitment.hpp b/src/common/data_structures/set_commitment.hpp index d84cb87d..b48ce4e2 100644 --- a/src/common/data_structures/set_commitment.hpp +++ b/src/common/data_structures/set_commitment.hpp @@ -12,9 +12,9 @@ #ifndef SET_COMMITMENT_HPP_ #define SET_COMMITMENT_HPP_ -#include "common/utils.hpp" -#include "common/data_structures/merkle_tree.hpp" -#include "gadgetlib1/gadgets/hashes/hash_io.hpp" // TODO: the current structure is suboptimal +#include +#include "merkle_tree.hpp" +#include "../../gadgetlib1/gadgets/hashes/hash_io.hpp" // 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 "set_commitment.tcc" #endif // SET_COMMITMENT_HPP_ diff --git a/src/common/data_structures/sparse_vector.hpp b/src/common/data_structures/sparse_vector.hpp index 552a8ae9..db3fd7f3 100644 --- a/src/common/data_structures/sparse_vector.hpp +++ b/src/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 "sparse_vector.tcc" #endif // SPARSE_VECTOR_HPP_ 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_ppzkadsnark_pp.cpp b/src/common/default_types/r1cs_ppzkadsnark_pp.cpp index aab2efe9..73ba3f6e 100644 --- a/src/common/default_types/r1cs_ppzkadsnark_pp.cpp +++ b/src/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 "r1cs_ppzkadsnark_pp.hpp" namespace libsnark { diff --git a/src/common/default_types/r1cs_ppzkadsnark_pp.hpp b/src/common/default_types/r1cs_ppzkadsnark_pp.hpp index b35d3d79..dd98f686 100644 --- a/src/common/default_types/r1cs_ppzkadsnark_pp.hpp +++ b/src/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 "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" namespace libsnark { diff --git a/src/common/default_types/r1cs_ppzkpcd_pp.cpp b/src/common/default_types/r1cs_ppzkpcd_pp.cpp index 9281f5ab..7643d0ef 100644 --- a/src/common/default_types/r1cs_ppzkpcd_pp.cpp +++ b/src/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 "r1cs_ppzkpcd_pp.hpp" namespace libsnark { 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/ram_ppzksnark_pp.hpp b/src/common/default_types/ram_ppzksnark_pp.hpp index 2e7c15b9..7171fbbf 100644 --- a/src/common/default_types/ram_ppzksnark_pp.hpp +++ b/src/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 "tinyram_ppzksnark_pp.hpp" namespace libsnark { diff --git a/src/common/default_types/ram_zksnark_pp.hpp b/src/common/default_types/ram_zksnark_pp.hpp index 806b9783..946e82ca 100644 --- a/src/common/default_types/ram_zksnark_pp.hpp +++ b/src/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 "tinyram_zksnark_pp.hpp" namespace libsnark { 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/tinyram_ppzksnark_pp.cpp b/src/common/default_types/tinyram_ppzksnark_pp.cpp index 5daba1a9..71e6e9f6 100644 --- a/src/common/default_types/tinyram_ppzksnark_pp.cpp +++ b/src/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 "tinyram_ppzksnark_pp.hpp" namespace libsnark { diff --git a/src/common/default_types/tinyram_ppzksnark_pp.hpp b/src/common/default_types/tinyram_ppzksnark_pp.hpp index e1010b5d..49a98e77 100644 --- a/src/common/default_types/tinyram_ppzksnark_pp.hpp +++ b/src/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 "r1cs_ppzksnark_pp.hpp" +#include "../../relations/ram_computations/rams/tinyram/tinyram_params.hpp" namespace libsnark { diff --git a/src/common/default_types/tinyram_zksnark_pp.cpp b/src/common/default_types/tinyram_zksnark_pp.cpp index bd2c0578..34c8e928 100644 --- a/src/common/default_types/tinyram_zksnark_pp.cpp +++ b/src/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 "tinyram_zksnark_pp.hpp" namespace libsnark { diff --git a/src/common/default_types/tinyram_zksnark_pp.hpp b/src/common/default_types/tinyram_zksnark_pp.hpp index e3824729..6c37ced8 100644 --- a/src/common/default_types/tinyram_zksnark_pp.hpp +++ b/src/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 "r1cs_ppzkpcd_pp.hpp" +#include "../../relations/ram_computations/rams/tinyram/tinyram_params.hpp" namespace libsnark { 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.cpp b/src/common/routing_algorithms/as_waksman_routing_algorithm.cpp index 8ef90175..25cee807 100644 --- a/src/common/routing_algorithms/as_waksman_routing_algorithm.cpp +++ b/src/common/routing_algorithms/as_waksman_routing_algorithm.cpp @@ -13,7 +13,7 @@ #include -#include "common/routing_algorithms/as_waksman_routing_algorithm.hpp" +#include "as_waksman_routing_algorithm.hpp" namespace libsnark { diff --git a/src/common/routing_algorithms/as_waksman_routing_algorithm.hpp b/src/common/routing_algorithms/as_waksman_routing_algorithm.hpp index 073bda16..90be6a50 100644 --- a/src/common/routing_algorithms/as_waksman_routing_algorithm.hpp +++ b/src/common/routing_algorithms/as_waksman_routing_algorithm.hpp @@ -42,8 +42,8 @@ #include #include -#include "common/utils.hpp" -#include "common/data_structures/integer_permutation.hpp" +#include +#include "../data_structures/integer_permutation.hpp" namespace libsnark { diff --git a/src/common/routing_algorithms/benes_routing_algorithm.cpp b/src/common/routing_algorithms/benes_routing_algorithm.cpp index 6b9594b6..15c9e15c 100644 --- a/src/common/routing_algorithms/benes_routing_algorithm.cpp +++ b/src/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 "benes_routing_algorithm.hpp" #include namespace libsnark { diff --git a/src/common/routing_algorithms/benes_routing_algorithm.hpp b/src/common/routing_algorithms/benes_routing_algorithm.hpp index 4f3f0fd8..82606a02 100644 --- a/src/common/routing_algorithms/benes_routing_algorithm.hpp +++ b/src/common/routing_algorithms/benes_routing_algorithm.hpp @@ -27,8 +27,8 @@ #include -#include "common/data_structures/integer_permutation.hpp" -#include "common/utils.hpp" +#include "../data_structures/integer_permutation.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..e3a8cece 100644 --- a/src/common/routing_algorithms/profiling/profile_routing_algorithms.cpp +++ b/src/common/routing_algorithms/profiling/profile_routing_algorithms.cpp @@ -11,9 +11,9 @@ #include -#include "common/profiling.hpp" -#include "common/routing_algorithms/as_waksman_routing_algorithm.hpp" -#include "common/routing_algorithms/benes_routing_algorithm.hpp" +#include +#include "../as_waksman_routing_algorithm.hpp" +#include "../benes_routing_algorithm.hpp" using namespace libsnark; diff --git a/src/common/routing_algorithms/tests/test_routing_algorithms.cpp b/src/common/routing_algorithms/tests/test_routing_algorithms.cpp index e637c5d8..6ad3b0f8 100644 --- a/src/common/routing_algorithms/tests/test_routing_algorithms.cpp +++ b/src/common/routing_algorithms/tests/test_routing_algorithms.cpp @@ -11,9 +11,9 @@ #include -#include "common/profiling.hpp" -#include "common/routing_algorithms/benes_routing_algorithm.hpp" -#include "common/routing_algorithms/as_waksman_routing_algorithm.hpp" +#include +#include "../benes_routing_algorithm.hpp" +#include "../as_waksman_routing_algorithm.hpp" using namespace libsnark; diff --git a/src/gadgetlib1/constraint_profiling.cpp b/src/gadgetlib1/constraint_profiling.cpp index 706c244d..1b63c577 100644 --- a/src/gadgetlib1/constraint_profiling.cpp +++ b/src/gadgetlib1/constraint_profiling.cpp @@ -11,8 +11,8 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include "gadgetlib1/constraint_profiling.hpp" -#include "common/profiling.hpp" +#include "constraint_profiling.hpp" +#include namespace libsnark { diff --git a/src/gadgetlib1/examples/simple_example.hpp b/src/gadgetlib1/examples/simple_example.hpp index e2a47742..95560fcd 100644 --- a/src/gadgetlib1/examples/simple_example.hpp +++ b/src/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 "../../relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp" 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 "simple_example.tcc" #endif // SIMPLE_EXAMPLE_HPP_ diff --git a/src/gadgetlib1/examples/simple_example.tcc b/src/gadgetlib1/examples/simple_example.tcc index c7418f58..3885a7b8 100644 --- a/src/gadgetlib1/examples/simple_example.tcc +++ b/src/gadgetlib1/examples/simple_example.tcc @@ -8,7 +8,7 @@ #ifndef SIMPLE_EXAMPLE_TCC_ #define SIMPLE_EXAMPLE_TCC_ -#include "gadgetlib1/gadgets/basic_gadgets.hpp" +#include "../gadgets/basic_gadgets.hpp" namespace libsnark { diff --git a/src/gadgetlib1/gadget.hpp b/src/gadgetlib1/gadget.hpp index dbeaa9d4..8c208ae9 100644 --- a/src/gadgetlib1/gadget.hpp +++ b/src/gadgetlib1/gadget.hpp @@ -8,7 +8,7 @@ #ifndef GADGET_HPP_ #define GADGET_HPP_ -#include "gadgetlib1/protoboard.hpp" +#include "protoboard.hpp" namespace libsnark { @@ -22,6 +22,6 @@ class gadget { }; } // libsnark -#include "gadgetlib1/gadget.tcc" +#include "gadget.tcc" #endif // GADGET_HPP_ diff --git a/src/gadgetlib1/gadgets/basic_gadgets.hpp b/src/gadgetlib1/gadgets/basic_gadgets.hpp index 08e596be..e0d83ad1 100644 --- a/src/gadgetlib1/gadgets/basic_gadgets.hpp +++ b/src/gadgetlib1/gadgets/basic_gadgets.hpp @@ -11,7 +11,7 @@ #include #include -#include "gadgetlib1/gadget.hpp" +#include "../gadget.hpp" namespace libsnark { @@ -346,6 +346,6 @@ void create_linear_combination_witness(protoboard &pb, const VarT &target); } // libsnark -#include "gadgetlib1/gadgets/basic_gadgets.tcc" +#include "basic_gadgets.tcc" #endif // BASIC_GADGETS_HPP_ 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/components/bar_gadget.hpp b/src/gadgetlib1/gadgets/cpu_checkers/fooram/components/bar_gadget.hpp index 0e280323..f751f689 100644 --- a/src/gadgetlib1/gadgets/cpu_checkers/fooram/components/bar_gadget.hpp +++ b/src/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 "../../../../gadget.hpp" +#include "../../../basic_gadgets.hpp" namespace libsnark { @@ -59,6 +59,6 @@ class bar_gadget : public gadget { } // libsnark -#include "gadgetlib1/gadgets/cpu_checkers/fooram/components/bar_gadget.tcc" +#include "bar_gadget.tcc" #endif // BAR_GADGET_HPP_ diff --git a/src/gadgetlib1/gadgets/cpu_checkers/fooram/components/fooram_protoboard.hpp b/src/gadgetlib1/gadgets/cpu_checkers/fooram/components/fooram_protoboard.hpp index d8c3ca86..ee5dc279 100644 --- a/src/gadgetlib1/gadgets/cpu_checkers/fooram/components/fooram_protoboard.hpp +++ b/src/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 "../../../../gadget.hpp" +#include "../../../../../relations/ram_computations/rams/fooram/fooram_aux.hpp" namespace libsnark { @@ -35,6 +35,6 @@ class fooram_gadget : public gadget { } // libsnark -#include "gadgetlib1/gadgets/cpu_checkers/fooram/components/fooram_protoboard.tcc" +#include "fooram_protoboard.tcc" #endif // FOORAM_PROTOBOARD_HPP_ 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..e4a8ff5b 100644 --- a/src/gadgetlib1/gadgets/cpu_checkers/fooram/examples/test_fooram.cpp +++ b/src/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 "common/utils.hpp" -#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 "../../../../../common/default_types/r1cs_ppzksnark_pp.hpp" +#include "../../../../../common/default_types/r1cs_ppzkpcd_pp.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" -#include "relations/ram_computations/rams/fooram/fooram_params.hpp" +#include "../../../../../relations/ram_computations/rams/fooram/fooram_params.hpp" namespace libsnark { 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..d293e105 100644 --- a/src/gadgetlib1/gadgets/cpu_checkers/fooram/fooram_cpu_checker.hpp +++ b/src/gadgetlib1/gadgets/cpu_checkers/fooram/fooram_cpu_checker.hpp @@ -28,12 +28,12 @@ #include #include -#include "common/serialization.hpp" -#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 "../../../gadget.hpp" +#include "../../basic_gadgets.hpp" +#include "components/fooram_protoboard.hpp" +#include "components/bar_gadget.hpp" +#include "../../../../relations/ram_computations/memory/memory_interface.hpp" 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 "fooram_cpu_checker.tcc" #endif // FORAM_CPU_CHECKER_HPP_ diff --git a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_arithmetic.hpp b/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_arithmetic.hpp index dcf30c39..f33bce9f 100644 --- a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_arithmetic.hpp +++ b/src/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 "tinyram_protoboard.hpp" +#include "../../../basic_gadgets.hpp" 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 "alu_arithmetic.tcc" #endif // ALU_ARITHMETIC_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 c22a8c10..a8172146 100644 --- a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_arithmetic.tcc +++ b/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_arithmetic.tcc @@ -14,8 +14,10 @@ #ifndef ALU_ARITHMETIC_TCC_ #define ALU_ARITHMETIC_TCC_ -#include "common/profiling.hpp" -#include "common/utils.hpp" +#include + +#include +#include namespace libsnark { diff --git a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_control_flow.hpp b/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_control_flow.hpp index 9287825a..1efbb005 100644 --- a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_control_flow.hpp +++ b/src/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 "tinyram_protoboard.hpp" +#include "../../../basic_gadgets.hpp" namespace libsnark { @@ -97,6 +97,6 @@ void test_ALU_cnjmp_gadget(); } // libsnark -#include "gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_control_flow.tcc" +#include "alu_control_flow.tcc" #endif // ALU_CONTROL_FLOW_HPP_ 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/components/alu_gadget.hpp b/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_gadget.hpp index 8466fe09..23887717 100644 --- a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_gadget.hpp +++ b/src/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 "alu_arithmetic.hpp" +#include "alu_control_flow.hpp" 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 "alu_gadget.tcc" #endif // ALU_GADGET_HPP_ diff --git a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/argument_decoder_gadget.hpp b/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/argument_decoder_gadget.hpp index 5f6f0e86..ce0728d3 100644 --- a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/argument_decoder_gadget.hpp +++ b/src/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 "argument_decoder_gadget.tcc" #endif // ARGUMENT_DECODER_GADGET_HPP_ diff --git a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/consistency_enforcer_gadget.hpp b/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/consistency_enforcer_gadget.hpp index fdf6c0a2..6e612e05 100644 --- a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/consistency_enforcer_gadget.hpp +++ b/src/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 "consistency_enforcer_gadget.tcc" #endif // CONSISTENCY_ENFORCER_GADGET_HPP_ diff --git a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/instruction_packing_gadget.hpp b/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/instruction_packing_gadget.hpp index 8f247d14..5f18585d 100644 --- a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/instruction_packing_gadget.hpp +++ b/src/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 "instruction_packing_gadget.tcc" #endif // INSTRUCTION_PACKING_GADGET_HPP_ diff --git a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/memory_masking_gadget.hpp b/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/memory_masking_gadget.hpp index 5096aa3a..81f55e7c 100644 --- a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/memory_masking_gadget.hpp +++ b/src/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 "memory_masking_gadget.tcc" #endif // MEMORY_MASKING_GADGET_HPP_ diff --git a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/tinyram_protoboard.hpp b/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/tinyram_protoboard.hpp index c84ea7c6..f8a795ef 100644 --- a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/tinyram_protoboard.hpp +++ b/src/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 "../../../../../relations/ram_computations/rams/ram_params.hpp" +#include "../../../../../relations/ram_computations/rams/tinyram/tinyram_aux.hpp" +#include "../../../../protoboard.hpp" +#include "../../../basic_gadgets.hpp" 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 "tinyram_protoboard.tcc" #endif // TINYRAM_PROTOBOARD_HPP_ diff --git a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/word_variable_gadget.hpp b/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/word_variable_gadget.hpp index 24c462bd..8e5312ca 100644 --- a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/components/word_variable_gadget.hpp +++ b/src/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 "tinyram_protoboard.hpp" namespace libsnark { diff --git a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/tinyram_cpu_checker.hpp b/src/gadgetlib1/gadgets/cpu_checkers/tinyram/tinyram_cpu_checker.hpp index 3168ec3e..4ee32e79 100644 --- a/src/gadgetlib1/gadgets/cpu_checkers/tinyram/tinyram_cpu_checker.hpp +++ b/src/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 "components/tinyram_protoboard.hpp" +#include "components/word_variable_gadget.hpp" +#include "components/alu_gadget.hpp" +#include "components/argument_decoder_gadget.hpp" +#include "components/consistency_enforcer_gadget.hpp" +#include "components/memory_masking_gadget.hpp" 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 "tinyram_cpu_checker.tcc" #endif // TINYRAM_CPU_CHECKER_HPP_ 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_g1_gadget.hpp b/src/gadgetlib1/gadgets/curves/weierstrass_g1_gadget.hpp index 8fee80ff..e38dab91 100644 --- a/src/gadgetlib1/gadgets/curves/weierstrass_g1_gadget.hpp +++ b/src/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 "../../gadget.hpp" +#include "../pairing/pairing_params.hpp" namespace libsnark { @@ -148,6 +148,6 @@ class G1_multiscalar_mul_gadget : public gadget > { } // libsnark -#include "gadgetlib1/gadgets/curves/weierstrass_g1_gadget.tcc" +#include "weierstrass_g1_gadget.tcc" #endif // WEIERSTRASS_G1_GADGET_TCC_ diff --git a/src/gadgetlib1/gadgets/curves/weierstrass_g2_gadget.hpp b/src/gadgetlib1/gadgets/curves/weierstrass_g2_gadget.hpp index 6f5fea08..660673f0 100644 --- a/src/gadgetlib1/gadgets/curves/weierstrass_g2_gadget.hpp +++ b/src/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 "../../gadget.hpp" +#include "../pairing/pairing_params.hpp" namespace libsnark { @@ -79,6 +79,6 @@ class G2_checker_gadget : public gadget > { } // libsnark -#include "gadgetlib1/gadgets/curves/weierstrass_g2_gadget.tcc" +#include "weierstrass_g2_gadget.tcc" #endif // WEIERSTRASS_G2_GADGET_HPP_ 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/delegated_ra_memory/memory_load_gadget.hpp b/src/gadgetlib1/gadgets/delegated_ra_memory/memory_load_gadget.hpp index 09a4c5be..45e0bce3 100644 --- a/src/gadgetlib1/gadgets/delegated_ra_memory/memory_load_gadget.hpp +++ b/src/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 "../merkle_tree/merkle_tree_check_read_gadget.hpp" namespace libsnark { diff --git a/src/gadgetlib1/gadgets/delegated_ra_memory/memory_load_store_gadget.hpp b/src/gadgetlib1/gadgets/delegated_ra_memory/memory_load_store_gadget.hpp index 222a1dc4..0802a595 100644 --- a/src/gadgetlib1/gadgets/delegated_ra_memory/memory_load_store_gadget.hpp +++ b/src/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 "../merkle_tree/merkle_tree_check_update_gadget.hpp" namespace libsnark { diff --git a/src/gadgetlib1/gadgets/fields/exponentiation_gadget.hpp b/src/gadgetlib1/gadgets/fields/exponentiation_gadget.hpp index 6ac84082..9b6b66cd 100644 --- a/src/gadgetlib1/gadgets/fields/exponentiation_gadget.hpp +++ b/src/gadgetlib1/gadgets/fields/exponentiation_gadget.hpp @@ -14,9 +14,9 @@ #include #include -#include "algebra/fields/bigint.hpp" -#include "algebra/scalar_multiplication/wnaf.hpp" -#include "gadgetlib1/gadget.hpp" +#include +#include +#include "../../gadget.hpp" 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 "exponentiation_gadget.tcc" #endif // EXPONENTIATION_GADGET_HPP_ diff --git a/src/gadgetlib1/gadgets/fields/fp2_gadgets.hpp b/src/gadgetlib1/gadgets/fields/fp2_gadgets.hpp index ac968fda..fc3f229b 100644 --- a/src/gadgetlib1/gadgets/fields/fp2_gadgets.hpp +++ b/src/gadgetlib1/gadgets/fields/fp2_gadgets.hpp @@ -15,7 +15,7 @@ #ifndef FP2_GADGETS_HPP_ #define FP2_GADGETS_HPP_ -#include "gadgetlib1/gadget.hpp" +#include "../../gadget.hpp" #include namespace libsnark { @@ -127,6 +127,6 @@ class Fp2_sqr_gadget : public gadget { } // libsnark -#include "gadgetlib1/gadgets/fields/fp2_gadgets.tcc" +#include "fp2_gadgets.tcc" #endif // FP2_GADGETS_HPP_ diff --git a/src/gadgetlib1/gadgets/fields/fp3_gadgets.hpp b/src/gadgetlib1/gadgets/fields/fp3_gadgets.hpp index 4a6f4b13..ea30fe40 100644 --- a/src/gadgetlib1/gadgets/fields/fp3_gadgets.hpp +++ b/src/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 "fp3_gadgets.tcc" #endif // FP3_GADGETS_HPP_ diff --git a/src/gadgetlib1/gadgets/fields/fp4_gadgets.hpp b/src/gadgetlib1/gadgets/fields/fp4_gadgets.hpp index 6ff79fa1..60b3caad 100644 --- a/src/gadgetlib1/gadgets/fields/fp4_gadgets.hpp +++ b/src/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 "fp4_gadgets.tcc" #endif // FP4_GADGETS_HPP_ diff --git a/src/gadgetlib1/gadgets/fields/fp6_gadgets.hpp b/src/gadgetlib1/gadgets/fields/fp6_gadgets.hpp index efb978b4..934fe5cd 100644 --- a/src/gadgetlib1/gadgets/fields/fp6_gadgets.hpp +++ b/src/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 "fp2_gadgets.hpp" namespace libsnark { @@ -200,6 +200,6 @@ class Fp6_cyclotomic_sqr_gadget : public gadget { } // libsnark -#include "gadgetlib1/gadgets/fields/fp6_gadgets.tcc" +#include "fp6_gadgets.tcc" #endif // FP6_GADGETS_HPP_ diff --git a/src/gadgetlib1/gadgets/gadget_from_r1cs.hpp b/src/gadgetlib1/gadgets/gadget_from_r1cs.hpp index e4b8a2ac..18b79d0a 100644 --- a/src/gadgetlib1/gadgets/gadget_from_r1cs.hpp +++ b/src/gadgetlib1/gadgets/gadget_from_r1cs.hpp @@ -14,7 +14,7 @@ #include -#include "gadgetlib1/gadget.hpp" +#include "../gadget.hpp" namespace libsnark { @@ -40,6 +40,6 @@ class gadget_from_r1cs : public gadget { } // libsnark -#include "gadgetlib1/gadgets/gadget_from_r1cs.tcc" +#include "gadget_from_r1cs.tcc" #endif // GADGET_FROM_R1CS_HPP_ diff --git a/src/gadgetlib1/gadgets/hashes/crh_gadget.hpp b/src/gadgetlib1/gadgets/hashes/crh_gadget.hpp index 80338a31..2fc3873f 100644 --- a/src/gadgetlib1/gadgets/hashes/crh_gadget.hpp +++ b/src/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 "knapsack/knapsack_gadget.hpp" namespace libsnark { diff --git a/src/gadgetlib1/gadgets/hashes/digest_selector_gadget.hpp b/src/gadgetlib1/gadgets/hashes/digest_selector_gadget.hpp index a7598b9b..4a53cbc4 100644 --- a/src/gadgetlib1/gadgets/hashes/digest_selector_gadget.hpp +++ b/src/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 "../basic_gadgets.hpp" +#include "hash_io.hpp" namespace libsnark { @@ -37,6 +37,6 @@ class digest_selector_gadget : public gadget { } // libsnark -#include "gadgetlib1/gadgets/hashes/digest_selector_gadget.tcc" +#include "digest_selector_gadget.tcc" #endif // DIGEST_SELECTOR_GADGET_HPP_ diff --git a/src/gadgetlib1/gadgets/hashes/hash_io.hpp b/src/gadgetlib1/gadgets/hashes/hash_io.hpp index 9d88fcdf..36abeb72 100644 --- a/src/gadgetlib1/gadgets/hashes/hash_io.hpp +++ b/src/gadgetlib1/gadgets/hashes/hash_io.hpp @@ -8,7 +8,7 @@ #define HASH_IO_HPP_ #include #include -#include "gadgetlib1/gadgets/basic_gadgets.hpp" +#include "../basic_gadgets.hpp" namespace libsnark { @@ -58,6 +58,6 @@ class block_variable : public gadget { }; } // libsnark -#include "gadgetlib1/gadgets/hashes/hash_io.tcc" +#include "hash_io.tcc" #endif // HASH_IO_HPP_ diff --git a/src/gadgetlib1/gadgets/hashes/knapsack/knapsack_gadget.hpp b/src/gadgetlib1/gadgets/hashes/knapsack/knapsack_gadget.hpp index d3eb15b9..45f90bdb 100644 --- a/src/gadgetlib1/gadgets/hashes/knapsack/knapsack_gadget.hpp +++ b/src/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 "../../basic_gadgets.hpp" +#include "../hash_io.hpp" +#include "../../../../common/data_structures/merkle_tree.hpp" namespace libsnark { @@ -129,6 +129,6 @@ void test_knapsack_CRH_with_bit_out_gadget(); } // libsnark -#include "gadgetlib1/gadgets/hashes/knapsack/knapsack_gadget.tcc" +#include "knapsack_gadget.tcc" #endif // KNAPSACK_GADGET_HPP_ 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..2390141c 100644 --- a/src/gadgetlib1/gadgets/hashes/knapsack/tests/test_knapsack_gadget.cpp +++ b/src/gadgetlib1/gadgets/hashes/knapsack/tests/test_knapsack_gadget.cpp @@ -6,12 +6,12 @@ *****************************************************************************/ #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 "gadgetlib1/gadgets/hashes/knapsack/knapsack_gadget.hpp" +#include +#include +#include +#include "../knapsack_gadget.hpp" namespace libsnark { diff --git a/src/gadgetlib1/gadgets/hashes/sha256/sha256_aux.hpp b/src/gadgetlib1/gadgets/hashes/sha256/sha256_aux.hpp index e0c7a7e0..f616ee13 100644 --- a/src/gadgetlib1/gadgets/hashes/sha256/sha256_aux.hpp +++ b/src/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 "../../basic_gadgets.hpp" namespace libsnark { @@ -155,6 +155,6 @@ class majority_gadget : public gadget { } // libsnark -#include "gadgetlib1/gadgets/hashes/sha256/sha256_aux.tcc" +#include "sha256_aux.tcc" #endif // SHA256_AUX_HPP_ diff --git a/src/gadgetlib1/gadgets/hashes/sha256/sha256_components.hpp b/src/gadgetlib1/gadgets/hashes/sha256/sha256_components.hpp index c2f31e3a..69f50659 100644 --- a/src/gadgetlib1/gadgets/hashes/sha256/sha256_components.hpp +++ b/src/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 "../../basic_gadgets.hpp" +#include "../hash_io.hpp" +#include "sha256_aux.hpp" namespace libsnark { @@ -103,6 +103,6 @@ class sha256_round_function_gadget : public gadget { } // libsnark -#include "gadgetlib1/gadgets/hashes/sha256/sha256_components.tcc" +#include "sha256_components.tcc" #endif // SHA256_COMPONENTS_HPP_ diff --git a/src/gadgetlib1/gadgets/hashes/sha256/sha256_gadget.hpp b/src/gadgetlib1/gadgets/hashes/sha256/sha256_gadget.hpp index 50410cb9..5daa8b9d 100644 --- a/src/gadgetlib1/gadgets/hashes/sha256/sha256_gadget.hpp +++ b/src/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 "../../../../common/data_structures/merkle_tree.hpp" +#include "../../basic_gadgets.hpp" +#include "../hash_io.hpp" +#include "sha256_components.hpp" 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 "sha256_gadget.tcc" #endif // SHA256_GADGET_HPP_ 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..cf705f4e 100644 --- a/src/gadgetlib1/gadgets/hashes/sha256/tests/test_sha256_gadget.cpp +++ b/src/gadgetlib1/gadgets/hashes/sha256/tests/test_sha256_gadget.cpp @@ -5,10 +5,10 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include "common/default_types/ec_pp.hpp" -#include "common/utils.hpp" -#include "common/profiling.hpp" -#include "gadgetlib1/gadgets/hashes/sha256/sha256_gadget.hpp" +#include +#include +#include +#include "../sha256_gadget.hpp" using namespace libsnark; diff --git a/src/gadgetlib1/gadgets/merkle_tree/merkle_authentication_path_variable.hpp b/src/gadgetlib1/gadgets/merkle_tree/merkle_authentication_path_variable.hpp index 0efa7cf4..b0a66928 100644 --- a/src/gadgetlib1/gadgets/merkle_tree/merkle_authentication_path_variable.hpp +++ b/src/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 "../../../common/data_structures/merkle_tree.hpp" +#include "../../gadget.hpp" +#include "../hashes/hash_io.hpp" 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 "merkle_authentication_path_variable.tcc" #endif // MERKLE_AUTHENTICATION_PATH_VARIABLE_HPP diff --git a/src/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_read_gadget.hpp b/src/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_read_gadget.hpp index 2663774c..e014db5d 100644 --- a/src/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_read_gadget.hpp +++ b/src/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 "../../../common/data_structures/merkle_tree.hpp" +#include "../../gadget.hpp" +#include "../hashes/crh_gadget.hpp" +#include "../hashes/hash_io.hpp" +#include "../hashes/digest_selector_gadget.hpp" +#include "merkle_authentication_path_variable.hpp" 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 "merkle_tree_check_read_gadget.tcc" #endif // MERKLE_TREE_CHECK_READ_GADGET_HPP_ diff --git a/src/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_update_gadget.hpp b/src/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_update_gadget.hpp index 2d6840d6..799a475b 100644 --- a/src/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_update_gadget.hpp +++ b/src/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 "../../../common/data_structures/merkle_tree.hpp" +#include "../../gadget.hpp" +#include "../hashes/crh_gadget.hpp" +#include "../hashes/hash_io.hpp" +#include "../hashes/digest_selector_gadget.hpp" +#include "merkle_authentication_path_variable.hpp" 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 "merkle_tree_check_update_gadget.tcc" #endif // MERKLE_TREE_CHECK_UPDATE_GADGET_HPP_ 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..50280200 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,14 +6,14 @@ *****************************************************************************/ #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 "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 +#include "../merkle_tree_check_read_gadget.hpp" +#include "../merkle_tree_check_update_gadget.hpp" +#include "../../hashes/sha256/sha256_gadget.hpp" using namespace libsnark; diff --git a/src/gadgetlib1/gadgets/pairing/mnt_pairing_params.hpp b/src/gadgetlib1/gadgets/pairing/mnt_pairing_params.hpp index 13434b36..fb854f3d 100644 --- a/src/gadgetlib1/gadgets/pairing/mnt_pairing_params.hpp +++ b/src/gadgetlib1/gadgets/pairing/mnt_pairing_params.hpp @@ -16,13 +16,13 @@ #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 "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 "pairing_params.hpp" +#include "../fields/fp2_gadgets.hpp" +#include "../fields/fp4_gadgets.hpp" +#include "../fields/fp3_gadgets.hpp" +#include "../fields/fp6_gadgets.hpp" namespace libsnark { diff --git a/src/gadgetlib1/gadgets/pairing/pairing_checks.hpp b/src/gadgetlib1/gadgets/pairing/pairing_checks.hpp index 19df93f5..f2f24290 100644 --- a/src/gadgetlib1/gadgets/pairing/pairing_checks.hpp +++ b/src/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 "pairing_params.hpp" +#include "weierstrass_miller_loop.hpp" +#include "weierstrass_final_exponentiation.hpp" namespace libsnark { @@ -89,6 +89,6 @@ class check_e_equals_ee_gadget : public gadget > { } // libsnark -#include "gadgetlib1/gadgets/pairing/pairing_checks.tcc" +#include "pairing_checks.tcc" #endif // PAIRING_CHECKS_HPP_ diff --git a/src/gadgetlib1/gadgets/pairing/weierstrass_final_exponentiation.hpp b/src/gadgetlib1/gadgets/pairing/weierstrass_final_exponentiation.hpp index 0d37353f..0eabb37f 100644 --- a/src/gadgetlib1/gadgets/pairing/weierstrass_final_exponentiation.hpp +++ b/src/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 "mnt_pairing_params.hpp" +#include "../fields/exponentiation_gadget.hpp" namespace libsnark { @@ -105,6 +105,6 @@ class mnt6_final_exp_gadget : public gadget > { } // libsnark -#include "gadgetlib1/gadgets/pairing/weierstrass_final_exponentiation.tcc" +#include "weierstrass_final_exponentiation.tcc" #endif // WEIERSTRASS_FINAL_EXPONENTIATION_HPP_ diff --git a/src/gadgetlib1/gadgets/pairing/weierstrass_final_exponentiation.tcc b/src/gadgetlib1/gadgets/pairing/weierstrass_final_exponentiation.tcc index ba3f7cdc..2090e187 100644 --- a/src/gadgetlib1/gadgets/pairing/weierstrass_final_exponentiation.tcc +++ b/src/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 "../basic_gadgets.hpp" +#include "mnt_pairing_params.hpp" namespace libsnark { diff --git a/src/gadgetlib1/gadgets/pairing/weierstrass_miller_loop.hpp b/src/gadgetlib1/gadgets/pairing/weierstrass_miller_loop.hpp index 9afa4bce..3a567402 100644 --- a/src/gadgetlib1/gadgets/pairing/weierstrass_miller_loop.hpp +++ b/src/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 "pairing_params.hpp" +#include "weierstrass_precomputation.hpp" 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 "weierstrass_miller_loop.tcc" #endif // WEIERSTRASS_MILLER_LOOP_HPP_ diff --git a/src/gadgetlib1/gadgets/pairing/weierstrass_miller_loop.tcc b/src/gadgetlib1/gadgets/pairing/weierstrass_miller_loop.tcc index 348c20ef..6e064468 100644 --- a/src/gadgetlib1/gadgets/pairing/weierstrass_miller_loop.tcc +++ b/src/gadgetlib1/gadgets/pairing/weierstrass_miller_loop.tcc @@ -14,9 +14,9 @@ #ifndef WEIERSTRASS_MILLER_LOOP_TCC_ #define WEIERSTRASS_MILLER_LOOP_TCC_ -#include "algebra/scalar_multiplication/wnaf.hpp" -#include "gadgetlib1/constraint_profiling.hpp" -#include "gadgetlib1/gadgets/basic_gadgets.hpp" +#include +#include "../../constraint_profiling.hpp" +#include "../basic_gadgets.hpp" namespace libsnark { diff --git a/src/gadgetlib1/gadgets/pairing/weierstrass_precomputation.hpp b/src/gadgetlib1/gadgets/pairing/weierstrass_precomputation.hpp index ce018672..3de72bb3 100644 --- a/src/gadgetlib1/gadgets/pairing/weierstrass_precomputation.hpp +++ b/src/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 "../curves/weierstrass_g1_gadget.hpp" +#include "../curves/weierstrass_g2_gadget.hpp" +#include "pairing_params.hpp" namespace libsnark { @@ -275,6 +275,6 @@ void test_G2_variable_precomp(const std::string &annotation); } // libsnark -#include "gadgetlib1/gadgets/pairing/weierstrass_precomputation.tcc" +#include "weierstrass_precomputation.tcc" #endif // WEIERSTRASS_PRECOMPUTATION_HPP_ diff --git a/src/gadgetlib1/gadgets/pairing/weierstrass_precomputation.tcc b/src/gadgetlib1/gadgets/pairing/weierstrass_precomputation.tcc index eb8c4e95..e7c22780 100644 --- a/src/gadgetlib1/gadgets/pairing/weierstrass_precomputation.tcc +++ b/src/gadgetlib1/gadgets/pairing/weierstrass_precomputation.tcc @@ -15,7 +15,7 @@ #define WEIERSTRASS_PRECOMPUTATION_TCC_ #include -#include "gadgetlib1/gadgets/pairing/mnt_pairing_params.hpp" +#include "mnt_pairing_params.hpp" namespace libsnark { diff --git a/src/gadgetlib1/gadgets/routing/as_waksman_routing_gadget.hpp b/src/gadgetlib1/gadgets/routing/as_waksman_routing_gadget.hpp index 8fc606d6..e0975ac2 100644 --- a/src/gadgetlib1/gadgets/routing/as_waksman_routing_gadget.hpp +++ b/src/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 "../../protoboard.hpp" +#include "../basic_gadgets.hpp" +#include "../../../common/data_structures/integer_permutation.hpp" +#include "../../../common/routing_algorithms/as_waksman_routing_algorithm.hpp" 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 "as_waksman_routing_gadget.tcc" #endif // AS_WAKSMAN_ROUTING_GADGET_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..cb0f2931 100644 --- a/src/gadgetlib1/gadgets/routing/as_waksman_routing_gadget.tcc +++ b/src/gadgetlib1/gadgets/routing/as_waksman_routing_gadget.tcc @@ -16,8 +16,8 @@ #include -#include "common/routing_algorithms/as_waksman_routing_algorithm.hpp" -#include "common/profiling.hpp" +#include "../../../common/routing_algorithms/as_waksman_routing_algorithm.hpp" +#include namespace libsnark { diff --git a/src/gadgetlib1/gadgets/routing/benes_routing_gadget.hpp b/src/gadgetlib1/gadgets/routing/benes_routing_gadget.hpp index 5d4edb4c..68c352ca 100644 --- a/src/gadgetlib1/gadgets/routing/benes_routing_gadget.hpp +++ b/src/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 "../../../common/data_structures/integer_permutation.hpp" +#include "../../../common/routing_algorithms/benes_routing_algorithm.hpp" +#include "../basic_gadgets.hpp" +#include "../../protoboard.hpp" 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 "benes_routing_gadget.tcc" #endif // BENES_ROUTING_GADGET_HPP_ 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..4b42aeac 100644 --- a/src/gadgetlib1/gadgets/routing/profiling/profile_routing_gadgets.cpp +++ b/src/gadgetlib1/gadgets/routing/profiling/profile_routing_gadgets.cpp @@ -11,10 +11,10 @@ #include -#include "common/default_types/ec_pp.hpp" -#include "common/profiling.hpp" -#include "gadgetlib1/gadgets/routing/benes_routing_gadget.hpp" -#include "gadgetlib1/gadgets/routing/as_waksman_routing_gadget.hpp" +#include +#include +#include "../benes_routing_gadget.hpp" +#include "../as_waksman_routing_gadget.hpp" using namespace libsnark; diff --git a/src/gadgetlib1/gadgets/set_commitment/set_commitment_gadget.hpp b/src/gadgetlib1/gadgets/set_commitment/set_commitment_gadget.hpp index faafa07d..c6a74b70 100644 --- a/src/gadgetlib1/gadgets/set_commitment/set_commitment_gadget.hpp +++ b/src/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 "../../gadget.hpp" +#include "../basic_gadgets.hpp" +#include "../hashes/hash_io.hpp" +#include "../merkle_tree/merkle_tree_check_read_gadget.hpp" +#include "set_membership_proof_variable.hpp" namespace libsnark { @@ -52,6 +52,6 @@ void test_set_commitment_gadget(); } // libsnark -#include "gadgetlib1/gadgets/set_commitment/set_commitment_gadget.tcc" +#include "set_commitment_gadget.tcc" #endif // SET_COMMITMENT_GADGET_HPP_ diff --git a/src/gadgetlib1/gadgets/set_commitment/set_commitment_gadget.tcc b/src/gadgetlib1/gadgets/set_commitment/set_commitment_gadget.tcc index 0a4cebc7..f0280391 100644 --- a/src/gadgetlib1/gadgets/set_commitment/set_commitment_gadget.tcc +++ b/src/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 "../../../common/data_structures/set_commitment.hpp" namespace libsnark { diff --git a/src/gadgetlib1/gadgets/set_commitment/set_membership_proof_variable.hpp b/src/gadgetlib1/gadgets/set_commitment/set_membership_proof_variable.hpp index 4aa9a02b..7308c78d 100644 --- a/src/gadgetlib1/gadgets/set_commitment/set_membership_proof_variable.hpp +++ b/src/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 "../../../common/data_structures/set_commitment.hpp" +#include "../../gadget.hpp" +#include "../hashes/hash_io.hpp" +#include "../merkle_tree/merkle_authentication_path_variable.hpp" 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 "set_membership_proof_variable.tcc" #endif // SET_MEMBERSHIP_PROOF_VARIABLE_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..c5b247d6 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,13 +6,13 @@ *****************************************************************************/ #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 "gadgetlib1/gadgets/set_commitment/set_commitment_gadget.hpp" -#include "gadgetlib1/gadgets/hashes/sha256/sha256_gadget.hpp" +#include +#include +#include +#include "../set_commitment_gadget.hpp" +#include "../../hashes/sha256/sha256_gadget.hpp" using namespace libsnark; diff --git a/src/gadgetlib1/gadgets/verifiers/r1cs_ppzksnark_verifier_gadget.hpp b/src/gadgetlib1/gadgets/verifiers/r1cs_ppzksnark_verifier_gadget.hpp index c786977b..020ed410 100644 --- a/src/gadgetlib1/gadgets/verifiers/r1cs_ppzksnark_verifier_gadget.hpp +++ b/src/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 "../basic_gadgets.hpp" +#include "../curves/weierstrass_g1_gadget.hpp" +#include "../curves/weierstrass_g2_gadget.hpp" +#include "../pairing/pairing_checks.hpp" +#include "../pairing/pairing_params.hpp" +#include "../../../zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp" namespace libsnark { @@ -245,6 +245,6 @@ class r1cs_ppzksnark_verifier_gadget : public gadget > { } // libsnark -#include "gadgetlib1/gadgets/verifiers/r1cs_ppzksnark_verifier_gadget.tcc" +#include "r1cs_ppzksnark_verifier_gadget.tcc" #endif // R1CS_PPZKSNARK_VERIFIER_GADGET_HPP_ diff --git a/src/gadgetlib1/gadgets/verifiers/r1cs_ppzksnark_verifier_gadget.tcc b/src/gadgetlib1/gadgets/verifiers/r1cs_ppzksnark_verifier_gadget.tcc index 1439e9df..2968e32f 100644 --- a/src/gadgetlib1/gadgets/verifiers/r1cs_ppzksnark_verifier_gadget.tcc +++ b/src/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 "../../constraint_profiling.hpp" namespace libsnark { 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..fe9477d1 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,16 +4,16 @@ * 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 "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 "../../fields/fp2_gadgets.hpp" +#include "../../fields/fp3_gadgets.hpp" +#include "../../fields/fp4_gadgets.hpp" +#include "../../fields/fp6_gadgets.hpp" +#include "../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" using namespace libsnark; diff --git a/src/gadgetlib1/pb_variable.hpp b/src/gadgetlib1/pb_variable.hpp index fcdd4580..afa1c386 100644 --- a/src/gadgetlib1/pb_variable.hpp +++ b/src/gadgetlib1/pb_variable.hpp @@ -11,8 +11,8 @@ #include #include #include -#include "common/utils.hpp" -#include "relations/variable.hpp" +#include +#include "../relations/variable.hpp" 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 "pb_variable.tcc" #endif // PB_VARIABLE_HPP_ diff --git a/src/gadgetlib1/pb_variable.tcc b/src/gadgetlib1/pb_variable.tcc index 71a5c5ab..57532efe 100644 --- a/src/gadgetlib1/pb_variable.tcc +++ b/src/gadgetlib1/pb_variable.tcc @@ -8,8 +8,8 @@ #ifndef PB_VARIABLE_TCC_ #define PB_VARIABLE_TCC_ #include -#include "gadgetlib1/protoboard.hpp" -#include "common/utils.hpp" +#include "protoboard.hpp" +#include namespace libsnark { diff --git a/src/gadgetlib1/protoboard.hpp b/src/gadgetlib1/protoboard.hpp index a9c30b46..db64c1c9 100644 --- a/src/gadgetlib1/protoboard.hpp +++ b/src/gadgetlib1/protoboard.hpp @@ -13,9 +13,9 @@ #include #include #include -#include "gadgetlib1/pb_variable.hpp" -#include "relations/constraint_satisfaction_problems/r1cs/r1cs.hpp" -#include "common/utils.hpp" +#include "pb_variable.hpp" +#include "../relations/constraint_satisfaction_problems/r1cs/r1cs.hpp" +#include namespace libsnark { @@ -71,5 +71,5 @@ class protoboard { }; } // libsnark -#include "gadgetlib1/protoboard.tcc" +#include "protoboard.tcc" #endif // PROTOBOARD_HPP_ 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/gadgetlib1/tests/gadgetlib1_test.cpp b/src/gadgetlib1/tests/gadgetlib1_test.cpp index 664f243c..3e3dfcca 100644 --- a/src/gadgetlib1/tests/gadgetlib1_test.cpp +++ b/src/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 "../examples/simple_example.hpp" +#include "../../zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.hpp" namespace { diff --git a/src/gadgetlib2/examples/simple_example.cpp b/src/gadgetlib2/examples/simple_example.cpp index 105c603a..8be1c0ec 100644 --- a/src/gadgetlib2/examples/simple_example.cpp +++ b/src/gadgetlib2/examples/simple_example.cpp @@ -5,11 +5,11 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include "gadgetlib2/examples/simple_example.hpp" +#include "simple_example.hpp" -#include "gadgetlib2/adapters.hpp" -#include "gadgetlib2/gadget.hpp" -#include "gadgetlib2/integration.hpp" +#include "../adapters.hpp" +#include "../gadget.hpp" +#include "../integration.hpp" namespace libsnark { diff --git a/src/gadgetlib2/examples/simple_example.hpp b/src/gadgetlib2/examples/simple_example.hpp index 113953ee..1b577107 100644 --- a/src/gadgetlib2/examples/simple_example.hpp +++ b/src/gadgetlib2/examples/simple_example.hpp @@ -8,8 +8,8 @@ #ifndef SIMPLE_EXAMPLE_HPP_ #define SIMPLE_EXAMPLE_HPP_ -#include "common/default_types/ec_pp.hpp" -#include "relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp" +#include +#include "../../relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp" namespace libsnark { diff --git a/src/gadgetlib2/examples/tutorial.cpp b/src/gadgetlib2/examples/tutorial.cpp index 31680f27..f79c1dc3 100644 --- a/src/gadgetlib2/examples/tutorial.cpp +++ b/src/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 "simple_example.hpp" +#include "../../relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp" #include "third_party/gtest/googletest/include/gtest/gtest.h" -#include "zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.hpp" +#include "../../zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.hpp" #include namespace gadgetExamples { 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.cpp b/src/gadgetlib2/integration.cpp index 059c40d4..01c505a4 100644 --- a/src/gadgetlib2/integration.cpp +++ b/src/gadgetlib2/integration.cpp @@ -5,8 +5,8 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include "gadgetlib2/adapters.hpp" -#include "gadgetlib2/integration.hpp" +#include "adapters.hpp" +#include "integration.hpp" namespace libsnark { diff --git a/src/gadgetlib2/integration.hpp b/src/gadgetlib2/integration.hpp index bcaf634a..89f0d822 100644 --- a/src/gadgetlib2/integration.hpp +++ b/src/gadgetlib2/integration.hpp @@ -8,9 +8,9 @@ #ifndef INTEGRATION_HPP_ #define INTEGRATION_HPP_ -#include "common/default_types/ec_pp.hpp" -#include "relations/constraint_satisfaction_problems/r1cs/r1cs.hpp" -#include "gadgetlib2/protoboard.hpp" +#include +#include "../relations/constraint_satisfaction_problems/r1cs/r1cs.hpp" +#include "protoboard.hpp" namespace libsnark { 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/gadgetlib2/tests/integration_UTEST.cpp b/src/gadgetlib2/tests/integration_UTEST.cpp index e596f7c3..bb14343c 100644 --- a/src/gadgetlib2/tests/integration_UTEST.cpp +++ b/src/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 "../../common/default_types/r1cs_ppzksnark_pp.hpp" +#include "../examples/simple_example.hpp" +#include "../../relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp" #include "third_party/gtest/googletest/include/gtest/gtest.h" -#include "zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.hpp" +#include "../../zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.hpp" using namespace gadgetlib2; diff --git a/src/knowledge_commitment/kc_multiexp.hpp b/src/knowledge_commitment/kc_multiexp.hpp index f97380e8..f1423974 100644 --- a/src/knowledge_commitment/kc_multiexp.hpp +++ b/src/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 "knowledge_commitment.hpp" 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 "kc_multiexp.tcc" #endif // KC_MULTIEXP_HPP_ diff --git a/src/knowledge_commitment/knowledge_commitment.hpp b/src/knowledge_commitment/knowledge_commitment.hpp index 005c7023..f4779403 100644 --- a/src/knowledge_commitment/knowledge_commitment.hpp +++ b/src/knowledge_commitment/knowledge_commitment.hpp @@ -14,8 +14,8 @@ #ifndef KNOWLEDGE_COMMITMENT_HPP_ #define KNOWLEDGE_COMMITMENT_HPP_ -#include "algebra/fields/fp.hpp" -#include "common/data_structures/sparse_vector.hpp" +#include +#include "../common/data_structures/sparse_vector.hpp" namespace libsnark { @@ -79,6 +79,6 @@ using knowledge_commitment_vector = sparse_vector > } // libsnark -#include "knowledge_commitment/knowledge_commitment.tcc" +#include "knowledge_commitment.tcc" #endif // KNOWLEDGE_COMMITMENT_HPP_ diff --git a/src/reductions/bacs_to_r1cs/bacs_to_r1cs.hpp b/src/reductions/bacs_to_r1cs/bacs_to_r1cs.hpp index 87599ce3..67cea70f 100644 --- a/src/reductions/bacs_to_r1cs/bacs_to_r1cs.hpp +++ b/src/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 "../../relations/circuit_satisfaction_problems/bacs/bacs.hpp" +#include "../../relations/constraint_satisfaction_problems/r1cs/r1cs.hpp" namespace libsnark { @@ -39,6 +39,6 @@ r1cs_variable_assignment bacs_to_r1cs_witness_map(const bacs_circuit r1cs_to_qap_witness_map(const r1cs_constraint_system } // libsnark -#include "reductions/r1cs_to_qap/r1cs_to_qap.tcc" +#include "r1cs_to_qap.tcc" #endif // R1CS_TO_QAP_HPP_ 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..ebbe16a2 100644 --- a/src/reductions/ram_to_r1cs/examples/demo_arithmetization.cpp +++ b/src/reductions/ram_to_r1cs/examples/demo_arithmetization.cpp @@ -13,11 +13,11 @@ #include #endif -#include "common/default_types/tinyram_ppzksnark_pp.hpp" -#include "common/profiling.hpp" -#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 "../../../common/default_types/tinyram_ppzksnark_pp.hpp" +#include +#include "../ram_to_r1cs.hpp" +#include "../../../relations/ram_computations/rams/tinyram/tinyram_params.hpp" +#include "../../../zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark.hpp" #ifndef MINDEPS namespace po = boost::program_options; diff --git a/src/reductions/ram_to_r1cs/gadgets/memory_checker_gadget.hpp b/src/reductions/ram_to_r1cs/gadgets/memory_checker_gadget.hpp index 7ec8fcd7..5eab7510 100644 --- a/src/reductions/ram_to_r1cs/gadgets/memory_checker_gadget.hpp +++ b/src/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 "trace_lines.hpp" 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 "memory_checker_gadget.tcc" #endif // MEMORY_CHECKER_GADGET_HPP_ diff --git a/src/reductions/ram_to_r1cs/gadgets/ram_universal_gadget.hpp b/src/reductions/ram_to_r1cs/gadgets/ram_universal_gadget.hpp index c6d05c27..1ca1732e 100644 --- a/src/reductions/ram_to_r1cs/gadgets/ram_universal_gadget.hpp +++ b/src/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 "../../../gadgetlib1/gadgets/routing/as_waksman_routing_gadget.hpp" +#include "memory_checker_gadget.hpp" +#include "trace_lines.hpp" +#include "../../../relations/ram_computations/rams/ram_params.hpp" 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 "ram_universal_gadget.tcc" #endif // RAM_UNIVERSAL_GADGET_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..e61bb5f1 100644 --- a/src/reductions/ram_to_r1cs/gadgets/ram_universal_gadget.tcc +++ b/src/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 "common/profiling.hpp" -#include "common/utils.hpp" -#include "algebra/fields/field_utils.hpp" -#include "relations/ram_computations/memory/ra_memory.hpp" +#include "../../../common/data_structures/integer_permutation.hpp" +#include +#include +#include +#include "../../../relations/ram_computations/memory/ra_memory.hpp" namespace libsnark { diff --git a/src/reductions/ram_to_r1cs/gadgets/trace_lines.hpp b/src/reductions/ram_to_r1cs/gadgets/trace_lines.hpp index f14eceb6..2d56c3b2 100644 --- a/src/reductions/ram_to_r1cs/gadgets/trace_lines.hpp +++ b/src/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 "../../../relations/ram_computations/rams/ram_params.hpp" 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 "trace_lines.tcc" #endif // TRACE_LINES_HPP_ diff --git a/src/reductions/ram_to_r1cs/ram_to_r1cs.hpp b/src/reductions/ram_to_r1cs/ram_to_r1cs.hpp index df24d5de..0ac8664d 100644 --- a/src/reductions/ram_to_r1cs/ram_to_r1cs.hpp +++ b/src/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 "gadgets/ram_universal_gadget.hpp" namespace libsnark { @@ -54,6 +54,6 @@ class ram_to_r1cs { } // libsnark -#include "reductions/ram_to_r1cs/ram_to_r1cs.tcc" +#include "ram_to_r1cs.tcc" #endif // RAM_TO_R1CS_HPP_ diff --git a/src/reductions/tbcs_to_uscs/tbcs_to_uscs.hpp b/src/reductions/tbcs_to_uscs/tbcs_to_uscs.hpp index 92fe6424..d67820ed 100644 --- a/src/reductions/tbcs_to_uscs/tbcs_to_uscs.hpp +++ b/src/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 "../../relations/constraint_satisfaction_problems/uscs/uscs.hpp" +#include "../../relations/circuit_satisfaction_problems/tbcs/tbcs.hpp" 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 "tbcs_to_uscs.tcc" #endif // TBCS_TO_USCS_HPP_ 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.hpp b/src/reductions/uscs_to_ssp/uscs_to_ssp.hpp index d6352dbf..6af39bc6 100644 --- a/src/reductions/uscs_to_ssp/uscs_to_ssp.hpp +++ b/src/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 "../../relations/arithmetic_programs/ssp/ssp.hpp" +#include "../../relations/constraint_satisfaction_problems/uscs/uscs.hpp" 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 "uscs_to_ssp.tcc" #endif // USCS_TO_SSP_HPP_ 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..280c3990 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 { @@ -188,6 +188,6 @@ class qap_witness { } // libsnark -#include "relations/arithmetic_programs/qap/qap.tcc" +#include "qap.tcc" #endif // QAP_HPP_ 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..4e39b3d9 100644 --- a/src/relations/arithmetic_programs/qap/tests/test_qap.cpp +++ b/src/relations/arithmetic_programs/qap/tests/test_qap.cpp @@ -10,12 +10,12 @@ #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 "reductions/r1cs_to_qap/r1cs_to_qap.hpp" -#include "relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp" +#include +#include +#include +#include +#include "../../../../reductions/r1cs_to_qap/r1cs_to_qap.hpp" +#include "../../../constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp" using namespace libsnark; diff --git a/src/relations/arithmetic_programs/ssp/ssp.hpp b/src/relations/arithmetic_programs/ssp/ssp.hpp index 5f13cad2..fdcc64ec 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 { @@ -173,6 +173,6 @@ class ssp_witness { } // libsnark -#include "relations/arithmetic_programs/ssp/ssp.tcc" +#include "ssp.tcc" #endif // SSP_HPP_ 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..5319598f 100644 --- a/src/relations/arithmetic_programs/ssp/tests/test_ssp.cpp +++ b/src/relations/arithmetic_programs/ssp/tests/test_ssp.cpp @@ -10,12 +10,12 @@ #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 "reductions/uscs_to_ssp/uscs_to_ssp.hpp" -#include "relations/constraint_satisfaction_problems/uscs/examples/uscs_examples.hpp" +#include +#include +#include +#include +#include "../../../../reductions/uscs_to_ssp/uscs_to_ssp.hpp" +#include "../../../constraint_satisfaction_problems/uscs/examples/uscs_examples.hpp" using namespace libsnark; diff --git a/src/relations/circuit_satisfaction_problems/bacs/bacs.hpp b/src/relations/circuit_satisfaction_problems/bacs/bacs.hpp index 274c9ecd..c7ad3ce2 100644 --- a/src/relations/circuit_satisfaction_problems/bacs/bacs.hpp +++ b/src/relations/circuit_satisfaction_problems/bacs/bacs.hpp @@ -21,7 +21,7 @@ #include -#include "relations/variable.hpp" +#include "../../variable.hpp" namespace libsnark { @@ -150,6 +150,6 @@ class bacs_circuit { } // libsnark -#include "relations/circuit_satisfaction_problems/bacs/bacs.tcc" +#include "bacs.tcc" #endif // BACS_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.hpp b/src/relations/circuit_satisfaction_problems/bacs/examples/bacs_examples.hpp index 565cf4bc..50bb7c23 100644 --- a/src/relations/circuit_satisfaction_problems/bacs/examples/bacs_examples.hpp +++ b/src/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 "../bacs.hpp" 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 "bacs_examples.tcc" #endif // BACS_EXAMPLES_HPP_ 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..7c6c3819 100644 --- a/src/relations/circuit_satisfaction_problems/tbcs/examples/tbcs_examples.cpp +++ b/src/relations/circuit_satisfaction_problems/tbcs/examples/tbcs_examples.cpp @@ -12,11 +12,11 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include "relations/circuit_satisfaction_problems/tbcs/examples/tbcs_examples.hpp" +#include "tbcs_examples.hpp" #include -#include "common/utils.hpp" +#include namespace libsnark { diff --git a/src/relations/circuit_satisfaction_problems/tbcs/examples/tbcs_examples.hpp b/src/relations/circuit_satisfaction_problems/tbcs/examples/tbcs_examples.hpp index f236f749..bd02cd52 100644 --- a/src/relations/circuit_satisfaction_problems/tbcs/examples/tbcs_examples.hpp +++ b/src/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 "../tbcs.hpp" namespace libsnark { diff --git a/src/relations/circuit_satisfaction_problems/tbcs/tbcs.cpp b/src/relations/circuit_satisfaction_problems/tbcs/tbcs.cpp index 2e63af20..d902047b 100644 --- a/src/relations/circuit_satisfaction_problems/tbcs/tbcs.cpp +++ b/src/relations/circuit_satisfaction_problems/tbcs/tbcs.cpp @@ -14,10 +14,10 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include "relations/circuit_satisfaction_problems/tbcs/tbcs.hpp" +#include "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..fb443483 100644 --- a/src/relations/circuit_satisfaction_problems/tbcs/tbcs.hpp +++ b/src/relations/circuit_satisfaction_problems/tbcs/tbcs.hpp @@ -17,8 +17,8 @@ #ifndef TBCS_HPP_ #define TBCS_HPP_ -#include "common/profiling.hpp" -#include "relations/variable.hpp" +#include +#include "../../variable.hpp" namespace libsnark { diff --git a/src/relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp b/src/relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp index 47003e95..7f054aca 100644 --- a/src/relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp +++ b/src/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 "../r1cs.hpp" 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 "r1cs_examples.tcc" #endif // R1CS_EXAMPLES_HPP_ 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.hpp b/src/relations/constraint_satisfaction_problems/r1cs/r1cs.hpp index ca3acb3a..db6338cd 100644 --- a/src/relations/constraint_satisfaction_problems/r1cs/r1cs.hpp +++ b/src/relations/constraint_satisfaction_problems/r1cs/r1cs.hpp @@ -23,7 +23,7 @@ #include #include -#include "relations/variable.hpp" +#include "../../variable.hpp" namespace libsnark { @@ -148,6 +148,6 @@ class r1cs_constraint_system { } // libsnark -#include "relations/constraint_satisfaction_problems/r1cs/r1cs.tcc" +#include "r1cs.tcc" #endif // R1CS_HPP_ 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.hpp b/src/relations/constraint_satisfaction_problems/uscs/examples/uscs_examples.hpp index 9edebef2..1f7a091c 100644 --- a/src/relations/constraint_satisfaction_problems/uscs/examples/uscs_examples.hpp +++ b/src/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 "../uscs.hpp" 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 "uscs_examples.tcc" #endif // USCS_EXAMPLES_HPP_ 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.hpp b/src/relations/constraint_satisfaction_problems/uscs/uscs.hpp index 9a189e0e..0d7eb115 100644 --- a/src/relations/constraint_satisfaction_problems/uscs/uscs.hpp +++ b/src/relations/constraint_satisfaction_problems/uscs/uscs.hpp @@ -23,7 +23,7 @@ #include #include -#include "relations/variable.hpp" +#include "../../variable.hpp" namespace libsnark { @@ -119,6 +119,6 @@ class uscs_constraint_system { } // libsnark -#include "relations/constraint_satisfaction_problems/uscs/uscs.tcc" +#include "uscs.tcc" #endif // USCS_HPP_ 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.hpp b/src/relations/ram_computations/memory/delegated_ra_memory.hpp index b01e09bf..fe675607 100644 --- a/src/relations/ram_computations/memory/delegated_ra_memory.hpp +++ b/src/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 "../../../common/data_structures/merkle_tree.hpp" +#include "memory_interface.hpp" namespace libsnark { @@ -45,6 +45,6 @@ class delegated_ra_memory : public memory_interface { } // libsnark -#include "relations/ram_computations/memory/delegated_ra_memory.tcc" +#include "delegated_ra_memory.tcc" #endif // DELEGATED_RA_MEMORY_HPP_ 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/memory/examples/memory_contents_examples.cpp b/src/relations/ram_computations/memory/examples/memory_contents_examples.cpp index 336958ea..afcaf14e 100644 --- a/src/relations/ram_computations/memory/examples/memory_contents_examples.cpp +++ b/src/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 "memory_contents_examples.hpp" #include #include diff --git a/src/relations/ram_computations/memory/examples/memory_contents_examples.hpp b/src/relations/ram_computations/memory/examples/memory_contents_examples.hpp index 6fbffea0..b6c71863 100644 --- a/src/relations/ram_computations/memory/examples/memory_contents_examples.hpp +++ b/src/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 "../memory_interface.hpp" namespace libsnark { diff --git a/src/relations/ram_computations/memory/memory_store_trace.cpp b/src/relations/ram_computations/memory/memory_store_trace.cpp index e1159623..b836573d 100644 --- a/src/relations/ram_computations/memory/memory_store_trace.cpp +++ b/src/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 "memory_store_trace.hpp" namespace libsnark { diff --git a/src/relations/ram_computations/memory/memory_store_trace.hpp b/src/relations/ram_computations/memory/memory_store_trace.hpp index dd88f353..08311246 100644 --- a/src/relations/ram_computations/memory/memory_store_trace.hpp +++ b/src/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 "memory_interface.hpp" namespace libsnark { diff --git a/src/relations/ram_computations/memory/ra_memory.cpp b/src/relations/ram_computations/memory/ra_memory.cpp index d16ddcde..e1acb711 100644 --- a/src/relations/ram_computations/memory/ra_memory.cpp +++ b/src/relations/ram_computations/memory/ra_memory.cpp @@ -13,7 +13,7 @@ #include -#include "relations/ram_computations/memory/ra_memory.hpp" +#include "ra_memory.hpp" namespace libsnark { diff --git a/src/relations/ram_computations/memory/ra_memory.hpp b/src/relations/ram_computations/memory/ra_memory.hpp index 21abd6ed..1f47606b 100644 --- a/src/relations/ram_computations/memory/ra_memory.hpp +++ b/src/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 "memory_interface.hpp" namespace libsnark { diff --git a/src/relations/ram_computations/rams/examples/ram_examples.hpp b/src/relations/ram_computations/rams/examples/ram_examples.hpp index 93c9bf62..c5db54e4 100644 --- a/src/relations/ram_computations/rams/examples/ram_examples.hpp +++ b/src/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 "../ram_params.hpp" 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 "ram_examples.tcc" #endif // RAM_EXAMPLES_HPP_ diff --git a/src/relations/ram_computations/rams/examples/ram_examples.tcc b/src/relations/ram_computations/rams/examples/ram_examples.tcc index 3b5b520d..2c4a02e0 100644 --- a/src/relations/ram_computations/rams/examples/ram_examples.tcc +++ b/src/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 "../tinyram/tinyram_aux.hpp" 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..c551d3a7 100644 --- a/src/relations/ram_computations/rams/fooram/fooram_aux.cpp +++ b/src/relations/ram_computations/rams/fooram/fooram_aux.cpp @@ -11,9 +11,9 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include "relations/ram_computations/rams/fooram/fooram_aux.hpp" +#include "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..8fe0406c 100644 --- a/src/relations/ram_computations/rams/fooram/fooram_aux.hpp +++ b/src/relations/ram_computations/rams/fooram/fooram_aux.hpp @@ -15,8 +15,8 @@ #include #include -#include "common/utils.hpp" -#include "relations/ram_computations/memory/memory_interface.hpp" +#include +#include "../../memory/memory_interface.hpp" namespace libsnark { diff --git a/src/relations/ram_computations/rams/fooram/fooram_params.hpp b/src/relations/ram_computations/rams/fooram/fooram_params.hpp index 3a505017..ab8d1063 100644 --- a/src/relations/ram_computations/rams/fooram/fooram_params.hpp +++ b/src/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 "../../../../gadgetlib1/gadgets/cpu_checkers/fooram/fooram_cpu_checker.hpp" +#include "fooram_aux.hpp" +#include "../ram_params.hpp" namespace libsnark { diff --git a/src/relations/ram_computations/rams/ram_params.hpp b/src/relations/ram_computations/rams/ram_params.hpp index 3c451827..847bdea1 100644 --- a/src/relations/ram_computations/rams/ram_params.hpp +++ b/src/relations/ram_computations/rams/ram_params.hpp @@ -14,7 +14,7 @@ #include -#include "relations/ram_computations/memory/memory_store_trace.hpp" +#include "../memory/memory_store_trace.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..76de1bc4 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 "relations/ram_computations/rams/tinyram/tinyram_aux.hpp" -#include "common/utils.hpp" +#include +#include "tinyram_aux.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..43d1d1dd 100644 --- a/src/relations/ram_computations/rams/tinyram/tinyram_aux.hpp +++ b/src/relations/ram_computations/rams/tinyram/tinyram_aux.hpp @@ -16,10 +16,10 @@ #include #include -#include "common/utils.hpp" -#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 "../../../constraint_satisfaction_problems/r1cs/r1cs.hpp" +#include "../../memory/memory_interface.hpp" +#include "../ram_params.hpp" namespace libsnark { diff --git a/src/relations/ram_computations/rams/tinyram/tinyram_params.hpp b/src/relations/ram_computations/rams/tinyram/tinyram_params.hpp index 35147b4f..92b9917d 100644 --- a/src/relations/ram_computations/rams/tinyram/tinyram_params.hpp +++ b/src/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 "../ram_params.hpp" +#include "tinyram_aux.hpp" +#include "../../../../gadgetlib1/gadgets/cpu_checkers/tinyram/tinyram_cpu_checker.hpp" namespace libsnark { diff --git a/src/relations/variable.hpp b/src/relations/variable.hpp index df82ac4d..bcc3098c 100644 --- a/src/relations/variable.hpp +++ b/src/relations/variable.hpp @@ -208,6 +208,6 @@ linear_combination operator-(const FieldT &field_coeff, const linear_com } // libsnark -#include "relations/variable.tcc" +#include "variable.tcc" #endif // VARIABLE_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.hpp b/src/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/compliance_predicate.hpp index 4488d482..1fd0de16 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/compliance_predicate.hpp +++ b/src/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 "../../../../relations/constraint_satisfaction_problems/r1cs/r1cs.hpp" 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 "compliance_predicate.tcc" #endif // COMPLIANCE_PREDICATE_HPP_ 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..6666dcc7 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,8 +14,8 @@ #ifndef COMPLIANCE_PREDICATE_TCC_ #define COMPLIANCE_PREDICATE_TCC_ -#include "common/utils.hpp" -#include "zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd_params.hpp" +#include +#include "../r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd_params.hpp" namespace libsnark { diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/cp_handler.hpp b/src/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/cp_handler.hpp index 5b841c00..0bd9f0de 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/cp_handler.hpp +++ b/src/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 "compliance_predicate.hpp" +#include "../../../../gadgetlib1/protoboard.hpp" namespace libsnark { @@ -109,6 +109,6 @@ class compliance_predicate_handler { } // libsnark -#include "zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/cp_handler.tcc" +#include "cp_handler.tcc" #endif // CP_HANDLER_HPP_ diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/examples/tally_cp.hpp b/src/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/examples/tally_cp.hpp index 2a6f2377..09bfab1d 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/examples/tally_cp.hpp +++ b/src/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/examples/tally_cp.hpp @@ -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 "../../../../../gadgetlib1/gadgets/basic_gadgets.hpp" +#include "../compliance_predicate.hpp" +#include "../cp_handler.hpp" namespace libsnark { @@ -105,6 +105,6 @@ class tally_cp_handler : public compliance_predicate_handler +#include "compliance_predicate/compliance_predicate.hpp" namespace libsnark { diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/examples/run_r1cs_mp_ppzkpcd.hpp b/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/examples/run_r1cs_mp_ppzkpcd.hpp index 961bdd71..88130830 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/examples/run_r1cs_mp_ppzkpcd.hpp +++ b/src/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 "run_r1cs_mp_ppzkpcd.tcc" #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/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/examples/run_r1cs_mp_ppzkpcd.tcc index 62671915..7f76e026 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/examples/run_r1cs_mp_ppzkpcd.tcc +++ b/src/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 "../r1cs_mp_ppzkpcd.hpp" -#include "zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/examples/tally_cp.hpp" +#include "../../compliance_predicate/examples/tally_cp.hpp" namespace libsnark { diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/mp_pcd_circuits.hpp b/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/mp_pcd_circuits.hpp index 9a5f2d47..ae46bce0 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/mp_pcd_circuits.hpp +++ b/src/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 "../../../../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 "../compliance_predicate/cp_handler.hpp" 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 "mp_pcd_circuits.tcc" #endif // MP_PCD_CIRCUITS_HPP_ 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..31cb401f 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,8 +16,8 @@ #define MP_PCD_CIRCUITS_TCC_ #include -#include "common/utils.hpp" -#include "gadgetlib1/constraint_profiling.hpp" +#include +#include "../../../../gadgetlib1/constraint_profiling.hpp" namespace libsnark { diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/profiling/profile_r1cs_mp_ppzkpcd.cpp b/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/profiling/profile_r1cs_mp_ppzkpcd.cpp index 3779e4f8..4c3e81cc 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/profiling/profile_r1cs_mp_ppzkpcd.cpp +++ b/src/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 "../../../../../common/default_types/r1cs_ppzkpcd_pp.hpp" +#include "../r1cs_mp_ppzkpcd.hpp" +#include "../examples/run_r1cs_mp_ppzkpcd.hpp" using namespace libsnark; diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd.hpp b/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd.hpp index 0dc0fc96..635fceac 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd.hpp +++ b/src/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 "../../../../common/data_structures/set_commitment.hpp" +#include "../ppzkpcd_compliance_predicate.hpp" +#include "r1cs_mp_ppzkpcd_params.hpp" +#include "../../../ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp" 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 "r1cs_mp_ppzkpcd.tcc" #endif // R1CS_MP_PPZKPCD_HPP_ 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..e46c6a53 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,10 +18,10 @@ #include #include -#include "common/profiling.hpp" -#include "common/utils.hpp" -#include "common/libsnark_serialization.hpp" -#include "zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/mp_pcd_circuits.hpp" +#include +#include +#include "../../../../common/libsnark_serialization.hpp" +#include "mp_pcd_circuits.hpp" namespace libsnark { 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..ad8c4628 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,9 +12,9 @@ #ifndef R1CS_MP_PPZKPCD_PARAMS_HPP_ #define R1CS_MP_PPZKPCD_PARAMS_HPP_ -#include "algebra/curves/public_params.hpp" -#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 "../compliance_predicate/compliance_predicate.hpp" +#include "../r1cs_pcd_params.hpp" namespace libsnark { diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/tests/test_r1cs_mp_ppzkpcd.cpp b/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/tests/test_r1cs_mp_ppzkpcd.cpp index 6ca0cac9..e5d495c7 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/tests/test_r1cs_mp_ppzkpcd.cpp +++ b/src/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 "../../../../../common/default_types/r1cs_ppzkpcd_pp.hpp" +#include "../examples/run_r1cs_mp_ppzkpcd.hpp" using namespace libsnark; diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_pcd_params.hpp b/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_pcd_params.hpp index 6f634a39..1b995ce4 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_pcd_params.hpp +++ b/src/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 "compliance_predicate/compliance_predicate.hpp" 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 "r1cs_pcd_params.tcc" #endif // R1CS_PCD_PARAMS_HPP_ diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/examples/run_r1cs_sp_ppzkpcd.hpp b/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/examples/run_r1cs_sp_ppzkpcd.hpp index 1ccd3dd1..0b8a520a 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/examples/run_r1cs_sp_ppzkpcd.hpp +++ b/src/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 "run_r1cs_sp_ppzkpcd.tcc" #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/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/examples/run_r1cs_sp_ppzkpcd.tcc index 88314544..d5b28ecd 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/examples/run_r1cs_sp_ppzkpcd.tcc +++ b/src/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 "../r1cs_sp_ppzkpcd.hpp" -#include "zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/examples/tally_cp.hpp" +#include "../../compliance_predicate/examples/tally_cp.hpp" namespace libsnark { diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/profiling/profile_r1cs_sp_ppzkpcd.cpp b/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/profiling/profile_r1cs_sp_ppzkpcd.cpp index becfd1ab..fa639e1e 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/profiling/profile_r1cs_sp_ppzkpcd.cpp +++ b/src/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 "../../../../../common/default_types/r1cs_ppzkpcd_pp.hpp" +#include "../r1cs_sp_ppzkpcd.hpp" +#include "../examples/run_r1cs_sp_ppzkpcd.hpp" using namespace libsnark; diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd.hpp b/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd.hpp index 821586f1..a0acd2d6 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd.hpp +++ b/src/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 "../../../ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp" +#include "r1cs_sp_ppzkpcd_params.hpp" 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 "r1cs_sp_ppzkpcd.tcc" #endif // R1CS_SP_PPZKPCD_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..6aaf69d1 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,9 +18,9 @@ #include #include -#include "common/profiling.hpp" -#include "common/utils.hpp" -#include "zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/sp_pcd_circuits.hpp" +#include +#include +#include "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..5deb814f 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,9 +12,9 @@ #ifndef R1CS_SP_PPZKPCD_PARAMS_HPP_ #define R1CS_SP_PPZKPCD_PARAMS_HPP_ -#include "algebra/curves/public_params.hpp" -#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 "../compliance_predicate/compliance_predicate.hpp" +#include "../r1cs_pcd_params.hpp" namespace libsnark { diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/sp_pcd_circuits.hpp b/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/sp_pcd_circuits.hpp index 881bfd59..3059c82d 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/sp_pcd_circuits.hpp +++ b/src/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 "../../../../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 "../compliance_predicate/cp_handler.hpp" 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 "sp_pcd_circuits.tcc" #endif // SP_PCD_CIRCUITS_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..acf0765a 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,8 +15,8 @@ #ifndef SP_PCD_CIRCUITS_TCC_ #define SP_PCD_CIRCUITS_TCC_ -#include "common/utils.hpp" -#include "gadgetlib1/constraint_profiling.hpp" +#include +#include "../../../../gadgetlib1/constraint_profiling.hpp" namespace libsnark { diff --git a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/tests/test_r1cs_sp_ppzkpcd.cpp b/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/tests/test_r1cs_sp_ppzkpcd.cpp index 6676df3b..f5a0d6f3 100644 --- a/src/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/tests/test_r1cs_sp_ppzkpcd.cpp +++ b/src/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 "../../../../../common/default_types/r1cs_ppzkpcd_pp.hpp" +#include "../examples/run_r1cs_sp_ppzkpcd.hpp" using 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..826b5863 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 @@ -10,9 +10,9 @@ #include #include -#include "common/default_types/r1cs_ppzkadsnark_pp.hpp" -#include "common/profiling.hpp" -#include "zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/run_r1cs_ppzkadsnark.hpp" +#include "../../../../common/default_types/r1cs_ppzkadsnark_pp.hpp" +#include +#include "run_r1cs_ppzkadsnark.hpp" using namespace libsnark; diff --git a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/prf/aes_ctr_prf.hpp b/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/prf/aes_ctr_prf.hpp index 28a655d2..3cce314d 100644 --- a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/prf/aes_ctr_prf.hpp +++ b/src/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 "../../r1cs_ppzkadsnark_prf.hpp" namespace libsnark { diff --git a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/prf/aes_ctr_prf.tcc b/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/prf/aes_ctr_prf.tcc index f14eebb2..ef3c3957 100644 --- a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/prf/aes_ctr_prf.tcc +++ b/src/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 "../../../../../common/default_types/r1cs_ppzkadsnark_pp.hpp" #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/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/run_r1cs_ppzkadsnark.hpp index f09f8409..058fc643 100644 --- a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/run_r1cs_ppzkadsnark.hpp +++ b/src/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 "../../../../relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp" 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 "run_r1cs_ppzkadsnark.tcc" #endif // RUN_R1CS_PPZKADSNARK_HPP_ 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..46eb6d63 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 @@ -15,14 +15,14 @@ #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 "../r1cs_ppzkadsnark.hpp" +#include "prf/aes_ctr_prf.tcc" +#include "signature/ed25519_signature.tcc" #include #include -#include "common/profiling.hpp" +#include namespace libsnark { diff --git a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/signature/ed25519_signature.hpp b/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/signature/ed25519_signature.hpp index 560b08c6..92b3c2da 100644 --- a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/signature/ed25519_signature.hpp +++ b/src/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 "../../r1cs_ppzkadsnark_signature.hpp" namespace libsnark { diff --git a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/signature/ed25519_signature.tcc b/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/signature/ed25519_signature.tcc index 8064eab3..2c3c4dea 100644 --- a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/signature/ed25519_signature.tcc +++ b/src/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 "../../../../../common/default_types/r1cs_ppzkadsnark_pp.hpp" #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/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark.hpp index 53481790..60461534 100644 --- a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark.hpp +++ b/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark.hpp @@ -45,13 +45,13 @@ IEEE Symposium on Security and Privacy 2015, #include -#include "algebra/curves/public_params.hpp" -#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 "../../../common/data_structures/accumulation_vector.hpp" +#include "../../../knowledge_commitment/knowledge_commitment.hpp" +#include "../../../relations/constraint_satisfaction_problems/r1cs/r1cs.hpp" +#include "r1cs_ppzkadsnark_params.hpp" +#include "r1cs_ppzkadsnark_signature.hpp" +#include "r1cs_ppzkadsnark_prf.hpp" 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 "r1cs_ppzkadsnark.tcc" #endif // R1CS_PPZKSNARK_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..4d59a6e5 100644 --- a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark.tcc +++ b/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark.tcc @@ -20,11 +20,11 @@ See r1cs_ppzkadsnark.hpp . #include #include -#include "common/profiling.hpp" -#include "common/utils.hpp" -#include "algebra/scalar_multiplication/multiexp.hpp" -#include "knowledge_commitment/kc_multiexp.hpp" -#include "reductions/r1cs_to_qap/r1cs_to_qap.hpp" +#include +#include +#include +#include "../../../knowledge_commitment/kc_multiexp.hpp" +#include "../../../reductions/r1cs_to_qap/r1cs_to_qap.hpp" namespace libsnark { diff --git a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark_params.hpp b/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark_params.hpp index 257885b8..d5fd571c 100644 --- a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark_params.hpp +++ b/src/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 "../../../relations/constraint_satisfaction_problems/r1cs/r1cs.hpp" namespace libsnark { diff --git a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark_prf.hpp b/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark_prf.hpp index 9c83b276..2bb48d29 100644 --- a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark_prf.hpp +++ b/src/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 "r1cs_ppzkadsnark_params.hpp" namespace libsnark { diff --git a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark_signature.hpp b/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark_signature.hpp index 13345c76..2efdc3e7 100644 --- a/src/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark_signature.hpp +++ b/src/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 "r1cs_ppzkadsnark_params.hpp" namespace libsnark { diff --git a/src/zk_proof_systems/ppzksnark/bacs_ppzksnark/bacs_ppzksnark.hpp b/src/zk_proof_systems/ppzksnark/bacs_ppzksnark/bacs_ppzksnark.hpp index 139c083a..8c3f3635 100644 --- a/src/zk_proof_systems/ppzksnark/bacs_ppzksnark/bacs_ppzksnark.hpp +++ b/src/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 "../../../relations/circuit_satisfaction_problems/bacs/bacs.hpp" +#include "../r1cs_ppzksnark/r1cs_ppzksnark.hpp" +#include "bacs_ppzksnark_params.hpp" 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 "bacs_ppzksnark.tcc" #endif // BACS_PPZKSNARK_HPP_ diff --git a/src/zk_proof_systems/ppzksnark/bacs_ppzksnark/bacs_ppzksnark.tcc b/src/zk_proof_systems/ppzksnark/bacs_ppzksnark/bacs_ppzksnark.tcc index b1ae5799..231c45cf 100644 --- a/src/zk_proof_systems/ppzksnark/bacs_ppzksnark/bacs_ppzksnark.tcc +++ b/src/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 "../../../reductions/bacs_to_r1cs/bacs_to_r1cs.hpp" namespace libsnark { diff --git a/src/zk_proof_systems/ppzksnark/bacs_ppzksnark/bacs_ppzksnark_params.hpp b/src/zk_proof_systems/ppzksnark/bacs_ppzksnark/bacs_ppzksnark_params.hpp index d6e14fc7..cf9f423a 100644 --- a/src/zk_proof_systems/ppzksnark/bacs_ppzksnark/bacs_ppzksnark_params.hpp +++ b/src/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 "../../../relations/circuit_satisfaction_problems/bacs/bacs.hpp" namespace libsnark { diff --git a/src/zk_proof_systems/ppzksnark/bacs_ppzksnark/examples/run_bacs_ppzksnark.hpp b/src/zk_proof_systems/ppzksnark/bacs_ppzksnark/examples/run_bacs_ppzksnark.hpp index cbf0ac0f..c32724c3 100644 --- a/src/zk_proof_systems/ppzksnark/bacs_ppzksnark/examples/run_bacs_ppzksnark.hpp +++ b/src/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 "../../../../relations/circuit_satisfaction_problems/bacs/examples/bacs_examples.hpp" 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 "run_bacs_ppzksnark.tcc" #endif // RUN_BACS_PPZKSNARK_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..7cda3cd8 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 @@ -15,11 +15,11 @@ #ifndef RUN_BACS_PPZKSNARK_TCC_ #define RUN_BACS_PPZKSNARK_TCC_ -#include "zk_proof_systems/ppzksnark/bacs_ppzksnark/bacs_ppzksnark.hpp" +#include "../bacs_ppzksnark.hpp" #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..cdfb45b1 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 @@ -19,10 +19,10 @@ #include -#include "common/default_types/bacs_ppzksnark_pp.hpp" -#include "common/profiling.hpp" -#include "relations/circuit_satisfaction_problems/bacs/examples/bacs_examples.hpp" -#include "zk_proof_systems/ppzksnark/bacs_ppzksnark/examples/run_bacs_ppzksnark.hpp" +#include "../../../../common/default_types/bacs_ppzksnark_pp.hpp" +#include +#include "../../../../relations/circuit_satisfaction_problems/bacs/examples/bacs_examples.hpp" +#include "../examples/run_bacs_ppzksnark.hpp" using namespace libsnark; 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..64a17c6d 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 @@ -11,10 +11,10 @@ #include #include -#include "common/default_types/bacs_ppzksnark_pp.hpp" -#include "common/profiling.hpp" -#include "relations/circuit_satisfaction_problems/bacs/examples/bacs_examples.hpp" -#include "zk_proof_systems/ppzksnark/bacs_ppzksnark/examples/run_bacs_ppzksnark.hpp" +#include "../../../../common/default_types/bacs_ppzksnark_pp.hpp" +#include +#include "../../../../relations/circuit_satisfaction_problems/bacs/examples/bacs_examples.hpp" +#include "../examples/run_bacs_ppzksnark.hpp" using namespace libsnark; diff --git a/src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/examples/run_r1cs_gg_ppzksnark.hpp b/src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/examples/run_r1cs_gg_ppzksnark.hpp index 3ee9708c..70f14678 100644 --- a/src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/examples/run_r1cs_gg_ppzksnark.hpp +++ b/src/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 "../../../../relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp" 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 "run_r1cs_gg_ppzksnark.tcc" #endif // RUN_R1CS_GG_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..c5b7903d 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 @@ -15,12 +15,12 @@ #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 "../r1cs_gg_ppzksnark.hpp" #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..3f47d59d 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 @@ -25,11 +25,11 @@ #include #include -#include "common/default_types/r1cs_gg_ppzksnark_pp.hpp" -#include "common/profiling.hpp" -#include "common/utils.hpp" -#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 "../../../../common/default_types/r1cs_gg_ppzksnark_pp.hpp" +#include +#include +#include "../../../../relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp" +#include "../examples/run_r1cs_gg_ppzksnark.hpp" using namespace libsnark; 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..ce4e762d 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,11 +43,11 @@ The implementation instantiates the protocol of \[Gro16]. #include -#include "algebra/curves/public_params.hpp" -#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 "../../../common/data_structures/accumulation_vector.hpp" +#include "../../../knowledge_commitment/knowledge_commitment.hpp" +#include "../../../relations/constraint_satisfaction_problems/r1cs/r1cs.hpp" +#include "r1cs_gg_ppzksnark_params.hpp" 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 "r1cs_gg_ppzksnark.tcc" #endif // R1CS_GG_PPZKSNARK_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..0e5c1227 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,11 +20,11 @@ See r1cs_gg_ppzksnark.hpp . #include #include -#include "common/profiling.hpp" -#include "common/utils.hpp" -#include "algebra/scalar_multiplication/multiexp.hpp" -#include "knowledge_commitment/kc_multiexp.hpp" -#include "reductions/r1cs_to_qap/r1cs_to_qap.hpp" +#include +#include +#include +#include "../../../knowledge_commitment/kc_multiexp.hpp" +#include "../../../reductions/r1cs_to_qap/r1cs_to_qap.hpp" namespace libsnark { diff --git a/src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark_params.hpp b/src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark_params.hpp index 6526e436..51cea0d3 100644 --- a/src/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark_params.hpp +++ b/src/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 "../../../relations/constraint_satisfaction_problems/r1cs/r1cs.hpp" namespace libsnark { 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..6a331477 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 @@ -11,11 +11,11 @@ #include #include -#include "common/default_types/r1cs_gg_ppzksnark_pp.hpp" -#include "common/profiling.hpp" -#include "common/utils.hpp" -#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 "../../../../common/default_types/r1cs_gg_ppzksnark_pp.hpp" +#include +#include +#include "../../../../relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp" +#include "../examples/run_r1cs_gg_ppzksnark.hpp" using namespace libsnark; 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..0ed993cf 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,8 +13,8 @@ #ifndef RUN_R1CS_PPZKSNARK_HPP_ #define RUN_R1CS_PPZKSNARK_HPP_ -#include "common/default_types/ec_pp.hpp" -#include "relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp" +#include +#include "../../../../relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp" 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 "run_r1cs_ppzksnark.tcc" #endif // RUN_R1CS_PPZKSNARK_HPP_ 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..7f2e6b94 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 @@ -15,12 +15,12 @@ #ifndef RUN_R1CS_PPZKSNARK_TCC_ #define RUN_R1CS_PPZKSNARK_TCC_ -#include "zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp" +#include "../r1cs_ppzksnark.hpp" #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..11a57491 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 @@ -25,11 +25,11 @@ #include #include -#include "common/default_types/r1cs_ppzksnark_pp.hpp" -#include "common/profiling.hpp" -#include "common/utils.hpp" -#include "relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp" -#include "zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.hpp" +#include "../../../../common/default_types/r1cs_ppzksnark_pp.hpp" +#include +#include +#include "../../../../relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp" +#include "../examples/run_r1cs_ppzksnark.hpp" using namespace libsnark; 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..c075d980 100644 --- a/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp +++ b/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp @@ -48,11 +48,11 @@ #include -#include "algebra/curves/public_params.hpp" -#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 "../../../common/data_structures/accumulation_vector.hpp" +#include "../../../knowledge_commitment/knowledge_commitment.hpp" +#include "../../../relations/constraint_satisfaction_problems/r1cs/r1cs.hpp" +#include "r1cs_ppzksnark_params.hpp" 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 "r1cs_ppzksnark.tcc" #endif // R1CS_PPZKSNARK_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..2001e4cc 100644 --- a/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.tcc +++ b/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.tcc @@ -20,11 +20,11 @@ See r1cs_ppzksnark.hpp . #include #include -#include "common/profiling.hpp" -#include "common/utils.hpp" -#include "algebra/scalar_multiplication/multiexp.hpp" -#include "knowledge_commitment/kc_multiexp.hpp" -#include "reductions/r1cs_to_qap/r1cs_to_qap.hpp" +#include +#include +#include +#include "../../../knowledge_commitment/kc_multiexp.hpp" +#include "../../../reductions/r1cs_to_qap/r1cs_to_qap.hpp" namespace libsnark { diff --git a/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark_params.hpp b/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark_params.hpp index 3e00475f..d7fe584d 100644 --- a/src/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark_params.hpp +++ b/src/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 "../../../relations/constraint_satisfaction_problems/r1cs/r1cs.hpp" namespace libsnark { 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..ba8e71ee 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 @@ -11,11 +11,11 @@ #include #include -#include "common/default_types/r1cs_ppzksnark_pp.hpp" -#include "common/profiling.hpp" -#include "common/utils.hpp" -#include "relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp" -#include "zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.hpp" +#include "../../../../common/default_types/r1cs_ppzksnark_pp.hpp" +#include +#include +#include "../../../../relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp" +#include "../examples/run_r1cs_ppzksnark.hpp" using namespace libsnark; 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..82621faa 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 @@ -13,11 +13,11 @@ #include #endif -#include "common/default_types/tinyram_ppzksnark_pp.hpp" -#include "common/profiling.hpp" -#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 "../../../../common/default_types/tinyram_ppzksnark_pp.hpp" +#include +#include "../../../../reductions/ram_to_r1cs/ram_to_r1cs.hpp" +#include "../ram_ppzksnark.hpp" +#include "../../../../relations/ram_computations/rams/tinyram/tinyram_params.hpp" #ifndef MINDEPS namespace po = boost::program_options; diff --git a/src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_generator.cpp b/src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_generator.cpp index 2b899b14..7e198933 100644 --- a/src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_generator.cpp +++ b/src/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 "../../../../common/default_types/ram_ppzksnark_pp.hpp" +#include "../ram_ppzksnark.hpp" +#include "../../../../relations/ram_computations/rams/tinyram/tinyram_params.hpp" #ifndef MINDEPS namespace po = boost::program_options; diff --git a/src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_prover.cpp b/src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_prover.cpp index 1ebddfbd..008011e7 100644 --- a/src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_prover.cpp +++ b/src/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 "../../../../common/default_types/tinyram_ppzksnark_pp.hpp" +#include "../ram_ppzksnark.hpp" +#include "../../../../relations/ram_computations/rams/tinyram/tinyram_params.hpp" #ifndef MINDEPS namespace po = boost::program_options; diff --git a/src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_verifier.cpp b/src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_verifier.cpp index 2f273f75..ad112a34 100644 --- a/src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_verifier.cpp +++ b/src/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 "../../../../common/default_types/tinyram_ppzksnark_pp.hpp" +#include "../ram_ppzksnark.hpp" +#include "../../../../relations/ram_computations/rams/tinyram/tinyram_params.hpp" #ifndef MINDEPS namespace po = boost::program_options; diff --git a/src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/run_ram_ppzksnark.hpp b/src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/run_ram_ppzksnark.hpp index 5bb47475..74c36b85 100644 --- a/src/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/run_ram_ppzksnark.hpp +++ b/src/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 "../../../../relations/ram_computations/rams/examples/ram_examples.hpp" +#include "../ram_ppzksnark_params.hpp" namespace libsnark { @@ -31,6 +31,6 @@ bool run_ram_ppzksnark(const ram_example -#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..d6ca112c 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 @@ -11,11 +11,11 @@ #include #include -#include "common/default_types/ram_ppzksnark_pp.hpp" -#include "common/profiling.hpp" -#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 "../../../../common/default_types/ram_ppzksnark_pp.hpp" +#include +#include "../../../../relations/ram_computations/rams/examples/ram_examples.hpp" +#include "../examples/run_ram_ppzksnark.hpp" +#include "../../../../relations/ram_computations/rams/tinyram/tinyram_params.hpp" using namespace libsnark; diff --git a/src/zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark.hpp b/src/zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark.hpp index 79502774..47eee2c7 100644 --- a/src/zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark.hpp +++ b/src/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 "../../../reductions/ram_to_r1cs/ram_to_r1cs.hpp" +#include "../r1cs_ppzksnark/r1cs_ppzksnark.hpp" +#include "ram_ppzksnark_params.hpp" namespace libsnark { @@ -222,6 +222,6 @@ bool ram_ppzksnark_verifier(const ram_ppzksnark_verification_key +#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..18702a57 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 @@ -10,10 +10,10 @@ #include #include -#include "common/default_types/ram_ppzksnark_pp.hpp" -#include "common/profiling.hpp" -#include "relations/ram_computations/rams/examples/ram_examples.hpp" -#include "zk_proof_systems/ppzksnark/ram_ppzksnark/examples/run_ram_ppzksnark.hpp" +#include "../../../../common/default_types/ram_ppzksnark_pp.hpp" +#include +#include "../../../../relations/ram_computations/rams/examples/ram_examples.hpp" +#include "../examples/run_ram_ppzksnark.hpp" using namespace libsnark; diff --git a/src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/examples/run_tbcs_ppzksnark.hpp b/src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/examples/run_tbcs_ppzksnark.hpp index ff4b0620..dcd4b422 100644 --- a/src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/examples/run_tbcs_ppzksnark.hpp +++ b/src/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 "../../../../relations/circuit_satisfaction_problems/tbcs/examples/tbcs_examples.hpp" 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 "run_tbcs_ppzksnark.tcc" #endif // RUN_TBCS_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..d035d4a5 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 @@ -15,11 +15,11 @@ #ifndef RUN_TBCS_PPZKSNARK_TCC_ #define RUN_TBCS_PPZKSNARK_TCC_ -#include "zk_proof_systems/ppzksnark/tbcs_ppzksnark/tbcs_ppzksnark.hpp" +#include "../tbcs_ppzksnark.hpp" #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..7363b167 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 @@ -17,11 +17,11 @@ #include -#include "common/default_types/tbcs_ppzksnark_pp.hpp" -#include "common/profiling.hpp" -#include "common/utils.hpp" -#include "relations/circuit_satisfaction_problems/tbcs/examples/tbcs_examples.hpp" -#include "zk_proof_systems/ppzksnark/tbcs_ppzksnark/examples/run_tbcs_ppzksnark.hpp" +#include "../../../../common/default_types/tbcs_ppzksnark_pp.hpp" +#include +#include +#include "../../../../relations/circuit_satisfaction_problems/tbcs/examples/tbcs_examples.hpp" +#include "../examples/run_tbcs_ppzksnark.hpp" using namespace libsnark; diff --git a/src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tbcs_ppzksnark.hpp b/src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tbcs_ppzksnark.hpp index 1c38b19e..ccf7b900 100644 --- a/src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tbcs_ppzksnark.hpp +++ b/src/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 "../../../relations/circuit_satisfaction_problems/tbcs/tbcs.hpp" +#include "../uscs_ppzksnark/uscs_ppzksnark.hpp" +#include "tbcs_ppzksnark_params.hpp" 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 "tbcs_ppzksnark.tcc" #endif // TBCS_PPZKSNARK_HPP_ diff --git a/src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tbcs_ppzksnark.tcc b/src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tbcs_ppzksnark.tcc index b6d089dc..95764b7b 100644 --- a/src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tbcs_ppzksnark.tcc +++ b/src/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 "../../../reductions/tbcs_to_uscs/tbcs_to_uscs.hpp" namespace libsnark { diff --git a/src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tbcs_ppzksnark_params.hpp b/src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tbcs_ppzksnark_params.hpp index 4214b241..d87c18c2 100644 --- a/src/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tbcs_ppzksnark_params.hpp +++ b/src/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 "../../../relations/circuit_satisfaction_problems/tbcs/tbcs.hpp" namespace libsnark { 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..5460ddf6 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 @@ -11,10 +11,10 @@ #include #include -#include "common/default_types/tbcs_ppzksnark_pp.hpp" -#include "common/profiling.hpp" -#include "relations/circuit_satisfaction_problems/tbcs/examples/tbcs_examples.hpp" -#include "zk_proof_systems/ppzksnark/tbcs_ppzksnark/examples/run_tbcs_ppzksnark.hpp" +#include "../../../../common/default_types/tbcs_ppzksnark_pp.hpp" +#include +#include "../../../../relations/circuit_satisfaction_problems/tbcs/examples/tbcs_examples.hpp" +#include "../examples/run_tbcs_ppzksnark.hpp" using namespace libsnark; diff --git a/src/zk_proof_systems/ppzksnark/uscs_ppzksnark/examples/run_uscs_ppzksnark.hpp b/src/zk_proof_systems/ppzksnark/uscs_ppzksnark/examples/run_uscs_ppzksnark.hpp index 9d7c8448..d614e6a5 100644 --- a/src/zk_proof_systems/ppzksnark/uscs_ppzksnark/examples/run_uscs_ppzksnark.hpp +++ b/src/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 "../../../../relations/constraint_satisfaction_problems/uscs/examples/uscs_examples.hpp" 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 "run_uscs_ppzksnark.tcc" #endif // RUN_USCS_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..2cf80a68 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 @@ -15,11 +15,11 @@ #ifndef RUN_USCS_PPZKSNARK_TCC_ #define RUN_USCS_PPZKSNARK_TCC_ -#include "zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark.hpp" +#include "../uscs_ppzksnark.hpp" #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..01af4664 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 @@ -26,11 +26,11 @@ #include #include -#include "common/default_types/uscs_ppzksnark_pp.hpp" -#include "common/profiling.hpp" -#include "common/utils.hpp" -#include "relations/constraint_satisfaction_problems/uscs/examples/uscs_examples.hpp" -#include "zk_proof_systems/ppzksnark/uscs_ppzksnark/examples/run_uscs_ppzksnark.hpp" +#include "../../../../common/default_types/uscs_ppzksnark_pp.hpp" +#include +#include +#include "../../../../relations/constraint_satisfaction_problems/uscs/examples/uscs_examples.hpp" +#include "../examples/run_uscs_ppzksnark.hpp" using namespace libsnark; 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..efe513f1 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 @@ -11,11 +11,11 @@ #include #include -#include "common/default_types/uscs_ppzksnark_pp.hpp" -#include "common/profiling.hpp" -#include "common/utils.hpp" -#include "relations/constraint_satisfaction_problems/uscs/examples/uscs_examples.hpp" -#include "zk_proof_systems/ppzksnark/uscs_ppzksnark/examples/run_uscs_ppzksnark.hpp" +#include "../../../../common/default_types/uscs_ppzksnark_pp.hpp" +#include +#include +#include "../../../../relations/constraint_satisfaction_problems/uscs/examples/uscs_examples.hpp" +#include "../examples/run_uscs_ppzksnark.hpp" using namespace libsnark; 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..ba1b950c 100644 --- a/src/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark.hpp +++ b/src/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark.hpp @@ -48,11 +48,11 @@ #include -#include "algebra/curves/public_params.hpp" -#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 "../../../common/data_structures/accumulation_vector.hpp" +#include "../../../knowledge_commitment/knowledge_commitment.hpp" +#include "../../../relations/constraint_satisfaction_problems/uscs/uscs.hpp" +#include "uscs_ppzksnark_params.hpp" 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 "uscs_ppzksnark.tcc" #endif // USCS_PPZKSNARK_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..5808fdb7 100644 --- a/src/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark.tcc +++ b/src/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 "common/profiling.hpp" -#include "common/utils.hpp" -#include "algebra/scalar_multiplication/multiexp.hpp" -#include "relations/arithmetic_programs/ssp/ssp.hpp" +#include "../../../reductions/uscs_to_ssp/uscs_to_ssp.hpp" +#include +#include +#include +#include "../../../relations/arithmetic_programs/ssp/ssp.hpp" namespace libsnark { diff --git a/src/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark_params.hpp b/src/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark_params.hpp index 7d6303fb..21c6476f 100644 --- a/src/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark_params.hpp +++ b/src/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 "../../../relations/constraint_satisfaction_problems/uscs/uscs.hpp" namespace libsnark { diff --git a/src/zk_proof_systems/zksnark/ram_zksnark/examples/run_ram_zksnark.hpp b/src/zk_proof_systems/zksnark/ram_zksnark/examples/run_ram_zksnark.hpp index db1a34c7..ec87c659 100644 --- a/src/zk_proof_systems/zksnark/ram_zksnark/examples/run_ram_zksnark.hpp +++ b/src/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 "../../../../relations/ram_computations/rams/examples/ram_examples.hpp" +#include "../ram_zksnark_params.hpp" 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 "run_ram_zksnark.tcc" #endif // RUN_RAM_ZKSNARK_HPP_ 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..40117340 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 @@ -15,11 +15,11 @@ #ifndef RUN_RAM_ZKSNARK_TCC_ #define RUN_RAM_ZKSNARK_TCC_ -#include "zk_proof_systems/zksnark/ram_zksnark/ram_zksnark.hpp" +#include "../ram_zksnark.hpp" #include -#include "common/profiling.hpp" +#include namespace libsnark { diff --git a/src/zk_proof_systems/zksnark/ram_zksnark/profiling/profile_ram_zksnark.cpp b/src/zk_proof_systems/zksnark/ram_zksnark/profiling/profile_ram_zksnark.cpp index 3285064a..ceb756c7 100644 --- a/src/zk_proof_systems/zksnark/ram_zksnark/profiling/profile_ram_zksnark.cpp +++ b/src/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 "../../../../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 "../ram_zksnark.hpp" +#include "../examples/run_ram_zksnark.hpp" +#include "../../../../relations/ram_computations/rams/tinyram/tinyram_params.hpp" #include diff --git a/src/zk_proof_systems/zksnark/ram_zksnark/ram_compliance_predicate.hpp b/src/zk_proof_systems/zksnark/ram_zksnark/ram_compliance_predicate.hpp index 91bc8899..82d0adee 100644 --- a/src/zk_proof_systems/zksnark/ram_zksnark/ram_compliance_predicate.hpp +++ b/src/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 "../../../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 "../../pcd/r1cs_pcd/compliance_predicate/compliance_predicate.hpp" +#include "../../pcd/r1cs_pcd/compliance_predicate/cp_handler.hpp" namespace libsnark { @@ -243,6 +243,6 @@ class ram_compliance_predicate_handler : public compliance_predicate_handler -#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 "../../pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd.hpp" +#include "ram_compliance_predicate.hpp" +#include "ram_zksnark_params.hpp" 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 "ram_zksnark.tcc" #endif // RAM_ZKSNARK_HPP_ 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 { diff --git a/src/zk_proof_systems/zksnark/ram_zksnark/tests/test_ram_zksnark.cpp b/src/zk_proof_systems/zksnark/ram_zksnark/tests/test_ram_zksnark.cpp index 8cf7c368..54f8307e 100644 --- a/src/zk_proof_systems/zksnark/ram_zksnark/tests/test_ram_zksnark.cpp +++ b/src/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 "../../../../common/default_types/ram_zksnark_pp.hpp" +#include "../../../../relations/ram_computations/rams/tinyram/tinyram_params.hpp" +#include "../examples/run_ram_zksnark.hpp" +#include "../../../../relations/ram_computations/rams/examples/ram_examples.hpp" using namespace libsnark;