diff --git a/libsnark/common/data_structures/accumulation_vector.hpp b/libsnark/common/data_structures/accumulation_vector.hpp index 30575bba..17b98f41 100644 --- a/libsnark/common/data_structures/accumulation_vector.hpp +++ b/libsnark/common/data_structures/accumulation_vector.hpp @@ -12,6 +12,8 @@ #ifndef ACCUMULATION_VECTOR_HPP_ #define ACCUMULATION_VECTOR_HPP_ +#include + #include namespace libsnark { diff --git a/libsnark/common/data_structures/integer_permutation.cpp b/libsnark/common/data_structures/integer_permutation.cpp index 399c35c8..6e2b3db9 100644 --- a/libsnark/common/data_structures/integer_permutation.cpp +++ b/libsnark/common/data_structures/integer_permutation.cpp @@ -11,13 +11,13 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include - #include #include #include #include +#include + namespace libsnark { integer_permutation::integer_permutation(const size_t size) : diff --git a/libsnark/common/data_structures/merkle_tree.hpp b/libsnark/common/data_structures/merkle_tree.hpp index ddcb1e8a..dd220b32 100644 --- a/libsnark/common/data_structures/merkle_tree.hpp +++ b/libsnark/common/data_structures/merkle_tree.hpp @@ -14,6 +14,7 @@ #include #include + #include namespace libsnark { diff --git a/libsnark/common/data_structures/set_commitment.cpp b/libsnark/common/data_structures/set_commitment.cpp index bc1e74ef..5993b5b9 100644 --- a/libsnark/common/data_structures/set_commitment.cpp +++ b/libsnark/common/data_structures/set_commitment.cpp @@ -5,9 +5,10 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include #include +#include + namespace libsnark { bool set_membership_proof::operator==(const set_membership_proof &other) const diff --git a/libsnark/common/data_structures/set_commitment.hpp b/libsnark/common/data_structures/set_commitment.hpp index fa29b8b3..90bb56f2 100644 --- a/libsnark/common/data_structures/set_commitment.hpp +++ b/libsnark/common/data_structures/set_commitment.hpp @@ -13,6 +13,7 @@ #define SET_COMMITMENT_HPP_ #include + #include #include // TODO: the current structure is suboptimal diff --git a/libsnark/common/data_structures/sparse_vector.hpp b/libsnark/common/data_structures/sparse_vector.hpp index bd292df5..c560e9f8 100644 --- a/libsnark/common/data_structures/sparse_vector.hpp +++ b/libsnark/common/data_structures/sparse_vector.hpp @@ -12,6 +12,7 @@ #ifndef SPARSE_VECTOR_HPP_ #define SPARSE_VECTOR_HPP_ +#include #include namespace libsnark { diff --git a/libsnark/common/data_structures/sparse_vector.tcc b/libsnark/common/data_structures/sparse_vector.tcc index 2f85e950..2e299df2 100644 --- a/libsnark/common/data_structures/sparse_vector.tcc +++ b/libsnark/common/data_structures/sparse_vector.tcc @@ -14,10 +14,10 @@ #ifndef SPARSE_VECTOR_TCC_ #define SPARSE_VECTOR_TCC_ -#include - #include +#include + namespace libsnark { template diff --git a/libsnark/common/routing_algorithms/as_waksman_routing_algorithm.hpp b/libsnark/common/routing_algorithms/as_waksman_routing_algorithm.hpp index f09dac1f..bf881c80 100644 --- a/libsnark/common/routing_algorithms/as_waksman_routing_algorithm.hpp +++ b/libsnark/common/routing_algorithms/as_waksman_routing_algorithm.hpp @@ -43,6 +43,7 @@ #include #include + #include namespace libsnark { diff --git a/libsnark/common/routing_algorithms/benes_routing_algorithm.cpp b/libsnark/common/routing_algorithms/benes_routing_algorithm.cpp index ffb1508e..acb52a46 100644 --- a/libsnark/common/routing_algorithms/benes_routing_algorithm.cpp +++ b/libsnark/common/routing_algorithms/benes_routing_algorithm.cpp @@ -11,9 +11,10 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include #include +#include + namespace libsnark { /** diff --git a/libsnark/common/routing_algorithms/benes_routing_algorithm.hpp b/libsnark/common/routing_algorithms/benes_routing_algorithm.hpp index 1b0adc9a..664ae482 100644 --- a/libsnark/common/routing_algorithms/benes_routing_algorithm.hpp +++ b/libsnark/common/routing_algorithms/benes_routing_algorithm.hpp @@ -27,9 +27,10 @@ #include -#include #include +#include + namespace libsnark { /** diff --git a/libsnark/common/routing_algorithms/profiling/profile_routing_algorithms.cpp b/libsnark/common/routing_algorithms/profiling/profile_routing_algorithms.cpp index dd31e5e1..6b857000 100644 --- a/libsnark/common/routing_algorithms/profiling/profile_routing_algorithms.cpp +++ b/libsnark/common/routing_algorithms/profiling/profile_routing_algorithms.cpp @@ -12,6 +12,7 @@ #include #include + #include #include diff --git a/libsnark/common/routing_algorithms/tests/test_routing_algorithms.cpp b/libsnark/common/routing_algorithms/tests/test_routing_algorithms.cpp index c227204e..54468d2e 100644 --- a/libsnark/common/routing_algorithms/tests/test_routing_algorithms.cpp +++ b/libsnark/common/routing_algorithms/tests/test_routing_algorithms.cpp @@ -12,8 +12,9 @@ #include #include -#include + #include +#include using namespace libsnark; diff --git a/libsnark/gadgetlib1/constraint_profiling.cpp b/libsnark/gadgetlib1/constraint_profiling.cpp index a6a77b7d..115e44c1 100644 --- a/libsnark/gadgetlib1/constraint_profiling.cpp +++ b/libsnark/gadgetlib1/constraint_profiling.cpp @@ -11,9 +11,10 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include #include +#include + namespace libsnark { size_t constraint_profiling_indent = 0; diff --git a/libsnark/gadgetlib1/gadgets/cpu_checkers/fooram/examples/test_fooram.cpp b/libsnark/gadgetlib1/gadgets/cpu_checkers/fooram/examples/test_fooram.cpp index 859eb7a2..baf7bb0e 100644 --- a/libsnark/gadgetlib1/gadgets/cpu_checkers/fooram/examples/test_fooram.cpp +++ b/libsnark/gadgetlib1/gadgets/cpu_checkers/fooram/examples/test_fooram.cpp @@ -4,13 +4,13 @@ * and contributors (see AUTHORS). * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include -#include #include -#include -#include +#include +#include #include +#include +#include namespace libsnark { diff --git a/libsnark/gadgetlib1/gadgets/cpu_checkers/fooram/fooram_cpu_checker.hpp b/libsnark/gadgetlib1/gadgets/cpu_checkers/fooram/fooram_cpu_checker.hpp index 0fb4efa7..7962d3fe 100644 --- a/libsnark/gadgetlib1/gadgets/cpu_checkers/fooram/fooram_cpu_checker.hpp +++ b/libsnark/gadgetlib1/gadgets/cpu_checkers/fooram/fooram_cpu_checker.hpp @@ -29,10 +29,11 @@ #include #include + #include #include -#include #include +#include #include namespace libsnark { diff --git a/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_arithmetic.hpp b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_arithmetic.hpp index 9252da71..a46a9a8e 100644 --- a/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_arithmetic.hpp +++ b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_arithmetic.hpp @@ -15,8 +15,9 @@ #define ALU_ARITHMETIC_HPP_ #include -#include #include +#include +#include namespace libsnark { diff --git a/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_control_flow.hpp b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_control_flow.hpp index 60d4ec22..ec0c3ae9 100644 --- a/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_control_flow.hpp +++ b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_control_flow.hpp @@ -14,8 +14,9 @@ #ifndef ALU_CONTROL_FLOW_HPP_ #define ALU_CONTROL_FLOW_HPP_ -#include #include +#include +#include namespace libsnark { diff --git a/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/argument_decoder_gadget.hpp b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/argument_decoder_gadget.hpp index 7c73acec..ebacc5e1 100644 --- a/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/argument_decoder_gadget.hpp +++ b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/argument_decoder_gadget.hpp @@ -12,6 +12,8 @@ #ifndef ARGUMENT_DECODER_GADGET_HPP_ #define ARGUMENT_DECODER_GADGET_HPP_ +#include + namespace libsnark { template diff --git a/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/consistency_enforcer_gadget.hpp b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/consistency_enforcer_gadget.hpp index ab79e4ac..c78194e6 100644 --- a/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/consistency_enforcer_gadget.hpp +++ b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/consistency_enforcer_gadget.hpp @@ -12,6 +12,8 @@ #ifndef CONSISTENCY_ENFORCER_GADGET_HPP_ #define CONSISTENCY_ENFORCER_GADGET_HPP_ +#include + namespace libsnark { template diff --git a/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/instruction_packing_gadget.hpp b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/instruction_packing_gadget.hpp deleted file mode 100644 index 2c31435c..00000000 --- a/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/instruction_packing_gadget.hpp +++ /dev/null @@ -1,58 +0,0 @@ -/** @file - ***************************************************************************** - - Declaration of interfaces for the TinyRAM instruction packing gadget. - - ***************************************************************************** - * @author This file is part of libsnark, developed by SCIPR Lab - * and contributors (see AUTHORS). - * @copyright MIT license (see LICENSE file) - *****************************************************************************/ - -#ifndef INSTRUCTION_PACKING_GADGET_HPP_ -#define INSTRUCTION_PACKING_GADGET_HPP_ - -namespace libsnark { - -template -class tinyram_instruction_packing_gadget : public tinyram_gadget { -private: - pb_variable_array all_bits; - - std::shared_ptr > pack_instruction; -public: - pb_variable_array opcode; - pb_variable arg2_is_imm; - pb_variable_array desidx; - pb_variable_array arg1idx; - pb_variable_array arg2idx; - pb_variable packed_instruction; - - pb_variable_array dummy; - - tinyram_instruction_packing_gadget(tinyram_protoboard &pb, - const pb_variable_array &opcode, - const pb_variable &arg2_is_imm, - const pb_variable_array &desidx, - const pb_variable_array &arg1idx, - const pb_variable_array &arg2idx, - const pb_variable &packed_instruction, - const std::string &annotation_prefix=""); - - void generate_r1cs_constraints(const bool enforce_bitness); - void generate_r1cs_witness_from_packed(); - void generate_r1cs_witness_from_bits(); -}; - -template -FieldT pack_instruction(const tinyram_architecture_params &ap, - const tinyram_instruction &instr); - -template -void test_instruction_packing(); - -} // libsnark - -#include - -#endif // INSTRUCTION_PACKING_GADGET_HPP_ diff --git a/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/instruction_packing_gadget.tcc b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/instruction_packing_gadget.tcc deleted file mode 100644 index 638b7298..00000000 --- a/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/instruction_packing_gadget.tcc +++ /dev/null @@ -1,195 +0,0 @@ -/** @file - ***************************************************************************** - - Implementation of interfaces for the TinyRAM instruction packing gadget. - - See instruction_packing_gadget.hpp . - - ***************************************************************************** - * @author This file is part of libsnark, developed by SCIPR Lab - * and contributors (see AUTHORS). - * @copyright MIT license (see LICENSE file) - *****************************************************************************/ - -#ifndef INSTRUCTION_PACKING_GADGET_TCC_ -#define INSTRUCTION_PACKING_GADGET_TCC_ - -namespace libsnark { - -template -tinyram_instruction_packing_gadget::tinyram_instruction_packing_gadget(tinyram_protoboard &pb, - const pb_variable_array &opcode, - const pb_variable &arg2_is_imm, - const pb_variable_array &desidx, - const pb_variable_array &arg1idx, - const pb_variable_array &arg2idx, - const pb_variable &packed_instruction, - const std::string &annotation_prefix) : - tinyram_gadget(pb, annotation_prefix), - opcode(opcode), - arg2_is_imm(arg2_is_imm), - desidx(desidx), - arg1idx(arg1idx), - arg2idx(arg2idx), - packed_instruction(packed_instruction) -{ - all_bits.reserve(2*pb.ap.w); - - all_bits.insert(all_bits.begin(), opcode.begin(), opcode.end()); - all_bits.insert(all_bits.begin(), arg2_is_imm); - all_bits.insert(all_bits.begin(), desidx.begin(), desidx.end()); - all_bits.insert(all_bits.begin(), arg1idx.begin(), arg1idx.end()); - dummy.allocate(pb, pb.ap.w-all_bits.size(), FMT(this->annotation_prefix, " dummy")); - all_bits.insert(all_bits.begin(), dummy.begin(), dummy.end()); - all_bits.insert(all_bits.begin(), arg2idx.begin(), arg2idx.end()); - - assert(all_bits.size() == 2*pb.ap.w); - - pack_instruction.reset( - new packing_gadget(pb, all_bits, packed_instruction, FMT(this->annotation_prefix, " pack_instruction"))); -} - - -template -void tinyram_instruction_packing_gadget::generate_r1cs_constraints(const bool enforce_bitness) -{ - pack_instruction->generate_r1cs_constraints(enforce_bitness); -} - -template -void tinyram_instruction_packing_gadget::generate_r1cs_witness_from_packed() -{ - pack_instruction->generate_r1cs_witness_from_packed(); -} - -template -void tinyram_instruction_packing_gadget::generate_r1cs_witness_from_bits() -{ - pack_instruction->generate_r1cs_witness_from_bits(); -} - -template -FieldT pack_instruction(const tinyram_architecture_params &ap, - const tinyram_instruction &instr) -{ - tinyram_program P; P.instructions = generate_tinyram_prelude(ap); - tinyram_protoboard pb(ap, P.size(), 0, 10); - - pb_variable_array v_opcode; - pb_variable v_arg2_is_imm; - pb_variable_array v_desidx; - pb_variable_array v_arg1idx; - pb_variable_array v_arg2idx; - - v_opcode.allocate(pb, ap.s, "opcode"); - v_arg2_is_imm.allocate(pb, "arg2_is_imm"); - v_desidx.allocate(pb, ap.reg_arg_width(), "desidx"); - v_arg1idx.allocate(pb, ap.reg_arg_width(), "arg1idx"); - v_arg2idx.allocate(pb, ap.reg_arg_or_imm_width(), "arg2idx"); - - v_opcode.fill_with_bits_of_ulong(pb, instr.opcode); - pb.val(v_arg2_is_imm) = instr.arg2_is_imm ? FieldT::one() : FieldT::zero(); - v_desidx.fill_with_bits_of_ulong(pb, instr.desidx); - v_arg1idx.fill_with_bits_of_ulong(pb, instr.arg1idx); - v_arg2idx.fill_with_bits_of_ulong(pb, instr.arg2idx_or_imm); - - pb_variable packed; - packed.allocate(pb, "packed"); - - tinyram_instruction_packing_gadget g(pb, v_opcode, v_arg2_is_imm, v_desidx, v_arg1idx, v_arg2idx, packed, "g"); - g.generate_r1cs_constraints(true); - g.generate_r1cs_witness_from_bits(); - - return pb.val(packed); -} - -template -void test_instruction_packing() -{ - libff::print_time("starting instruction packing test"); - - tinyram_architecture_params ap(16, 16); - tinyram_program P; P.instructions = generate_tinyram_prelude(ap); - tinyram_protoboard pb(ap, P.size(), 0, 10); - - pb_variable_array opcode[2]; - pb_variable arg2_is_imm[2]; - pb_variable_array desidx[2]; - pb_variable_array arg1idx[2]; - pb_variable_array arg2idx[2]; - - for (size_t i = 0; i < 2; ++i) - { - opcode[i].allocate(pb, ap.s, FMT("", "opcode_%zu", i)); - arg2_is_imm[i].allocate(pb, FMT("", "arg2_is_imm_%zu", i)); - desidx[i].allocate(pb, ap.reg_arg_width(), FMT("", "desidx_%zu", i)); - arg1idx[i].allocate(pb, ap.reg_arg_width(), FMT("", "arg1idx_%zu", i)); - arg2idx[i].allocate(pb, ap.reg_arg_or_imm_width(), FMT("", "arg2idx_%zu", i)); - } - - pb_variable packed_instr; - packed_instr.allocate(pb, "packed_instr"); - - instruction_packing_gadget pack(pb, opcode[0], arg2_is_imm[0], desidx[0], arg1idx[0], arg2idx[0], packed_instr, "pack"); - instruction_packing_gadget unpack(pb, opcode[1], arg2_is_imm[1], desidx[1], arg1idx[1], arg2idx[1], packed_instr, "unpack"); - - pack.generate_r1cs_constraints(true); - unpack.generate_r1cs_constraints(true); - - for (size_t k = 0; k < 100; ++k) - { - tinyram_opcode oc = static_cast(std::rand() % (1u << ap.s)); - bool imm = std::rand() % 2; - size_t des = rand() % (1u << ap.reg_arg_width()); - size_t arg1 = rand() % (1u << ap.reg_arg_width()); - size_t arg2 = rand() % (1u << ap.reg_arg_or_imm_width()); - - for (size_t i = 0; i < ap.s; ++i) - { - pb.val(opcode[0][i]) = (oc & (1ul<(ap, tinyram_instruction(oc, imm, des, arg1, arg2))); - assert(pb.is_satisfied()); - } - - libff::print_time("instruction packing tests successful"); -} - -} // libsnark - -#endif // INSTRUCTION_PACKING_GADGET_TCC_ diff --git a/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/memory_masking_gadget.hpp b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/memory_masking_gadget.hpp index 6bc0bee9..9cb10ac8 100644 --- a/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/memory_masking_gadget.hpp +++ b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/memory_masking_gadget.hpp @@ -12,6 +12,9 @@ #ifndef MEMORY_MASKING_GADGET_HPP_ #define MEMORY_MASKING_GADGET_HPP_ +#include +#include + namespace libsnark { /** diff --git a/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/tinyram_protoboard.hpp b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/tinyram_protoboard.hpp index 0e97ee3a..c15b49d8 100644 --- a/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/tinyram_protoboard.hpp +++ b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/tinyram_protoboard.hpp @@ -12,10 +12,10 @@ #ifndef TINYRAM_PROTOBOARD_HPP_ #define TINYRAM_PROTOBOARD_HPP_ +#include +#include #include #include -#include -#include namespace libsnark { diff --git a/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/tinyram_cpu_checker.hpp b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/tinyram_cpu_checker.hpp index a589526c..66503ec8 100644 --- a/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/tinyram_cpu_checker.hpp +++ b/libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/tinyram_cpu_checker.hpp @@ -14,12 +14,12 @@ #ifndef TINYRAM_CPU_CHECKER_HPP_ #define TINYRAM_CPU_CHECKER_HPP_ -#include -#include #include #include #include #include +#include +#include namespace libsnark { diff --git a/libsnark/gadgetlib1/gadgets/curves/weierstrass_g1_gadget.hpp b/libsnark/gadgetlib1/gadgets/curves/weierstrass_g1_gadget.hpp index 50e5cbda..b449df7f 100644 --- a/libsnark/gadgetlib1/gadgets/curves/weierstrass_g1_gadget.hpp +++ b/libsnark/gadgetlib1/gadgets/curves/weierstrass_g1_gadget.hpp @@ -15,6 +15,8 @@ #ifndef WEIERSTRASS_G1_GADGET_HPP_ #define WEIERSTRASS_G1_GADGET_HPP_ +#include + #include #include diff --git a/libsnark/gadgetlib1/gadgets/curves/weierstrass_g2_gadget.hpp b/libsnark/gadgetlib1/gadgets/curves/weierstrass_g2_gadget.hpp index bb116865..a1049d09 100644 --- a/libsnark/gadgetlib1/gadgets/curves/weierstrass_g2_gadget.hpp +++ b/libsnark/gadgetlib1/gadgets/curves/weierstrass_g2_gadget.hpp @@ -15,6 +15,10 @@ #ifndef WEIERSTRASS_G2_GADGET_HPP_ #define WEIERSTRASS_G2_GADGET_HPP_ +#include + +#include + #include #include diff --git a/libsnark/gadgetlib1/gadgets/fields/exponentiation_gadget.hpp b/libsnark/gadgetlib1/gadgets/fields/exponentiation_gadget.hpp index 3b1bbcba..95404e9c 100644 --- a/libsnark/gadgetlib1/gadgets/fields/exponentiation_gadget.hpp +++ b/libsnark/gadgetlib1/gadgets/fields/exponentiation_gadget.hpp @@ -14,8 +14,10 @@ #include #include + #include #include + #include namespace libsnark { diff --git a/libsnark/gadgetlib1/gadgets/fields/fp2_gadgets.hpp b/libsnark/gadgetlib1/gadgets/fields/fp2_gadgets.hpp index 30247c22..24f79d7a 100644 --- a/libsnark/gadgetlib1/gadgets/fields/fp2_gadgets.hpp +++ b/libsnark/gadgetlib1/gadgets/fields/fp2_gadgets.hpp @@ -15,9 +15,10 @@ #ifndef FP2_GADGETS_HPP_ #define FP2_GADGETS_HPP_ -#include #include +#include + namespace libsnark { /** diff --git a/libsnark/gadgetlib1/gadgets/fields/fp3_gadgets.hpp b/libsnark/gadgetlib1/gadgets/fields/fp3_gadgets.hpp index b179ede3..24c3d66a 100644 --- a/libsnark/gadgetlib1/gadgets/fields/fp3_gadgets.hpp +++ b/libsnark/gadgetlib1/gadgets/fields/fp3_gadgets.hpp @@ -15,6 +15,10 @@ #ifndef FP3_GADGETS_HPP_ #define FP3_GADGETS_HPP_ +#include + +#include + namespace libsnark { /** diff --git a/libsnark/gadgetlib1/gadgets/fields/fp4_gadgets.hpp b/libsnark/gadgetlib1/gadgets/fields/fp4_gadgets.hpp index 76094962..14a03b67 100644 --- a/libsnark/gadgetlib1/gadgets/fields/fp4_gadgets.hpp +++ b/libsnark/gadgetlib1/gadgets/fields/fp4_gadgets.hpp @@ -15,6 +15,9 @@ #ifndef FP4_GADGETS_HPP_ #define FP4_GADGETS_HPP_ +#include +#include + namespace libsnark { /** diff --git a/libsnark/gadgetlib1/gadgets/fields/fp6_gadgets.hpp b/libsnark/gadgetlib1/gadgets/fields/fp6_gadgets.hpp index 6b40881b..3cac027f 100644 --- a/libsnark/gadgetlib1/gadgets/fields/fp6_gadgets.hpp +++ b/libsnark/gadgetlib1/gadgets/fields/fp6_gadgets.hpp @@ -15,7 +15,9 @@ #ifndef FP6_GADGETS_HPP_ #define FP6_GADGETS_HPP_ +#include #include +#include namespace libsnark { diff --git a/libsnark/gadgetlib1/gadgets/hashes/hash_io.hpp b/libsnark/gadgetlib1/gadgets/hashes/hash_io.hpp index 7bbc1d44..34c89cf1 100644 --- a/libsnark/gadgetlib1/gadgets/hashes/hash_io.hpp +++ b/libsnark/gadgetlib1/gadgets/hashes/hash_io.hpp @@ -8,6 +8,7 @@ #define HASH_IO_HPP_ #include #include + #include namespace libsnark { diff --git a/libsnark/gadgetlib1/gadgets/hashes/knapsack/knapsack_gadget.hpp b/libsnark/gadgetlib1/gadgets/hashes/knapsack/knapsack_gadget.hpp index d56b95a6..5b1880a5 100644 --- a/libsnark/gadgetlib1/gadgets/hashes/knapsack/knapsack_gadget.hpp +++ b/libsnark/gadgetlib1/gadgets/hashes/knapsack/knapsack_gadget.hpp @@ -43,9 +43,9 @@ #ifndef KNAPSACK_GADGET_HPP_ #define KNAPSACK_GADGET_HPP_ +#include #include #include -#include namespace libsnark { diff --git a/libsnark/gadgetlib1/gadgets/hashes/knapsack/tests/test_knapsack_gadget.cpp b/libsnark/gadgetlib1/gadgets/hashes/knapsack/tests/test_knapsack_gadget.cpp index 72c66c00..e07cd0ea 100644 --- a/libsnark/gadgetlib1/gadgets/hashes/knapsack/tests/test_knapsack_gadget.cpp +++ b/libsnark/gadgetlib1/gadgets/hashes/knapsack/tests/test_knapsack_gadget.cpp @@ -11,6 +11,7 @@ #include #include #include + #include namespace libsnark { diff --git a/libsnark/gadgetlib1/gadgets/hashes/sha256/tests/test_sha256_gadget.cpp b/libsnark/gadgetlib1/gadgets/hashes/sha256/tests/test_sha256_gadget.cpp index bc430fc5..76bf940d 100644 --- a/libsnark/gadgetlib1/gadgets/hashes/sha256/tests/test_sha256_gadget.cpp +++ b/libsnark/gadgetlib1/gadgets/hashes/sha256/tests/test_sha256_gadget.cpp @@ -6,8 +6,9 @@ *****************************************************************************/ #include -#include #include +#include + #include using namespace libsnark; diff --git a/libsnark/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_read_gadget.hpp b/libsnark/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_read_gadget.hpp index 3e625e47..d9eda92d 100644 --- a/libsnark/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_read_gadget.hpp +++ b/libsnark/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_read_gadget.hpp @@ -19,8 +19,8 @@ #include #include #include -#include #include +#include #include namespace libsnark { diff --git a/libsnark/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_update_gadget.hpp b/libsnark/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_update_gadget.hpp index eb4bcdf5..34277278 100644 --- a/libsnark/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_update_gadget.hpp +++ b/libsnark/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_update_gadget.hpp @@ -20,8 +20,8 @@ #include #include #include -#include #include +#include #include namespace libsnark { diff --git a/libsnark/gadgetlib1/gadgets/merkle_tree/tests/test_merkle_tree_gadgets.cpp b/libsnark/gadgetlib1/gadgets/merkle_tree/tests/test_merkle_tree_gadgets.cpp index 5ff19083..604f966c 100644 --- a/libsnark/gadgetlib1/gadgets/merkle_tree/tests/test_merkle_tree_gadgets.cpp +++ b/libsnark/gadgetlib1/gadgets/merkle_tree/tests/test_merkle_tree_gadgets.cpp @@ -11,9 +11,10 @@ #include #include #include + +#include #include #include -#include using namespace libsnark; diff --git a/libsnark/gadgetlib1/gadgets/pairing/mnt_pairing_params.hpp b/libsnark/gadgetlib1/gadgets/pairing/mnt_pairing_params.hpp index a82c2c0d..74f75ff9 100644 --- a/libsnark/gadgetlib1/gadgets/pairing/mnt_pairing_params.hpp +++ b/libsnark/gadgetlib1/gadgets/pairing/mnt_pairing_params.hpp @@ -18,11 +18,12 @@ #include #include -#include + #include -#include #include +#include #include +#include namespace libsnark { diff --git a/libsnark/gadgetlib1/gadgets/pairing/pairing_checks.hpp b/libsnark/gadgetlib1/gadgets/pairing/pairing_checks.hpp index b49b92c1..162611cb 100644 --- a/libsnark/gadgetlib1/gadgets/pairing/pairing_checks.hpp +++ b/libsnark/gadgetlib1/gadgets/pairing/pairing_checks.hpp @@ -17,9 +17,10 @@ #define PAIRING_CHECKS_HPP_ #include + #include -#include #include +#include namespace libsnark { diff --git a/libsnark/gadgetlib1/gadgets/pairing/weierstrass_final_exponentiation.hpp b/libsnark/gadgetlib1/gadgets/pairing/weierstrass_final_exponentiation.hpp index e93a21c1..c2d0c2cc 100644 --- a/libsnark/gadgetlib1/gadgets/pairing/weierstrass_final_exponentiation.hpp +++ b/libsnark/gadgetlib1/gadgets/pairing/weierstrass_final_exponentiation.hpp @@ -16,8 +16,9 @@ #define WEIERSTRASS_FINAL_EXPONENTIATION_HPP_ #include -#include + #include +#include namespace libsnark { diff --git a/libsnark/gadgetlib1/gadgets/pairing/weierstrass_miller_loop.hpp b/libsnark/gadgetlib1/gadgets/pairing/weierstrass_miller_loop.hpp index 2ff438fa..96a9aa73 100644 --- a/libsnark/gadgetlib1/gadgets/pairing/weierstrass_miller_loop.hpp +++ b/libsnark/gadgetlib1/gadgets/pairing/weierstrass_miller_loop.hpp @@ -15,6 +15,7 @@ #define WEIERSTRASS_MILLER_LOOP_HPP_ #include + #include #include diff --git a/libsnark/gadgetlib1/gadgets/pairing/weierstrass_miller_loop.tcc b/libsnark/gadgetlib1/gadgets/pairing/weierstrass_miller_loop.tcc index a131e823..c825d26c 100644 --- a/libsnark/gadgetlib1/gadgets/pairing/weierstrass_miller_loop.tcc +++ b/libsnark/gadgetlib1/gadgets/pairing/weierstrass_miller_loop.tcc @@ -15,6 +15,7 @@ #define WEIERSTRASS_MILLER_LOOP_TCC_ #include + #include #include diff --git a/libsnark/gadgetlib1/gadgets/pairing/weierstrass_precomputation.hpp b/libsnark/gadgetlib1/gadgets/pairing/weierstrass_precomputation.hpp index 3799c008..03c138d6 100644 --- a/libsnark/gadgetlib1/gadgets/pairing/weierstrass_precomputation.hpp +++ b/libsnark/gadgetlib1/gadgets/pairing/weierstrass_precomputation.hpp @@ -15,6 +15,10 @@ #define WEIERSTRASS_PRECOMPUTATION_HPP_ #include + +#include +#include + #include #include #include diff --git a/libsnark/gadgetlib1/gadgets/pairing/weierstrass_precomputation.tcc b/libsnark/gadgetlib1/gadgets/pairing/weierstrass_precomputation.tcc index 44a460c5..f4b3d5bb 100644 --- a/libsnark/gadgetlib1/gadgets/pairing/weierstrass_precomputation.tcc +++ b/libsnark/gadgetlib1/gadgets/pairing/weierstrass_precomputation.tcc @@ -15,6 +15,7 @@ #define WEIERSTRASS_PRECOMPUTATION_TCC_ #include + #include namespace libsnark { diff --git a/libsnark/gadgetlib1/gadgets/routing/as_waksman_routing_gadget.hpp b/libsnark/gadgetlib1/gadgets/routing/as_waksman_routing_gadget.hpp index c6c98b60..f86a456a 100644 --- a/libsnark/gadgetlib1/gadgets/routing/as_waksman_routing_gadget.hpp +++ b/libsnark/gadgetlib1/gadgets/routing/as_waksman_routing_gadget.hpp @@ -15,10 +15,10 @@ #ifndef AS_WAKSMAN_ROUTING_GADGET_HPP_ #define AS_WAKSMAN_ROUTING_GADGET_HPP_ -#include -#include #include #include +#include +#include namespace libsnark { diff --git a/libsnark/gadgetlib1/gadgets/routing/as_waksman_routing_gadget.tcc b/libsnark/gadgetlib1/gadgets/routing/as_waksman_routing_gadget.tcc index d3bf0a38..924f6148 100644 --- a/libsnark/gadgetlib1/gadgets/routing/as_waksman_routing_gadget.tcc +++ b/libsnark/gadgetlib1/gadgets/routing/as_waksman_routing_gadget.tcc @@ -16,9 +16,10 @@ #include -#include #include +#include + namespace libsnark { template diff --git a/libsnark/gadgetlib1/gadgets/routing/benes_routing_gadget.tcc b/libsnark/gadgetlib1/gadgets/routing/benes_routing_gadget.tcc index 1ec9c789..9d2406dd 100644 --- a/libsnark/gadgetlib1/gadgets/routing/benes_routing_gadget.tcc +++ b/libsnark/gadgetlib1/gadgets/routing/benes_routing_gadget.tcc @@ -14,10 +14,10 @@ #ifndef BENES_ROUTING_GADGET_TCC_ #define BENES_ROUTING_GADGET_TCC_ -#include - #include +#include + namespace libsnark { template diff --git a/libsnark/gadgetlib1/gadgets/routing/profiling/profile_routing_gadgets.cpp b/libsnark/gadgetlib1/gadgets/routing/profiling/profile_routing_gadgets.cpp index 1bac6a7f..31c2deab 100644 --- a/libsnark/gadgetlib1/gadgets/routing/profiling/profile_routing_gadgets.cpp +++ b/libsnark/gadgetlib1/gadgets/routing/profiling/profile_routing_gadgets.cpp @@ -13,8 +13,9 @@ #include #include -#include + #include +#include using namespace libsnark; diff --git a/libsnark/gadgetlib1/gadgets/set_commitment/tests/test_set_commitment_gadget.cpp b/libsnark/gadgetlib1/gadgets/set_commitment/tests/test_set_commitment_gadget.cpp index b0985a8a..3ba23f97 100644 --- a/libsnark/gadgetlib1/gadgets/set_commitment/tests/test_set_commitment_gadget.cpp +++ b/libsnark/gadgetlib1/gadgets/set_commitment/tests/test_set_commitment_gadget.cpp @@ -11,8 +11,9 @@ #include #include #include -#include + #include +#include using namespace libsnark; diff --git a/libsnark/gadgetlib1/gadgets/verifiers/tests/test_r1cs_ppzksnark_verifier_gadget.cpp b/libsnark/gadgetlib1/gadgets/verifiers/tests/test_r1cs_ppzksnark_verifier_gadget.cpp index 12be73b3..5f3b6426 100644 --- a/libsnark/gadgetlib1/gadgets/verifiers/tests/test_r1cs_ppzksnark_verifier_gadget.cpp +++ b/libsnark/gadgetlib1/gadgets/verifiers/tests/test_r1cs_ppzksnark_verifier_gadget.cpp @@ -7,6 +7,7 @@ #include #include #include + #include #include #include diff --git a/libsnark/gadgetlib1/pb_variable.hpp b/libsnark/gadgetlib1/pb_variable.hpp index 85b18bc1..e3a1bd8f 100644 --- a/libsnark/gadgetlib1/pb_variable.hpp +++ b/libsnark/gadgetlib1/pb_variable.hpp @@ -11,7 +11,9 @@ #include #include #include + #include + #include namespace libsnark { diff --git a/libsnark/gadgetlib1/pb_variable.tcc b/libsnark/gadgetlib1/pb_variable.tcc index 0a38aaf2..ea395547 100644 --- a/libsnark/gadgetlib1/pb_variable.tcc +++ b/libsnark/gadgetlib1/pb_variable.tcc @@ -8,9 +8,11 @@ #ifndef PB_VARIABLE_TCC_ #define PB_VARIABLE_TCC_ #include -#include + #include +#include + namespace libsnark { template diff --git a/libsnark/gadgetlib1/protoboard.hpp b/libsnark/gadgetlib1/protoboard.hpp index 92eeb1a5..9302c2f5 100644 --- a/libsnark/gadgetlib1/protoboard.hpp +++ b/libsnark/gadgetlib1/protoboard.hpp @@ -13,9 +13,11 @@ #include #include #include + +#include + #include #include -#include namespace libsnark { diff --git a/libsnark/gadgetlib1/protoboard.tcc b/libsnark/gadgetlib1/protoboard.tcc index 1f0e6c0e..a38f0ffd 100644 --- a/libsnark/gadgetlib1/protoboard.tcc +++ b/libsnark/gadgetlib1/protoboard.tcc @@ -8,8 +8,9 @@ #ifndef PROTOBOARD_TCC_ #define PROTOBOARD_TCC_ -#include #include +#include + #include namespace libsnark { diff --git a/libsnark/gadgetlib1/tests/gadgetlib1_test.cpp b/libsnark/gadgetlib1/tests/gadgetlib1_test.cpp index 4de56bbf..b53957c4 100644 --- a/libsnark/gadgetlib1/tests/gadgetlib1_test.cpp +++ b/libsnark/gadgetlib1/tests/gadgetlib1_test.cpp @@ -8,6 +8,7 @@ *****************************************************************************/ #include + #include #include diff --git a/libsnark/gadgetlib2/adapters.hpp b/libsnark/gadgetlib2/adapters.hpp index c923337e..1d43f5a5 100644 --- a/libsnark/gadgetlib2/adapters.hpp +++ b/libsnark/gadgetlib2/adapters.hpp @@ -10,13 +10,14 @@ #ifndef LIBSNARK_GADGETLIB2_INCLUDE_GADGETLIB2_ADAPTERS_HPP_ #define LIBSNARK_GADGETLIB2_INCLUDE_GADGETLIB2_ADAPTERS_HPP_ -#include -#include #include -#include -#include +#include +#include + #include +#include #include +#include using gadgetlib2::LinearTerm; using gadgetlib2::LinearCombination; diff --git a/libsnark/gadgetlib2/constraint.cpp b/libsnark/gadgetlib2/constraint.cpp index 23c6388a..d67fdf77 100644 --- a/libsnark/gadgetlib2/constraint.cpp +++ b/libsnark/gadgetlib2/constraint.cpp @@ -9,9 +9,10 @@ #include #include -#include #include #include +#include + #include #include diff --git a/libsnark/gadgetlib2/constraint.hpp b/libsnark/gadgetlib2/constraint.hpp index fc76024e..4daaf0a9 100644 --- a/libsnark/gadgetlib2/constraint.hpp +++ b/libsnark/gadgetlib2/constraint.hpp @@ -14,8 +14,9 @@ #ifndef LIBSNARK_GADGETLIB2_INCLUDE_GADGETLIB2_CONSTRAINT_HPP_ #define LIBSNARK_GADGETLIB2_INCLUDE_GADGETLIB2_CONSTRAINT_HPP_ -#include #include +#include + #include namespace gadgetlib2 { diff --git a/libsnark/gadgetlib2/examples/simple_example.cpp b/libsnark/gadgetlib2/examples/simple_example.cpp index dc224a0b..5589427a 100644 --- a/libsnark/gadgetlib2/examples/simple_example.cpp +++ b/libsnark/gadgetlib2/examples/simple_example.cpp @@ -5,9 +5,8 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include - #include +#include #include #include diff --git a/libsnark/gadgetlib2/examples/simple_example.hpp b/libsnark/gadgetlib2/examples/simple_example.hpp index 64d547b0..8fca4471 100644 --- a/libsnark/gadgetlib2/examples/simple_example.hpp +++ b/libsnark/gadgetlib2/examples/simple_example.hpp @@ -9,6 +9,7 @@ #define SIMPLE_EXAMPLE_HPP_ #include + #include namespace libsnark { diff --git a/libsnark/gadgetlib2/examples/tutorial.cpp b/libsnark/gadgetlib2/examples/tutorial.cpp index aaf6b4f9..62690567 100644 --- a/libsnark/gadgetlib2/examples/tutorial.cpp +++ b/libsnark/gadgetlib2/examples/tutorial.cpp @@ -10,11 +10,12 @@ This file is meant to be read top-down as a tutorial for gadget writing. * @copyright MIT license (see LICENSE file) *****************************************************************************/ +#include "third_party/gtest/googletest/include/gtest/gtest.h" + #include +#include #include -#include "third_party/gtest/googletest/include/gtest/gtest.h" #include -#include namespace gadgetExamples { @@ -490,10 +491,10 @@ TEST(Examples, R1P_VerifyTransactionAmounts_Gadget) { TEST(gadgetLib2,Integration) { initPublicParamsFromDefaultPp(); // Create an example constraint system and translate to libsnark format - const libff::r1cs_example > example = libff::gen_r1cs_example_from_gadgetlib2_protoboard(100); + const libsnark::r1cs_example > example = libsnark::gen_r1cs_example_from_gadgetlib2_protoboard(100); const bool test_serialization = false; // Run ppzksnark. Jump into function for breakdown - const bool bit = libff::run_r1cs_ppzksnark(example, test_serialization); + const bool bit = libsnark::run_r1cs_ppzksnark(example, test_serialization); EXPECT_TRUE(bit); }; diff --git a/libsnark/gadgetlib2/gadget.cpp b/libsnark/gadgetlib2/gadget.cpp index 7fff1699..04d7ee2f 100644 --- a/libsnark/gadgetlib2/gadget.cpp +++ b/libsnark/gadgetlib2/gadget.cpp @@ -12,6 +12,7 @@ #include #include + #include using ::std::shared_ptr; diff --git a/libsnark/gadgetlib2/gadget.hpp b/libsnark/gadgetlib2/gadget.hpp index 5c832166..7e8e8e1f 100644 --- a/libsnark/gadgetlib2/gadget.hpp +++ b/libsnark/gadgetlib2/gadget.hpp @@ -37,9 +37,10 @@ #define LIBSNARK_GADGETLIB2_INCLUDE_GADGETLIB2_GADGET_HPP_ #include -#include -#include + #include +#include +#include namespace gadgetlib2 { diff --git a/libsnark/gadgetlib2/infrastructure.cpp b/libsnark/gadgetlib2/infrastructure.cpp index b8202d95..ee5c1658 100644 --- a/libsnark/gadgetlib2/infrastructure.cpp +++ b/libsnark/gadgetlib2/infrastructure.cpp @@ -7,12 +7,12 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include - -#include #include -#include #include +#include +#include + +#include #ifdef __linux__ #include #endif diff --git a/libsnark/gadgetlib2/infrastructure.hpp b/libsnark/gadgetlib2/infrastructure.hpp index 077ea221..be81bee5 100644 --- a/libsnark/gadgetlib2/infrastructure.hpp +++ b/libsnark/gadgetlib2/infrastructure.hpp @@ -7,11 +7,12 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include -#include -#include #include #include +#include +#include +#include + #include #ifndef __infrastructure_HPP diff --git a/libsnark/gadgetlib2/integration.hpp b/libsnark/gadgetlib2/integration.hpp index de7e8ec3..574f623f 100644 --- a/libsnark/gadgetlib2/integration.hpp +++ b/libsnark/gadgetlib2/integration.hpp @@ -9,8 +9,9 @@ #define INTEGRATION_HPP_ #include -#include + #include +#include namespace libsnark { diff --git a/libsnark/gadgetlib2/pp.cpp b/libsnark/gadgetlib2/pp.cpp index 18477954..c433fcc6 100644 --- a/libsnark/gadgetlib2/pp.cpp +++ b/libsnark/gadgetlib2/pp.cpp @@ -9,6 +9,7 @@ #include #include + #include namespace gadgetlib2 { diff --git a/libsnark/gadgetlib2/pp.hpp b/libsnark/gadgetlib2/pp.hpp index 16f692c2..b072fcf8 100644 --- a/libsnark/gadgetlib2/pp.hpp +++ b/libsnark/gadgetlib2/pp.hpp @@ -10,11 +10,11 @@ #ifndef LIBSNARK_GADGETLIB2_INCLUDE_GADGETLIB2_PP_HPP_ #define LIBSNARK_GADGETLIB2_INCLUDE_GADGETLIB2_PP_HPP_ -#include - #include #include +#include + namespace gadgetlib2 { /*************************************************************************************************/ diff --git a/libsnark/gadgetlib2/protoboard.cpp b/libsnark/gadgetlib2/protoboard.cpp index b41eff1c..b8fc978e 100644 --- a/libsnark/gadgetlib2/protoboard.cpp +++ b/libsnark/gadgetlib2/protoboard.cpp @@ -8,6 +8,7 @@ *****************************************************************************/ #include + #include using ::std::string; diff --git a/libsnark/gadgetlib2/protoboard.hpp b/libsnark/gadgetlib2/protoboard.hpp index 97716602..7f0669be 100644 --- a/libsnark/gadgetlib2/protoboard.hpp +++ b/libsnark/gadgetlib2/protoboard.hpp @@ -11,9 +11,10 @@ #define LIBSNARK_GADGETLIB2_INCLUDE_GADGETLIB2_PROTOBOARD_HPP_ #include + +#include #include #include -#include #define ASSERT_CONSTRAINTS_SATISFIED(pb) \ ASSERT_TRUE(pb->isSatisfied(PrintOptions::DBG_PRINT_IF_NOT_SATISFIED)) diff --git a/libsnark/gadgetlib2/tests/adapters_UTEST.cpp b/libsnark/gadgetlib2/tests/adapters_UTEST.cpp index d07eba04..ce23398a 100644 --- a/libsnark/gadgetlib2/tests/adapters_UTEST.cpp +++ b/libsnark/gadgetlib2/tests/adapters_UTEST.cpp @@ -7,8 +7,9 @@ *****************************************************************************/ #include -#include + #include +#include using namespace gadgetlib2; diff --git a/libsnark/gadgetlib2/tests/constraint_UTEST.cpp b/libsnark/gadgetlib2/tests/constraint_UTEST.cpp index 94b74890..3deadd43 100644 --- a/libsnark/gadgetlib2/tests/constraint_UTEST.cpp +++ b/libsnark/gadgetlib2/tests/constraint_UTEST.cpp @@ -8,11 +8,12 @@ *****************************************************************************/ #include -#include -#include #include "third_party/gtest/googletest/include/gtest/gtest.h" +#include +#include + using ::std::set; using namespace gadgetlib2; diff --git a/libsnark/gadgetlib2/tests/gadget_UTEST.cpp b/libsnark/gadgetlib2/tests/gadget_UTEST.cpp index d34bc91c..86bfb76d 100644 --- a/libsnark/gadgetlib2/tests/gadget_UTEST.cpp +++ b/libsnark/gadgetlib2/tests/gadget_UTEST.cpp @@ -9,10 +9,12 @@ #include #include + #include + +#include #include #include -#include using ::std::cerr; using ::std::cout; diff --git a/libsnark/gadgetlib2/tests/integration_UTEST.cpp b/libsnark/gadgetlib2/tests/integration_UTEST.cpp index 39fb356e..46da43b9 100644 --- a/libsnark/gadgetlib2/tests/integration_UTEST.cpp +++ b/libsnark/gadgetlib2/tests/integration_UTEST.cpp @@ -7,14 +7,15 @@ #include #include -#include -#include -#include + +#include "third_party/gtest/googletest/include/gtest/gtest.h" #include #include +#include +#include +#include #include -#include "third_party/gtest/googletest/include/gtest/gtest.h" #include using namespace gadgetlib2; diff --git a/libsnark/gadgetlib2/tests/protoboard_UTEST.cpp b/libsnark/gadgetlib2/tests/protoboard_UTEST.cpp index 5ff85b1f..51b9af7b 100644 --- a/libsnark/gadgetlib2/tests/protoboard_UTEST.cpp +++ b/libsnark/gadgetlib2/tests/protoboard_UTEST.cpp @@ -8,6 +8,7 @@ *****************************************************************************/ #include + #include #include diff --git a/libsnark/gadgetlib2/tests/variable_UTEST.cpp b/libsnark/gadgetlib2/tests/variable_UTEST.cpp index 100b79a1..ceaef8b7 100644 --- a/libsnark/gadgetlib2/tests/variable_UTEST.cpp +++ b/libsnark/gadgetlib2/tests/variable_UTEST.cpp @@ -8,11 +8,12 @@ *****************************************************************************/ #include -#include -#include #include "third_party/gtest/googletest/include/gtest/gtest.h" +#include +#include + using ::std::set; using namespace gadgetlib2; diff --git a/libsnark/gadgetlib2/variable.cpp b/libsnark/gadgetlib2/variable.cpp index a961e17b..f747419b 100644 --- a/libsnark/gadgetlib2/variable.cpp +++ b/libsnark/gadgetlib2/variable.cpp @@ -12,9 +12,10 @@ #include #include #include -#include -#include + #include +#include +#include using ::std::string; using ::std::stringstream; diff --git a/libsnark/gadgetlib2/variable.hpp b/libsnark/gadgetlib2/variable.hpp index 6e7fd56c..f2f3f8b7 100644 --- a/libsnark/gadgetlib2/variable.hpp +++ b/libsnark/gadgetlib2/variable.hpp @@ -11,15 +11,16 @@ #define LIBSNARK_GADGETLIB2_INCLUDE_GADGETLIB2_VARIABLE_HPP_ #include -#include -#include -#include +#include #include +#include +#include #include #include -#include -#include +#include + #include +#include namespace gadgetlib2 { diff --git a/libsnark/knowledge_commitment/knowledge_commitment.hpp b/libsnark/knowledge_commitment/knowledge_commitment.hpp index b3002144..292e19fe 100644 --- a/libsnark/knowledge_commitment/knowledge_commitment.hpp +++ b/libsnark/knowledge_commitment/knowledge_commitment.hpp @@ -15,6 +15,7 @@ #define KNOWLEDGE_COMMITMENT_HPP_ #include + #include namespace libsnark { diff --git a/libsnark/reductions/ram_to_r1cs/examples/demo_arithmetization.cpp b/libsnark/reductions/ram_to_r1cs/examples/demo_arithmetization.cpp index 733c0a90..12ffc06d 100644 --- a/libsnark/reductions/ram_to_r1cs/examples/demo_arithmetization.cpp +++ b/libsnark/reductions/ram_to_r1cs/examples/demo_arithmetization.cpp @@ -5,16 +5,18 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ #include -#include #include +#include #include #include #ifndef MINDEPS #include #endif -#include +#include #include + +#include #include #include #include diff --git a/libsnark/reductions/ram_to_r1cs/gadgets/ram_universal_gadget.tcc b/libsnark/reductions/ram_to_r1cs/gadgets/ram_universal_gadget.tcc index 059b96ac..85d95b3a 100644 --- a/libsnark/reductions/ram_to_r1cs/gadgets/ram_universal_gadget.tcc +++ b/libsnark/reductions/ram_to_r1cs/gadgets/ram_universal_gadget.tcc @@ -14,10 +14,11 @@ #ifndef RAM_UNIVERSAL_GADGET_TCC_ #define RAM_UNIVERSAL_GADGET_TCC_ -#include +#include #include #include -#include + +#include #include namespace libsnark { diff --git a/libsnark/reductions/ram_to_r1cs/gadgets/trace_lines.hpp b/libsnark/reductions/ram_to_r1cs/gadgets/trace_lines.hpp index cfd77b09..7fdc9528 100644 --- a/libsnark/reductions/ram_to_r1cs/gadgets/trace_lines.hpp +++ b/libsnark/reductions/ram_to_r1cs/gadgets/trace_lines.hpp @@ -13,6 +13,10 @@ #define TRACE_LINES_HPP_ #include + +#include + +#include #include namespace libsnark { diff --git a/libsnark/reductions/tbcs_to_uscs/tbcs_to_uscs.hpp b/libsnark/reductions/tbcs_to_uscs/tbcs_to_uscs.hpp index 5564b477..acd18183 100644 --- a/libsnark/reductions/tbcs_to_uscs/tbcs_to_uscs.hpp +++ b/libsnark/reductions/tbcs_to_uscs/tbcs_to_uscs.hpp @@ -29,8 +29,8 @@ #ifndef TBCS_TO_USCS_HPP_ #define TBCS_TO_USCS_HPP_ -#include #include +#include namespace libsnark { diff --git a/libsnark/relations/arithmetic_programs/qap/qap.tcc b/libsnark/relations/arithmetic_programs/qap/qap.tcc index d9ec255d..0172b9b9 100644 --- a/libsnark/relations/arithmetic_programs/qap/qap.tcc +++ b/libsnark/relations/arithmetic_programs/qap/qap.tcc @@ -14,10 +14,10 @@ See qap.hpp . #ifndef QAP_TCC_ #define QAP_TCC_ +#include #include #include #include -#include namespace libsnark { diff --git a/libsnark/relations/arithmetic_programs/qap/tests/test_qap.cpp b/libsnark/relations/arithmetic_programs/qap/tests/test_qap.cpp index 46f2421e..7a20edbe 100644 --- a/libsnark/relations/arithmetic_programs/qap/tests/test_qap.cpp +++ b/libsnark/relations/arithmetic_programs/qap/tests/test_qap.cpp @@ -14,6 +14,7 @@ #include #include #include + #include #include diff --git a/libsnark/relations/arithmetic_programs/ssp/ssp.tcc b/libsnark/relations/arithmetic_programs/ssp/ssp.tcc index 9157c085..5905a126 100644 --- a/libsnark/relations/arithmetic_programs/ssp/ssp.tcc +++ b/libsnark/relations/arithmetic_programs/ssp/ssp.tcc @@ -14,10 +14,10 @@ #ifndef SSP_TCC_ #define SSP_TCC_ +#include #include #include #include -#include namespace libsnark { diff --git a/libsnark/relations/arithmetic_programs/ssp/tests/test_ssp.cpp b/libsnark/relations/arithmetic_programs/ssp/tests/test_ssp.cpp index b2da6dcd..2524a811 100644 --- a/libsnark/relations/arithmetic_programs/ssp/tests/test_ssp.cpp +++ b/libsnark/relations/arithmetic_programs/ssp/tests/test_ssp.cpp @@ -14,6 +14,7 @@ #include #include #include + #include #include diff --git a/libsnark/relations/circuit_satisfaction_problems/bacs/bacs.tcc b/libsnark/relations/circuit_satisfaction_problems/bacs/bacs.tcc index a6bcf74c..3a1140bc 100644 --- a/libsnark/relations/circuit_satisfaction_problems/bacs/bacs.tcc +++ b/libsnark/relations/circuit_satisfaction_problems/bacs/bacs.tcc @@ -20,6 +20,7 @@ #define BACS_TCC_ #include + #include #include diff --git a/libsnark/relations/circuit_satisfaction_problems/tbcs/examples/tbcs_examples.cpp b/libsnark/relations/circuit_satisfaction_problems/tbcs/examples/tbcs_examples.cpp index bbfb953c..027261c1 100644 --- a/libsnark/relations/circuit_satisfaction_problems/tbcs/examples/tbcs_examples.cpp +++ b/libsnark/relations/circuit_satisfaction_problems/tbcs/examples/tbcs_examples.cpp @@ -12,12 +12,12 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include - #include #include +#include + namespace libsnark { tbcs_example generate_tbcs_example(const size_t primary_input_size, diff --git a/libsnark/relations/circuit_satisfaction_problems/tbcs/tbcs.cpp b/libsnark/relations/circuit_satisfaction_problems/tbcs/tbcs.cpp index a87594b3..188671d3 100644 --- a/libsnark/relations/circuit_satisfaction_problems/tbcs/tbcs.cpp +++ b/libsnark/relations/circuit_satisfaction_problems/tbcs/tbcs.cpp @@ -14,11 +14,12 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include - #include + #include +#include + namespace libsnark { bool tbcs_gate::evaluate(const tbcs_variable_assignment &input) const diff --git a/libsnark/relations/circuit_satisfaction_problems/tbcs/tbcs.hpp b/libsnark/relations/circuit_satisfaction_problems/tbcs/tbcs.hpp index 1da3e5ce..d7f2a855 100644 --- a/libsnark/relations/circuit_satisfaction_problems/tbcs/tbcs.hpp +++ b/libsnark/relations/circuit_satisfaction_problems/tbcs/tbcs.hpp @@ -18,6 +18,7 @@ #define TBCS_HPP_ #include + #include namespace libsnark { diff --git a/libsnark/relations/constraint_satisfaction_problems/r1cs/r1cs.tcc b/libsnark/relations/constraint_satisfaction_problems/r1cs/r1cs.tcc index f0684784..23b89fb7 100644 --- a/libsnark/relations/constraint_satisfaction_problems/r1cs/r1cs.tcc +++ b/libsnark/relations/constraint_satisfaction_problems/r1cs/r1cs.tcc @@ -20,9 +20,10 @@ #include #include #include -#include -#include + #include +#include +#include namespace libsnark { diff --git a/libsnark/relations/constraint_satisfaction_problems/uscs/uscs.tcc b/libsnark/relations/constraint_satisfaction_problems/uscs/uscs.tcc index 3f730477..b566ee5c 100644 --- a/libsnark/relations/constraint_satisfaction_problems/uscs/uscs.tcc +++ b/libsnark/relations/constraint_satisfaction_problems/uscs/uscs.tcc @@ -20,9 +20,10 @@ #include #include #include -#include -#include + #include +#include +#include namespace libsnark { diff --git a/libsnark/relations/ram_computations/memory/examples/memory_contents_examples.cpp b/libsnark/relations/ram_computations/memory/examples/memory_contents_examples.cpp index 95649861..96082f10 100644 --- a/libsnark/relations/ram_computations/memory/examples/memory_contents_examples.cpp +++ b/libsnark/relations/ram_computations/memory/examples/memory_contents_examples.cpp @@ -11,12 +11,12 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include - #include #include #include +#include + namespace libsnark { memory_contents block_memory_contents(const size_t num_addresses, diff --git a/libsnark/relations/ram_computations/memory/memory_interface.hpp b/libsnark/relations/ram_computations/memory/memory_interface.hpp index b20281a2..01c625b9 100644 --- a/libsnark/relations/ram_computations/memory/memory_interface.hpp +++ b/libsnark/relations/ram_computations/memory/memory_interface.hpp @@ -13,8 +13,8 @@ #define MEMORY_INTERFACE_HPP_ #include -#include #include +#include namespace libsnark { diff --git a/libsnark/relations/ram_computations/rams/fooram/fooram_aux.cpp b/libsnark/relations/ram_computations/rams/fooram/fooram_aux.cpp index 6007aa57..0bd98de5 100644 --- a/libsnark/relations/ram_computations/rams/fooram/fooram_aux.cpp +++ b/libsnark/relations/ram_computations/rams/fooram/fooram_aux.cpp @@ -11,10 +11,10 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include - #include +#include + namespace libsnark { fooram_architecture_params::fooram_architecture_params(const size_t w) : w(w) diff --git a/libsnark/relations/ram_computations/rams/fooram/fooram_aux.hpp b/libsnark/relations/ram_computations/rams/fooram/fooram_aux.hpp index e96ca351..7d726a49 100644 --- a/libsnark/relations/ram_computations/rams/fooram/fooram_aux.hpp +++ b/libsnark/relations/ram_computations/rams/fooram/fooram_aux.hpp @@ -16,6 +16,7 @@ #include #include + #include namespace libsnark { diff --git a/libsnark/relations/ram_computations/rams/ram_params.hpp b/libsnark/relations/ram_computations/rams/ram_params.hpp index 7b137260..c60f8426 100644 --- a/libsnark/relations/ram_computations/rams/ram_params.hpp +++ b/libsnark/relations/ram_computations/rams/ram_params.hpp @@ -14,6 +14,8 @@ #include +#include + #include namespace libsnark { diff --git a/libsnark/relations/ram_computations/rams/tinyram/tinyram_aux.cpp b/libsnark/relations/ram_computations/rams/tinyram/tinyram_aux.cpp index 7b21c121..8866275e 100644 --- a/libsnark/relations/ram_computations/rams/tinyram/tinyram_aux.cpp +++ b/libsnark/relations/ram_computations/rams/tinyram/tinyram_aux.cpp @@ -16,9 +16,10 @@ #include #include -#include #include +#include + namespace libsnark { tinyram_instruction tinyram_default_instruction = tinyram_instruction(tinyram_opcode_ANSWER, true, 0, 0, 1); diff --git a/libsnark/relations/ram_computations/rams/tinyram/tinyram_aux.hpp b/libsnark/relations/ram_computations/rams/tinyram/tinyram_aux.hpp index c6cc4557..b7e14f46 100644 --- a/libsnark/relations/ram_computations/rams/tinyram/tinyram_aux.hpp +++ b/libsnark/relations/ram_computations/rams/tinyram/tinyram_aux.hpp @@ -17,6 +17,7 @@ #include #include + #include #include #include diff --git a/libsnark/relations/ram_computations/rams/tinyram/tinyram_params.hpp b/libsnark/relations/ram_computations/rams/tinyram/tinyram_params.hpp index 3040f008..bd73808c 100644 --- a/libsnark/relations/ram_computations/rams/tinyram/tinyram_params.hpp +++ b/libsnark/relations/ram_computations/rams/tinyram/tinyram_params.hpp @@ -12,9 +12,9 @@ #ifndef TINYRAM_PARAMS_HPP_ #define TINYRAM_PARAMS_HPP_ +#include #include #include -#include namespace libsnark { diff --git a/libsnark/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/compliance_predicate.hpp b/libsnark/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/compliance_predicate.hpp index ea2c8f4b..2305d2b3 100644 --- a/libsnark/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/compliance_predicate.hpp +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/compliance_predicate.hpp @@ -17,6 +17,8 @@ #ifndef COMPLIANCE_PREDICATE_HPP_ #define COMPLIANCE_PREDICATE_HPP_ +#include + #include namespace libsnark { diff --git a/libsnark/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/compliance_predicate.tcc b/libsnark/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/compliance_predicate.tcc index 365ba29e..1984a955 100644 --- a/libsnark/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/compliance_predicate.tcc +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/compliance_predicate.tcc @@ -15,7 +15,6 @@ #define COMPLIANCE_PREDICATE_TCC_ #include -#include namespace libsnark { diff --git a/libsnark/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/cp_handler.hpp b/libsnark/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/cp_handler.hpp index 083e6f54..8fb0af07 100644 --- a/libsnark/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/cp_handler.hpp +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/cp_handler.hpp @@ -15,8 +15,11 @@ #ifndef CP_HANDLER_HPP_ #define CP_HANDLER_HPP_ -#include +#include + +#include #include +#include namespace libsnark { diff --git a/libsnark/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/examples/tally_cp.tcc b/libsnark/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/examples/tally_cp.tcc index bb5ac071..3a25041d 100644 --- a/libsnark/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/examples/tally_cp.tcc +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/compliance_predicate/examples/tally_cp.tcc @@ -17,6 +17,8 @@ #include #include +#include + namespace libsnark { template diff --git a/libsnark/zk_proof_systems/pcd/r1cs_pcd/ppzkpcd_compliance_predicate.hpp b/libsnark/zk_proof_systems/pcd/r1cs_pcd/ppzkpcd_compliance_predicate.hpp index 1a280350..d7c70a61 100644 --- a/libsnark/zk_proof_systems/pcd/r1cs_pcd/ppzkpcd_compliance_predicate.hpp +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/ppzkpcd_compliance_predicate.hpp @@ -13,6 +13,7 @@ #define PPZKPCD_COMPLIANCE_PREDICATE_HPP_ #include + #include namespace libsnark { diff --git a/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/examples/run_r1cs_mp_ppzkpcd.hpp b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/examples/run_r1cs_mp_ppzkpcd.hpp index 841b99ad..fe814bb3 100644 --- a/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/examples/run_r1cs_mp_ppzkpcd.hpp +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/examples/run_r1cs_mp_ppzkpcd.hpp @@ -13,6 +13,8 @@ #ifndef RUN_R1CS_MP_PPZKPCD_HPP_ #define RUN_R1CS_MP_PPZKPCD_HPP_ +#include + namespace libsnark { /** diff --git a/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/examples/run_r1cs_mp_ppzkpcd.tcc b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/examples/run_r1cs_mp_ppzkpcd.tcc index e5fc00c8..7c3d2a77 100644 --- a/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/examples/run_r1cs_mp_ppzkpcd.tcc +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/examples/run_r1cs_mp_ppzkpcd.tcc @@ -15,9 +15,8 @@ #ifndef RUN_R1CS_MP_PPZKPCD_TCC_ #define RUN_R1CS_MP_PPZKPCD_TCC_ -#include - #include +#include namespace libsnark { diff --git a/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/mp_pcd_circuits.tcc b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/mp_pcd_circuits.tcc index 738de670..0c05bdf7 100644 --- a/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/mp_pcd_circuits.tcc +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/mp_pcd_circuits.tcc @@ -16,7 +16,9 @@ #define MP_PCD_CIRCUITS_TCC_ #include + #include + #include namespace libsnark { diff --git a/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/profiling/profile_r1cs_mp_ppzkpcd.cpp b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/profiling/profile_r1cs_mp_ppzkpcd.cpp index a14fb33b..9fef27c9 100644 --- a/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/profiling/profile_r1cs_mp_ppzkpcd.cpp +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/profiling/profile_r1cs_mp_ppzkpcd.cpp @@ -5,8 +5,8 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ #include -#include #include +#include using namespace libsnark; diff --git a/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd.tcc b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd.tcc index f84843e9..c5d013f5 100644 --- a/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd.tcc +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd.tcc @@ -20,6 +20,7 @@ #include #include + #include #include diff --git a/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd_params.hpp b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd_params.hpp index 79a6eb55..5ad3fcba 100644 --- a/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd_params.hpp +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd_params.hpp @@ -13,6 +13,7 @@ #define R1CS_MP_PPZKPCD_PARAMS_HPP_ #include + #include #include diff --git a/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_pcd_params.hpp b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_pcd_params.hpp index 2d969fbc..b757cfb1 100644 --- a/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_pcd_params.hpp +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_pcd_params.hpp @@ -8,7 +8,9 @@ #define R1CS_PCD_PARAMS_HPP_ #include -#include +#include + +#include namespace libsnark { diff --git a/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/examples/run_r1cs_sp_ppzkpcd.hpp b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/examples/run_r1cs_sp_ppzkpcd.hpp index 2386a8e0..c23994fb 100644 --- a/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/examples/run_r1cs_sp_ppzkpcd.hpp +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/examples/run_r1cs_sp_ppzkpcd.hpp @@ -13,6 +13,8 @@ #ifndef RUN_R1CS_SP_PPZKPCD_HPP_ #define RUN_R1CS_SP_PPZKPCD_HPP_ +#include + namespace libsnark { /** diff --git a/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/examples/run_r1cs_sp_ppzkpcd.tcc b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/examples/run_r1cs_sp_ppzkpcd.tcc index f22eeb00..b5a16dd6 100644 --- a/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/examples/run_r1cs_sp_ppzkpcd.tcc +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/examples/run_r1cs_sp_ppzkpcd.tcc @@ -15,9 +15,8 @@ #ifndef RUN_R1CS_SP_PPZKPCD_TCC_ #define RUN_R1CS_SP_PPZKPCD_TCC_ -#include - #include +#include namespace libsnark { diff --git a/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/profiling/profile_r1cs_sp_ppzkpcd.cpp b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/profiling/profile_r1cs_sp_ppzkpcd.cpp index f6b36e6d..592291e0 100644 --- a/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/profiling/profile_r1cs_sp_ppzkpcd.cpp +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/profiling/profile_r1cs_sp_ppzkpcd.cpp @@ -5,8 +5,8 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ #include -#include #include +#include using namespace libsnark; diff --git a/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd.hpp b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd.hpp index e5efdec7..c5928c38 100644 --- a/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd.hpp +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd.hpp @@ -42,8 +42,8 @@ #include -#include #include +#include namespace libsnark { diff --git a/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd.tcc b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd.tcc index c2cbac1b..2a80234b 100644 --- a/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd.tcc +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd.tcc @@ -20,6 +20,7 @@ #include #include + #include namespace libsnark { diff --git a/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd_params.hpp b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd_params.hpp index 2f0cddf2..6ae6e5d2 100644 --- a/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd_params.hpp +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd_params.hpp @@ -13,6 +13,7 @@ #define R1CS_SP_PPZKPCD_PARAMS_HPP_ #include + #include #include diff --git a/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/sp_pcd_circuits.hpp b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/sp_pcd_circuits.hpp index b9473f62..243562ee 100644 --- a/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/sp_pcd_circuits.hpp +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/sp_pcd_circuits.hpp @@ -26,11 +26,11 @@ #ifndef SP_PCD_CIRCUITS_HPP_ #define SP_PCD_CIRCUITS_HPP_ -#include #include #include #include #include +#include #include namespace libsnark { diff --git a/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/sp_pcd_circuits.tcc b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/sp_pcd_circuits.tcc index 5f33f09c..6aa83109 100644 --- a/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/sp_pcd_circuits.tcc +++ b/libsnark/zk_proof_systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/sp_pcd_circuits.tcc @@ -16,6 +16,7 @@ #define SP_PCD_CIRCUITS_TCC_ #include + #include namespace libsnark { diff --git a/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/demo_r1cs_ppzkadsnark.cpp b/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/demo_r1cs_ppzkadsnark.cpp index de74daa5..d07236ee 100644 --- a/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/demo_r1cs_ppzkadsnark.cpp +++ b/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/demo_r1cs_ppzkadsnark.cpp @@ -5,13 +5,14 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ #include -#include #include +#include #include #include -#include #include + +#include #include using namespace libsnark; @@ -23,7 +24,7 @@ int main(int argc, const char * argv[]) if (argc == 2 && strcmp(argv[1], "-v") == 0) { - print_compilation_info(); + libff::print_compilation_info(); return 0; } diff --git a/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/prf/aes_ctr_prf.tcc b/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/prf/aes_ctr_prf.tcc index 6ef3f3c0..6876596a 100644 --- a/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/prf/aes_ctr_prf.tcc +++ b/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/prf/aes_ctr_prf.tcc @@ -10,10 +10,11 @@ *****************************************************************************/ #include "gmp.h" -#include #include "third_party/libsnark-supercop/include/crypto_core_aes128encrypt.h" #include "third_party/libsnark-supercop/include/randombytes.h" +#include + namespace libsnark { template <> diff --git a/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/run_r1cs_ppzkadsnark.hpp b/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/run_r1cs_ppzkadsnark.hpp index e5d88294..f2fba520 100644 --- a/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/run_r1cs_ppzkadsnark.hpp +++ b/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/run_r1cs_ppzkadsnark.hpp @@ -13,7 +13,10 @@ #ifndef RUN_R1CS_PPZKADSNARK_HPP_ #define RUN_R1CS_PPZKADSNARK_HPP_ +#include + #include +#include namespace libsnark { diff --git a/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/run_r1cs_ppzkadsnark.tcc b/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/run_r1cs_ppzkadsnark.tcc index c902b3b9..764a3262 100644 --- a/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/run_r1cs_ppzkadsnark.tcc +++ b/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/run_r1cs_ppzkadsnark.tcc @@ -15,15 +15,15 @@ #ifndef RUN_R1CS_PPZKADSNARK_TCC_ #define RUN_R1CS_PPZKADSNARK_TCC_ -#include -#include -#include - #include #include #include +#include +#include +#include + namespace libsnark { /** diff --git a/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/signature/ed25519_signature.tcc b/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/signature/ed25519_signature.tcc index a06c1fb0..18c36382 100644 --- a/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/signature/ed25519_signature.tcc +++ b/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/examples/signature/ed25519_signature.tcc @@ -15,9 +15,10 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ -#include #include "third_party/libsnark-supercop/include/crypto_sign.h" +#include + namespace libsnark { template<> diff --git a/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark.hpp b/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark.hpp index 3b224f80..3e3d0dbc 100644 --- a/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark.hpp +++ b/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark.hpp @@ -46,12 +46,13 @@ IEEE Symposium on Security and Privacy 2015, #include #include + #include #include #include #include -#include #include +#include namespace libsnark { diff --git a/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark.tcc b/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark.tcc index 1a2539a9..3ad34d78 100644 --- a/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark.tcc +++ b/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark.tcc @@ -20,9 +20,10 @@ See r1cs_ppzkadsnark.hpp . #include #include +#include #include #include -#include + #include #include diff --git a/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark_params.hpp b/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark_params.hpp index c4f365e1..ea60f6d6 100644 --- a/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark_params.hpp +++ b/libsnark/zk_proof_systems/ppzkadsnark/r1cs_ppzkadsnark/r1cs_ppzkadsnark_params.hpp @@ -12,6 +12,8 @@ #ifndef R1CS_PPZKADSNARK_PARAMS_HPP_ #define R1CS_PPZKADSNARK_PARAMS_HPP_ +#include + #include namespace libsnark { diff --git a/libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/bacs_ppzksnark.hpp b/libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/bacs_ppzksnark.hpp index c4f66e52..44de91f6 100644 --- a/libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/bacs_ppzksnark.hpp +++ b/libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/bacs_ppzksnark.hpp @@ -35,8 +35,8 @@ #define BACS_PPZKSNARK_HPP_ #include -#include #include +#include namespace libsnark { diff --git a/libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/bacs_ppzksnark_params.hpp b/libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/bacs_ppzksnark_params.hpp index f8d7d00f..440fbd54 100644 --- a/libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/bacs_ppzksnark_params.hpp +++ b/libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/bacs_ppzksnark_params.hpp @@ -12,6 +12,8 @@ #ifndef BACS_PPZKSNARK_PARAMS_HPP_ #define BACS_PPZKSNARK_PARAMS_HPP_ +#include + #include namespace libsnark { diff --git a/libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/examples/run_bacs_ppzksnark.hpp b/libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/examples/run_bacs_ppzksnark.hpp index 861d67b7..afc72a9f 100644 --- a/libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/examples/run_bacs_ppzksnark.hpp +++ b/libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/examples/run_bacs_ppzksnark.hpp @@ -13,6 +13,8 @@ #ifndef RUN_BACS_PPZKSNARK_HPP_ #define RUN_BACS_PPZKSNARK_HPP_ +#include + #include namespace libsnark { diff --git a/libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/examples/run_bacs_ppzksnark.tcc b/libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/examples/run_bacs_ppzksnark.tcc index c0900e17..22df3461 100644 --- a/libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/examples/run_bacs_ppzksnark.tcc +++ b/libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/examples/run_bacs_ppzksnark.tcc @@ -15,12 +15,12 @@ #ifndef RUN_BACS_PPZKSNARK_TCC_ #define RUN_BACS_PPZKSNARK_TCC_ -#include - #include #include +#include + namespace libsnark { /** diff --git a/libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/profiling/profile_bacs_ppzksnark.cpp b/libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/profiling/profile_bacs_ppzksnark.cpp index 6a9430e1..51eb3261 100644 --- a/libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/profiling/profile_bacs_ppzksnark.cpp +++ b/libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/profiling/profile_bacs_ppzksnark.cpp @@ -19,8 +19,9 @@ #include -#include #include + +#include #include #include @@ -33,7 +34,7 @@ int main(int argc, const char * argv[]) if (argc == 2 && strcmp(argv[1], "-v") == 0) { - print_compilation_info(); + libff::print_compilation_info(); return 0; } diff --git a/libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/tests/test_bacs_ppzksnark.cpp b/libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/tests/test_bacs_ppzksnark.cpp index e13674d5..32f7f590 100644 --- a/libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/tests/test_bacs_ppzksnark.cpp +++ b/libsnark/zk_proof_systems/ppzksnark/bacs_ppzksnark/tests/test_bacs_ppzksnark.cpp @@ -11,8 +11,9 @@ #include #include -#include #include + +#include #include #include diff --git a/libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/examples/run_r1cs_gg_ppzksnark.hpp b/libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/examples/run_r1cs_gg_ppzksnark.hpp index 49cb1544..8ab8b73a 100644 --- a/libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/examples/run_r1cs_gg_ppzksnark.hpp +++ b/libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/examples/run_r1cs_gg_ppzksnark.hpp @@ -13,6 +13,8 @@ #ifndef RUN_R1CS_GG_PPZKSNARK_HPP_ #define RUN_R1CS_GG_PPZKSNARK_HPP_ +#include + #include namespace libsnark { diff --git a/libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/examples/run_r1cs_gg_ppzksnark.tcc b/libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/examples/run_r1cs_gg_ppzksnark.tcc index bcbf8851..b296f95e 100644 --- a/libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/examples/run_r1cs_gg_ppzksnark.tcc +++ b/libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/examples/run_r1cs_gg_ppzksnark.tcc @@ -15,13 +15,13 @@ #ifndef RUN_R1CS_GG_PPZKSNARK_TCC_ #define RUN_R1CS_GG_PPZKSNARK_TCC_ -#include - #include #include #include +#include + namespace libsnark { template diff --git a/libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/profiling/profile_r1cs_gg_ppzksnark.cpp b/libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/profiling/profile_r1cs_gg_ppzksnark.cpp index b099e9db..c53ac7ca 100644 --- a/libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/profiling/profile_r1cs_gg_ppzksnark.cpp +++ b/libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/profiling/profile_r1cs_gg_ppzksnark.cpp @@ -25,9 +25,10 @@ #include #include -#include #include #include + +#include #include #include @@ -40,7 +41,7 @@ int main(int argc, const char * argv[]) if (argc == 2 && strcmp(argv[1], "-v") == 0) { - print_compilation_info(); + libff::print_compilation_info(); return 0; } diff --git a/libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark.hpp b/libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark.hpp index aec93353..5e9f87a4 100644 --- a/libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark.hpp +++ b/libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark.hpp @@ -44,6 +44,7 @@ The implementation instantiates the protocol of \[Gro16]. #include #include + #include #include #include diff --git a/libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark.tcc b/libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark.tcc index 53307b03..c463d33f 100644 --- a/libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark.tcc +++ b/libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark.tcc @@ -20,9 +20,10 @@ See r1cs_gg_ppzksnark.hpp . #include #include +#include #include #include -#include + #include #include @@ -255,7 +256,7 @@ r1cs_gg_ppzksnark_keypair r1cs_gg_ppzksnark_generator(const r1cs_gg_ppzksna libff::enter_block("Compute gamma_ABC for R1CS verification key"); libff::Fr_vector gamma_ABC; gamma_ABC.reserve(qap.num_inputs()); - + const libff::Fr gamma_ABC_0 = (beta * At[0] + alpha * Bt[0] + Ct[0]) * gamma_inverse; for (size_t i = 1; i < qap.num_inputs() + 1; ++i) { @@ -267,7 +268,7 @@ r1cs_gg_ppzksnark_keypair r1cs_gg_ppzksnark_generator(const r1cs_gg_ppzksna libff::enter_block("Compute L query for R1CS proving key"); libff::Fr_vector Lt; Lt.reserve(qap.num_variables() - qap.num_inputs()); - + const size_t Lt_offset = qap.num_inputs() + 1; for (size_t i = 0; i < qap.num_variables() - qap.num_inputs(); ++i) { diff --git a/libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark_params.hpp b/libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark_params.hpp index 80f81ad3..836e9745 100644 --- a/libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark_params.hpp +++ b/libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark_params.hpp @@ -12,6 +12,8 @@ #ifndef R1CS_GG_PPZKSNARK_PARAMS_HPP_ #define R1CS_GG_PPZKSNARK_PARAMS_HPP_ +#include + #include namespace libsnark { diff --git a/libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/tests/test_r1cs_gg_ppzksnark.cpp b/libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/tests/test_r1cs_gg_ppzksnark.cpp index 11526634..31205c46 100644 --- a/libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/tests/test_r1cs_gg_ppzksnark.cpp +++ b/libsnark/zk_proof_systems/ppzksnark/r1cs_gg_ppzksnark/tests/test_r1cs_gg_ppzksnark.cpp @@ -11,9 +11,10 @@ #include #include -#include #include #include + +#include #include #include diff --git a/libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.hpp b/libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.hpp index f098c5c2..2424c623 100644 --- a/libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.hpp +++ b/libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.hpp @@ -14,6 +14,7 @@ #define RUN_R1CS_PPZKSNARK_HPP_ #include + #include namespace libsnark { diff --git a/libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.tcc b/libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.tcc index 03ba81a2..abbf0986 100644 --- a/libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.tcc +++ b/libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/examples/run_r1cs_ppzksnark.tcc @@ -15,13 +15,13 @@ #ifndef RUN_R1CS_PPZKSNARK_TCC_ #define RUN_R1CS_PPZKSNARK_TCC_ -#include - #include #include #include +#include + namespace libsnark { template diff --git a/libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/profiling/profile_r1cs_ppzksnark.cpp b/libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/profiling/profile_r1cs_ppzksnark.cpp index c7a4830a..91f453e1 100644 --- a/libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/profiling/profile_r1cs_ppzksnark.cpp +++ b/libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/profiling/profile_r1cs_ppzksnark.cpp @@ -25,9 +25,10 @@ #include #include -#include #include #include + +#include #include #include @@ -40,7 +41,7 @@ int main(int argc, const char * argv[]) if (argc == 2 && strcmp(argv[1], "-v") == 0) { - print_compilation_info(); + libff::print_compilation_info(); return 0; } diff --git a/libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp b/libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp index 81670b73..ad82767a 100644 --- a/libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp +++ b/libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp @@ -49,6 +49,7 @@ #include #include + #include #include #include diff --git a/libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.tcc b/libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.tcc index 51959993..58ae4c7e 100644 --- a/libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.tcc +++ b/libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.tcc @@ -20,9 +20,10 @@ See r1cs_ppzksnark.hpp . #include #include +#include #include #include -#include + #include #include diff --git a/libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark_params.hpp b/libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark_params.hpp index 05bd6e73..4b409f53 100644 --- a/libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark_params.hpp +++ b/libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark_params.hpp @@ -12,6 +12,8 @@ #ifndef R1CS_PPZKSNARK_PARAMS_HPP_ #define R1CS_PPZKSNARK_PARAMS_HPP_ +#include + #include namespace libsnark { diff --git a/libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/tests/test_r1cs_ppzksnark.cpp b/libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/tests/test_r1cs_ppzksnark.cpp index 7502ae8f..0ed138fd 100644 --- a/libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/tests/test_r1cs_ppzksnark.cpp +++ b/libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/tests/test_r1cs_ppzksnark.cpp @@ -11,9 +11,10 @@ #include #include -#include #include #include + +#include #include #include diff --git a/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark.cpp b/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark.cpp index 34d28a90..94961833 100644 --- a/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark.cpp +++ b/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark.cpp @@ -5,19 +5,20 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ #include -#include #include +#include #include #include #ifndef MINDEPS #include #endif -#include #include + +#include #include -#include #include +#include #ifndef MINDEPS namespace po = boost::program_options; diff --git a/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_generator.cpp b/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_generator.cpp index ba611761..ec500afc 100644 --- a/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_generator.cpp +++ b/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_generator.cpp @@ -11,8 +11,8 @@ #endif #include -#include #include +#include #ifndef MINDEPS namespace po = boost::program_options; diff --git a/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_prover.cpp b/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_prover.cpp index 0db443ee..759f6b28 100644 --- a/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_prover.cpp +++ b/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_prover.cpp @@ -11,8 +11,8 @@ #endif #include -#include #include +#include #ifndef MINDEPS namespace po = boost::program_options; diff --git a/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_verifier.cpp b/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_verifier.cpp index aea91bba..fe11ea2a 100644 --- a/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_verifier.cpp +++ b/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/demo_ram_ppzksnark_verifier.cpp @@ -11,8 +11,8 @@ #endif #include -#include #include +#include #ifndef MINDEPS namespace po = boost::program_options; diff --git a/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/run_ram_ppzksnark.tcc b/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/run_ram_ppzksnark.tcc index cb675b6a..f1b9cb29 100644 --- a/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/run_ram_ppzksnark.tcc +++ b/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/run_ram_ppzksnark.tcc @@ -15,12 +15,12 @@ #ifndef RUN_RAM_PPZKSNARK_TCC_ #define RUN_RAM_PPZKSNARK_TCC_ -#include - #include #include +#include + namespace libsnark { /** diff --git a/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/profiling/profile_ram_ppzksnark.cpp b/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/profiling/profile_ram_ppzksnark.cpp index a9b1ec0c..ee692f57 100644 --- a/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/profiling/profile_ram_ppzksnark.cpp +++ b/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/profiling/profile_ram_ppzksnark.cpp @@ -6,16 +6,17 @@ *****************************************************************************/ #include #include -#include #include +#include #include #include -#include #include + +#include #include -#include #include +#include using namespace libsnark; diff --git a/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark.tcc b/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark.tcc index 6d5c60f0..cf4b5cf1 100644 --- a/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark.tcc +++ b/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark.tcc @@ -15,6 +15,7 @@ #define RAM_PPZKSNARK_TCC_ #include + #include namespace libsnark { diff --git a/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark_params.hpp b/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark_params.hpp index 5a1d04e7..b3bd8fcd 100644 --- a/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark_params.hpp +++ b/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/ram_ppzksnark_params.hpp @@ -12,6 +12,8 @@ #ifndef RAM_PPZKSNARK_PARAMS_HPP_ #define RAM_PPZKSNARK_PARAMS_HPP_ +#include + namespace libsnark { /** diff --git a/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/tests/test_ram_ppzksnark.cpp b/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/tests/test_ram_ppzksnark.cpp index 1e7ac354..e52df320 100644 --- a/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/tests/test_ram_ppzksnark.cpp +++ b/libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/tests/test_ram_ppzksnark.cpp @@ -5,13 +5,14 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ #include -#include #include +#include #include #include -#include #include + +#include #include #include diff --git a/libsnark/zk_proof_systems/ppzksnark/tbcs_ppzksnark/examples/run_tbcs_ppzksnark.tcc b/libsnark/zk_proof_systems/ppzksnark/tbcs_ppzksnark/examples/run_tbcs_ppzksnark.tcc index 492f933c..b0e65054 100644 --- a/libsnark/zk_proof_systems/ppzksnark/tbcs_ppzksnark/examples/run_tbcs_ppzksnark.tcc +++ b/libsnark/zk_proof_systems/ppzksnark/tbcs_ppzksnark/examples/run_tbcs_ppzksnark.tcc @@ -15,12 +15,12 @@ #ifndef RUN_TBCS_PPZKSNARK_TCC_ #define RUN_TBCS_PPZKSNARK_TCC_ -#include - #include #include +#include + namespace libsnark { /** diff --git a/libsnark/zk_proof_systems/ppzksnark/tbcs_ppzksnark/profiling/profile_tbcs_ppzksnark.cpp b/libsnark/zk_proof_systems/ppzksnark/tbcs_ppzksnark/profiling/profile_tbcs_ppzksnark.cpp index e4652b25..6dde4d2e 100644 --- a/libsnark/zk_proof_systems/ppzksnark/tbcs_ppzksnark/profiling/profile_tbcs_ppzksnark.cpp +++ b/libsnark/zk_proof_systems/ppzksnark/tbcs_ppzksnark/profiling/profile_tbcs_ppzksnark.cpp @@ -17,9 +17,10 @@ #include -#include #include #include + +#include #include #include @@ -32,7 +33,7 @@ int main(int argc, const char * argv[]) if (argc == 2 && strcmp(argv[1], "-v") == 0) { - print_compilation_info(); + libff::print_compilation_info(); return 0; } diff --git a/libsnark/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tbcs_ppzksnark.hpp b/libsnark/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tbcs_ppzksnark.hpp index 9f9acaf0..981f5144 100644 --- a/libsnark/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tbcs_ppzksnark.hpp +++ b/libsnark/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tbcs_ppzksnark.hpp @@ -35,8 +35,8 @@ #define TBCS_PPZKSNARK_HPP_ #include -#include #include +#include namespace libsnark { diff --git a/libsnark/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tests/test_tbcs_ppzksnark.cpp b/libsnark/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tests/test_tbcs_ppzksnark.cpp index d4c42038..ec75e45e 100644 --- a/libsnark/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tests/test_tbcs_ppzksnark.cpp +++ b/libsnark/zk_proof_systems/ppzksnark/tbcs_ppzksnark/tests/test_tbcs_ppzksnark.cpp @@ -11,8 +11,9 @@ #include #include -#include #include + +#include #include #include diff --git a/libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/examples/run_uscs_ppzksnark.hpp b/libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/examples/run_uscs_ppzksnark.hpp index b3cd3d7b..7ffe96d4 100644 --- a/libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/examples/run_uscs_ppzksnark.hpp +++ b/libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/examples/run_uscs_ppzksnark.hpp @@ -13,6 +13,8 @@ #ifndef RUN_USCS_PPZKSNARK_HPP_ #define RUN_USCS_PPZKSNARK_HPP_ +#include + #include namespace libsnark { diff --git a/libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/examples/run_uscs_ppzksnark.tcc b/libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/examples/run_uscs_ppzksnark.tcc index 8b1d3d3b..7731b2e0 100644 --- a/libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/examples/run_uscs_ppzksnark.tcc +++ b/libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/examples/run_uscs_ppzksnark.tcc @@ -15,12 +15,12 @@ #ifndef RUN_USCS_PPZKSNARK_TCC_ #define RUN_USCS_PPZKSNARK_TCC_ -#include - #include #include +#include + namespace libsnark { /** diff --git a/libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/profiling/profile_uscs_ppzksnark.cpp b/libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/profiling/profile_uscs_ppzksnark.cpp index 68263b05..3b53806a 100644 --- a/libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/profiling/profile_uscs_ppzksnark.cpp +++ b/libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/profiling/profile_uscs_ppzksnark.cpp @@ -26,9 +26,10 @@ #include #include -#include #include #include + +#include #include #include @@ -41,7 +42,7 @@ int main(int argc, const char * argv[]) if (argc == 2 && strcmp(argv[1], "-v") == 0) { - print_compilation_info(); + libff::print_compilation_info(); return 0; } diff --git a/libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/tests/test_uscs_ppzksnark.cpp b/libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/tests/test_uscs_ppzksnark.cpp index a331dd24..8da992aa 100644 --- a/libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/tests/test_uscs_ppzksnark.cpp +++ b/libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/tests/test_uscs_ppzksnark.cpp @@ -11,9 +11,10 @@ #include #include -#include #include #include + +#include #include #include diff --git a/libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark.hpp b/libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark.hpp index 7e7af551..cee7193f 100644 --- a/libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark.hpp +++ b/libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark.hpp @@ -49,6 +49,7 @@ #include #include + #include #include #include diff --git a/libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark.tcc b/libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark.tcc index afaeeeaa..164a7a7d 100644 --- a/libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark.tcc +++ b/libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark.tcc @@ -18,10 +18,11 @@ #include #include -#include +#include #include #include -#include + +#include #include namespace libsnark { diff --git a/libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark_params.hpp b/libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark_params.hpp index 3022cfea..6c82ed2d 100644 --- a/libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark_params.hpp +++ b/libsnark/zk_proof_systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark_params.hpp @@ -12,6 +12,8 @@ #ifndef USCS_PPZKSNARK_PARAMS_HPP_ #define USCS_PPZKSNARK_PARAMS_HPP_ +#include + #include namespace libsnark { diff --git a/libsnark/zk_proof_systems/zksnark/ram_zksnark/examples/run_ram_zksnark.tcc b/libsnark/zk_proof_systems/zksnark/ram_zksnark/examples/run_ram_zksnark.tcc index c1c2a278..a5a6ce4e 100644 --- a/libsnark/zk_proof_systems/zksnark/ram_zksnark/examples/run_ram_zksnark.tcc +++ b/libsnark/zk_proof_systems/zksnark/ram_zksnark/examples/run_ram_zksnark.tcc @@ -15,12 +15,12 @@ #ifndef RUN_RAM_ZKSNARK_TCC_ #define RUN_RAM_ZKSNARK_TCC_ -#include - #include #include +#include + namespace libsnark { /** diff --git a/libsnark/zk_proof_systems/zksnark/ram_zksnark/profiling/profile_ram_zksnark.cpp b/libsnark/zk_proof_systems/zksnark/ram_zksnark/profiling/profile_ram_zksnark.cpp index 75f3bb74..914a2d59 100644 --- a/libsnark/zk_proof_systems/zksnark/ram_zksnark/profiling/profile_ram_zksnark.cpp +++ b/libsnark/zk_proof_systems/zksnark/ram_zksnark/profiling/profile_ram_zksnark.cpp @@ -4,14 +4,15 @@ * and contributors (see AUTHORS). * @copyright MIT license (see LICENSE file) *****************************************************************************/ +#include +#include + #include #include #include -#include -#include #include - -#include +#include +#include using namespace libsnark; @@ -60,16 +61,16 @@ void print_ram_zksnark_verifier_profiling() profile_ram_zksnark_verifier(ap, input_size, program_size); - const double input_map = last_times["Call to ram_zksnark_verifier_input_map"]; - const double preprocessing = last_times["Call to r1cs_ppzksnark_verifier_process_vk"]; - const double accumulate = last_times["Call to r1cs_ppzksnark_IC_query::accumulate"]; - const double pairings = last_times["Online pairing computations"]; - const double total = last_times["Call to ram_zksnark_verifier"]; + const double input_map = libff::last_times["Call to ram_zksnark_verifier_input_map"]; + const double preprocessing = libff::last_times["Call to r1cs_ppzksnark_verifier_process_vk"]; + const double accumulate = libff::last_times["Call to r1cs_ppzksnark_IC_query::accumulate"]; + const double pairings = libff::last_times["Online pairing computations"]; + const double total = libff::last_times["Call to ram_zksnark_verifier"]; const double rest = total - (input_map + preprocessing + accumulate + pairings); - const double delegated_ra_memory_init = last_times["Construct delegated_ra_memory from memory map"]; + const double delegated_ra_memory_init = libff::last_times["Construct delegated_ra_memory from memory map"]; simulate_random_memory_contents >(ap, input_size, program_size); - const double delegated_ra_memory_init_random = last_times["Initialize random delegated memory"]; + const double delegated_ra_memory_init_random = libff::last_times["Initialize random delegated memory"]; const double input_map_random = input_map - delegated_ra_memory_init + delegated_ra_memory_init_random; const double total_random = total - delegated_ra_memory_init + delegated_ra_memory_init_random; @@ -118,7 +119,7 @@ bool process_command_line(const int argc, const char** argv, if (vm.count("v")) { - print_compilation_info(); + libff::print_compilation_info(); exit(0); } diff --git a/libsnark/zk_proof_systems/zksnark/ram_zksnark/ram_compliance_predicate.hpp b/libsnark/zk_proof_systems/zksnark/ram_zksnark/ram_compliance_predicate.hpp index 8e88c1bb..77dcee7d 100644 --- a/libsnark/zk_proof_systems/zksnark/ram_zksnark/ram_compliance_predicate.hpp +++ b/libsnark/zk_proof_systems/zksnark/ram_zksnark/ram_compliance_predicate.hpp @@ -37,6 +37,8 @@ #ifndef RAM_COMPLIANCE_PREDICATE_HPP_ #define RAM_COMPLIANCE_PREDICATE_HPP_ +#include + #include #include #include diff --git a/libsnark/zk_proof_systems/zksnark/ram_zksnark/ram_compliance_predicate.tcc b/libsnark/zk_proof_systems/zksnark/ram_zksnark/ram_compliance_predicate.tcc index 5585e27d..1be6ffde 100644 --- a/libsnark/zk_proof_systems/zksnark/ram_zksnark/ram_compliance_predicate.tcc +++ b/libsnark/zk_proof_systems/zksnark/ram_zksnark/ram_compliance_predicate.tcc @@ -14,6 +14,8 @@ #ifndef RAM_COMPLIANCE_PREDICATE_TCC_ #define RAM_COMPLIANCE_PREDICATE_TCC_ +#include + namespace libsnark { template diff --git a/libsnark/zk_proof_systems/zksnark/ram_zksnark/ram_zksnark_params.hpp b/libsnark/zk_proof_systems/zksnark/ram_zksnark/ram_zksnark_params.hpp index 8f802c66..445b9e2c 100644 --- a/libsnark/zk_proof_systems/zksnark/ram_zksnark/ram_zksnark_params.hpp +++ b/libsnark/zk_proof_systems/zksnark/ram_zksnark/ram_zksnark_params.hpp @@ -12,6 +12,8 @@ #ifndef RAM_ZKSNARK_PARAMS_HPP_ #define RAM_ZKSNARK_PARAMS_HPP_ +#include + namespace libsnark { /** diff --git a/libsnark/zk_proof_systems/zksnark/ram_zksnark/tests/test_ram_zksnark.cpp b/libsnark/zk_proof_systems/zksnark/ram_zksnark/tests/test_ram_zksnark.cpp index 73dfc321..211fef08 100644 --- a/libsnark/zk_proof_systems/zksnark/ram_zksnark/tests/test_ram_zksnark.cpp +++ b/libsnark/zk_proof_systems/zksnark/ram_zksnark/tests/test_ram_zksnark.cpp @@ -5,10 +5,11 @@ * @copyright MIT license (see LICENSE file) *****************************************************************************/ #include + #include +#include #include #include -#include using namespace libsnark;