Fixed forgotten include directives and renamed to circuits_utils for …

…consistency
clearmatics · Apr 1, 2020 · 4ccf7e0 · 4ccf7e0
1 parent a3eb8d7
commit 4ccf7e0
Show file tree

Hide file tree

Showing 47 changed files with 51 additions and 51 deletions.
diff --git a/libzeth/circuits/binary_operation.hpp b/libzeth/circuits/binary_operation.hpp
@@ -5,7 +5,7 @@
 #ifndef __ZETH_CIRCUITS_BINARY_OPERATION_HPP__
 #define __ZETH_CIRCUITS_BINARY_OPERATION_HPP__
 
-#include "libzeth/circuits/circuits-utils.hpp"
+#include "libzeth/circuits/circuits_utils.hpp"
 #include "libzeth/types/bits.hpp"
 #include "math.h"
 

diff --git a/libzeth/circuits/binary_operation.tcc b/libzeth/circuits/binary_operation.tcc
@@ -5,7 +5,7 @@
 #ifndef __ZETH_CIRCUITS_BINARY_OPERATION_TCC__
 #define __ZETH_CIRCUITS_BINARY_OPERATION_TCC__
 
-#include "libzeth/circuits/circuits-utils.hpp"
+#include "libzeth/circuits/circuits_utils.hpp"
 #include "libzeth/types/bits.hpp"
 
 #include <libsnark/gadgetlib1/gadget.hpp>

diff --git a/libzeth/circuits/blake2s/blake2s_comp.hpp b/libzeth/circuits/blake2s/blake2s_comp.hpp
@@ -7,7 +7,7 @@
 
 #include "libzeth/circuits/binary_operation.hpp"
 #include "libzeth/circuits/blake2s/g_primitive.hpp"
-#include "libzeth/circuits/circuits-utils.hpp"
+#include "libzeth/circuits/circuits_utils.hpp"
 #include "libzeth/types/bits.hpp"
 #include "libzeth/util.hpp"
 

diff --git a/libzeth/circuits/blake2s/g_primitive.hpp b/libzeth/circuits/blake2s/g_primitive.hpp
@@ -6,7 +6,7 @@
 #define __ZETH_CIRCUITS_G_PRIMITIVE_HPP__
 
 #include "libzeth/circuits/binary_operation.hpp"
-#include "libzeth/circuits/circuits-utils.hpp"
+#include "libzeth/circuits/circuits_utils.hpp"
 #include "libzeth/types/bits.hpp"
 
 #include <libsnark/gadgetlib1/gadget.hpp>

diff --git a/libzeth/circuits/circuits-utils.cpp → libzeth/circuits/circuits_utils.cpp b/libzeth/circuits/circuits-utils.cpp → libzeth/circuits/circuits_utils.cpp
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: LGPL-3.0+
 
-#include <libzeth/circuits/circuits-utils.hpp>
+#include "libzeth/circuits/circuits_utils.hpp"
 
 namespace libzeth
 {

diff --git a/libzeth/circuits/circuits-utils.hpp → libzeth/circuits/circuits_utils.hpp b/libzeth/circuits/circuits-utils.hpp → libzeth/circuits/circuits_utils.hpp
@@ -28,6 +28,6 @@ std::vector<unsigned long> bit_list_to_ints(
     std::vector<bool> bit_list, const size_t wordsize);
 
 } // namespace libzeth
-#include "libzeth/circuits/circuits-utils.tcc"
+#include "libzeth/circuits/circuits_utils.tcc"
 
 #endif // __ZETH_CIRCUITS_CIRCUITS_UTILS_HPP__
diff --git a/libzeth/circuits/circuits-utils.tcc → libzeth/circuits/circuits_utils.tcc b/libzeth/circuits/circuits-utils.tcc → libzeth/circuits/circuits_utils.tcc
diff --git a/libzeth/circuits/commitments/commitment.hpp b/libzeth/circuits/commitments/commitment.hpp
@@ -86,6 +86,6 @@ class COMM_cm_gadget : public libsnark::gadget<FieldT>
 };
 
 } // namespace libzeth
-#include <libzeth/circuits/commitments/commitment.tcc>
+#include "libzeth/circuits/commitments/commitment.tcc"
 
 #endif // __ZETH_CIRCUITS_COMMITMENT_HPP__
diff --git a/libzeth/circuits/merkle_tree/merkle_path_selector.hpp b/libzeth/circuits/merkle_tree/merkle_path_selector.hpp
@@ -69,6 +69,6 @@ class merkle_path_selector : public libsnark::gadget<FieldT>
 };
 
 } // namespace libzeth
-#include <libzeth/circuits/merkle_tree/merkle_path_selector.tcc>
+#include "libzeth/circuits/merkle_tree/merkle_path_selector.tcc"
 
 #endif // __ZETH_CIRCUITS_MERKLE_PATH_SELECTOR_HPP___
diff --git a/libzeth/circuits/mimc/mimc_round.hpp b/libzeth/circuits/mimc/mimc_round.hpp
@@ -5,7 +5,7 @@
 #ifndef __ZETH_CIRCUITS_MIMC_ROUND_HPP__
 #define __ZETH_CIRCUITS_MIMC_ROUND_HPP__
 
-#include "libzeth/circuits/circuits-utils.hpp"
+#include "libzeth/circuits/circuits_utils.hpp"
 
 #include <libsnark/gadgetlib1/gadget.hpp>
 

diff --git a/libzeth/circuits/notes/note.hpp b/libzeth/circuits/notes/note.hpp
@@ -11,7 +11,7 @@
 #include "libzeth/circuits/commitments/commitment.hpp"
 #include "libzeth/circuits/prfs/prf.hpp"
 // Get the utils functions
-#include "libzeth/circuits/circuits-utils.hpp"
+#include "libzeth/circuits/circuits_utils.hpp"
 
 // Get the bits typedefs and associated functions
 #include "libzeth/types/bits.hpp"

diff --git a/libzeth/circuits/notes/note.tcc b/libzeth/circuits/notes/note.tcc
@@ -5,7 +5,7 @@
 // Content Taken and adapted from Zcash
 // https://github.com/zcash/zcash/blob/master/src/zcash/circuit/note.tcc
 
-#include <libzeth/circuits/notes/note.hpp>
+#include "libzeth/circuits/notes/note.hpp"
 
 namespace libzeth
 {

diff --git a/libzeth/circuits/prfs/prf.hpp b/libzeth/circuits/prfs/prf.hpp
@@ -5,7 +5,7 @@
 // Content Taken and adapted from Zcash
 // https://github.com/zcash/zcash/blob/master/src/zcash/circuit/prfs.tcc
 
-#include "libzeth/circuits/circuits-utils.hpp"
+#include "libzeth/circuits/circuits_utils.hpp"
 
 #include <libsnark/gadgetlib1/gadget.hpp>
 

diff --git a/libzeth/circuits/safe_arithmetic.cpp b/libzeth/circuits/safe_arithmetic.cpp
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: LGPL-3.0+
 
-#include <libzeth/circuits/safe_arithmetic.hpp>
+#include "libzeth/circuits/safe_arithmetic.hpp"
 
 namespace libzeth
 {

diff --git a/libzeth/circuits/sha256/sha256_ethereum.hpp b/libzeth/circuits/sha256/sha256_ethereum.hpp
@@ -61,6 +61,6 @@ class sha256_ethereum : public libsnark::gadget<FieldT>
 };
 
 } // namespace libzeth
-#include <libzeth/circuits/sha256/sha256_ethereum.tcc>
+#include "libzeth/circuits/sha256/sha256_ethereum.tcc"
 
 #endif // __ZETH_CIRCUITS_SHA256_ETHEREUM_HPP__
diff --git a/libzeth/circuits/sha256/sha256_ethereum.tcc b/libzeth/circuits/sha256/sha256_ethereum.tcc
@@ -6,7 +6,7 @@
 // https://gist.github.com/kobigurk/24c25e68219df87c348f1a78db51bb52
 
 // Get the from_bits function
-#include <libzeth/circuits/circuits-utils.hpp>
+#include "libzeth/circuits/circuits_utils.hpp"
 
 // This gadget implements the interface of the HashT template
 

diff --git a/libzeth/libsnark_helpers/debug_helpers.hpp b/libzeth/libsnark_helpers/debug_helpers.hpp
@@ -34,6 +34,6 @@ boost::filesystem::path get_path_to_debug_directory();
 bool replace(std::string &str, const std::string &from, const std::string &to);
 
 } // namespace libzeth
-#include <libzeth/libsnark_helpers/debug_helpers.tcc>
+#include "libzeth/libsnark_helpers/debug_helpers.tcc"
 
 #endif // __ZETH_DEBUG_HELPERS_HPP__
diff --git a/libzeth/libsnark_helpers/extended_proof.tcc b/libzeth/libsnark_helpers/extended_proof.tcc
@@ -7,7 +7,7 @@
 
 // Snark dependent implementation for generate_trusted_setup() and prove()
 // functions
-#include <libzeth/snarks_core_imports.hpp>
+#include "libzeth/snarks_core_imports.hpp"
 
 namespace libzeth
 {

diff --git a/libzeth/snarks/groth16/core/computation.tcc b/libzeth/snarks/groth16/core/computation.tcc
@@ -5,7 +5,7 @@
 #ifndef __ZETH_COMPUTATION_TCC__
 #define __ZETH_COMPUTATION_TCC__
 
-#include <libzeth/snarks/groth16/core/computation.hpp>
+#include "libzeth/snarks/groth16/core/computation.hpp"
 
 namespace libzeth
 {

diff --git a/libzeth/snarks/groth16/mpc/chacha_rng.cpp b/libzeth/snarks/groth16/mpc/chacha_rng.cpp
@@ -2,9 +2,10 @@
 //
 // SPDX-License-Identifier: LGPL-3.0+
 
+#include "libzeth/snarks/groth16/mpc/chacha_rng.hpp"
+
 #include <algorithm>
 #include <cstring>
-#include <libzeth/snarks/groth16/mpc/chacha_rng.hpp>
 #include <sodium/crypto_stream_chacha20.h>
 
 /// RNG based on:

diff --git a/libzeth/snarks/groth16/mpc/multi_exp.tcc b/libzeth/snarks/groth16/mpc/multi_exp.tcc
@@ -5,7 +5,7 @@
 #ifndef __ZETH_SNARKS_GROTH16_MULTI_EXP_TCC__
 #define __ZETH_SNARKS_GROTH16_MULTI_EXP_TCC__
 
-#include <libzeth/snarks/groth16/mpc/multi_exp.hpp>
+#include "libzeth/snarks/groth16/mpc/multi_exp.hpp"
 
 namespace libzeth
 {

diff --git a/libzeth/snarks/groth16/mpc/phase2.cpp b/libzeth/snarks/groth16/mpc/phase2.cpp
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: LGPL-3.0+
 
-#include <libzeth/snarks/groth16/mpc/phase2.hpp>
+#include "libzeth/snarks/groth16/mpc/phase2.hpp"
 
 namespace libzeth
 {

diff --git a/libzeth/snarks/groth16/mpc/powersoftau_utils.cpp b/libzeth/snarks/groth16/mpc/powersoftau_utils.cpp
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: LGPL-3.0+
 
-#include <libzeth/snarks/groth16/mpc/powersoftau_utils.hpp>
+#include "libzeth/snarks/groth16/mpc/powersoftau_utils.hpp"
 
 namespace libzeth
 {

diff --git a/libzeth/test/binary_operation_test.cpp b/libzeth/test/binary_operation_test.cpp
@@ -9,7 +9,7 @@
 #include <libff/common/default_types/ec_pp.hpp>
 
 // Access the `from_bits` function and other utils
-#include "libzeth/circuits/circuits-utils.hpp"
+#include "libzeth/circuits/circuits_utils.hpp"
 #include "libzeth/util.hpp"
 
 using namespace libzeth;

diff --git a/libzeth/test/blake2s_test.cpp b/libzeth/test/blake2s_test.cpp
@@ -10,7 +10,7 @@
 #include <libff/common/default_types/ec_pp.hpp>
 
 // Access the `from_bits` function and other utils
-#include "libzeth/circuits/circuits-utils.hpp"
+#include "libzeth/circuits/circuits_utils.hpp"
 #include "libzeth/util.hpp"
 
 using namespace libsnark;

diff --git a/libzeth/test/commitments_test.cpp b/libzeth/test/commitments_test.cpp
@@ -14,7 +14,7 @@
 #include "libzeth/circuits/blake2s/blake2s_comp.hpp"
 
 // Access the `from_bits` function and other utils
-#include "libzeth/circuits/circuits-utils.hpp"
+#include "libzeth/circuits/circuits_utils.hpp"
 #include "libzeth/util.hpp"
 
 // Get the gadget to test

diff --git a/libzeth/test/mimc_mp_test.cpp b/libzeth/test/mimc_mp_test.cpp
@@ -2,9 +2,10 @@
 //
 // SPDX-License-Identifier: LGPL-3.0+
 
+#include "libzeth/circuits/mimc/mimc_mp.hpp"
+
 #include "gtest/gtest.h"
 #include <libff/common/default_types/ec_pp.hpp>
-#include <libzeth/circuits/mimc/mimc_mp.hpp>
 
 using namespace libzeth;
 

diff --git a/libzeth/test/note_test.cpp b/libzeth/test/note_test.cpp
@@ -14,7 +14,7 @@
 #include "libzeth/circuits/blake2s/blake2s_comp.hpp"
 
 // Access the `from_bits` function and other utils
-#include "libzeth/circuits/circuits-utils.hpp"
+#include "libzeth/circuits/circuits_utils.hpp"
 #include "libzeth/util.hpp"
 
 // Access the defined constants

diff --git a/libzeth/test/packed_addition_test.cpp b/libzeth/test/packed_addition_test.cpp
@@ -13,7 +13,7 @@
 #include "libzeth/zeth.h"
 
 // Include the type we need
-#include "libzeth/circuits/circuits-utils.hpp"
+#include "libzeth/circuits/circuits_utils.hpp"
 #include "libzeth/circuits/notes/note.hpp"
 #include "libzeth/types/bits.hpp"
 #include "libzeth/types/joinsplit.hpp"

diff --git a/libzeth/test/prfs_test.cpp b/libzeth/test/prfs_test.cpp
@@ -19,7 +19,7 @@
 #include "libzeth/circuits/blake2s/blake2s_comp.hpp"
 
 // Access the `from_bits` function and other utils
-#include "libzeth/circuits/circuits-utils.hpp"
+#include "libzeth/circuits/circuits_utils.hpp"
 #include "libzeth/util.hpp"
 
 // Gadget to test

diff --git a/libzeth/test/sha256_test.cpp b/libzeth/test/sha256_test.cpp
@@ -19,7 +19,7 @@
 #include "circuits/sha256/sha256_ethereum.hpp"
 
 // Access the `from_bits` function and other utils
-#include "circuits/circuits-utils.hpp"
+#include "circuits/circuits_utils.hpp"
 #include "util.hpp"
 
 // Use the bits256 type util functions

diff --git a/libzeth/test/simple_test.hpp b/libzeth/test/simple_test.hpp
@@ -5,7 +5,7 @@
 #ifndef __ZETH_TEST_SIMPLE_TEST_HPP__
 #define __ZETH_TEST_SIMPLE_TEST_HPP__
 
-#include <libzeth/include_libsnark.hpp>
+#include "libzeth/include_libsnark.hpp"
 
 namespace libzeth
 {

diff --git a/libzeth/types/bits.cpp b/libzeth/types/bits.cpp
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: LGPL-3.0+
 
-#include <libzeth/types/bits.hpp>
+#include "libzeth/types/bits.hpp"
 
 namespace libzeth
 {

diff --git a/libzeth/types/bits.tcc b/libzeth/types/bits.tcc
@@ -5,7 +5,7 @@
 #ifndef __ZETH_TYPES_BITS_TCC__
 #define __ZETH_TYPES_BITS_TCC__
 
-#include <libzeth/types/bits.hpp>
+#include "libzeth/types/bits.hpp"
 
 namespace libzeth
 {

diff --git a/libzeth/types/merkle_tree_field.hpp b/libzeth/types/merkle_tree_field.hpp
@@ -51,6 +51,6 @@ template<typename FieldT, typename HashTreeT> class merkle_tree_field
 };
 
 } // namespace libzeth
-#include <libzeth/types/merkle_tree_field.tcc>
+#include "libzeth/types/merkle_tree_field.tcc"
 
 #endif // __ZETH_TYPES_MERKLE_TREE_FIELD_HPP__
diff --git a/libzeth/types/merkle_tree_field.tcc b/libzeth/types/merkle_tree_field.tcc
@@ -5,10 +5,11 @@
 #ifndef __ZETH_TYPES_MERKLE_TREE_FIELD_TCC__
 #define __ZETH_TYPES_MERKLE_TREE_FIELD_TCC__
 
+#include "libzeth/circuits/mimc/mimc_mp.hpp"
+
 #include <algorithm>
 #include <libff/common/profiling.hpp>
 #include <libff/common/utils.hpp>
-#include <libzeth/circuits/mimc/mimc_mp.hpp>
 
 namespace libzeth
 {

diff --git a/libzeth/types/note.hpp b/libzeth/types/note.hpp
@@ -5,8 +5,9 @@
 #ifndef __ZETH_TYPES_NOTE_HPP__
 #define __ZETH_TYPES_NOTE_HPP__
 
+#include "libzeth/types/bits.hpp"
+
 #include <array>
-#include <libzeth/types/bits.hpp>
 
 namespace libzeth
 {

diff --git a/libzeth/util.tcc b/libzeth/util.tcc
@@ -5,7 +5,7 @@
 #ifndef __ZETH_UTIL_TCC__
 #define __ZETH_UTIL_TCC__
 
-#include <libzeth/util.hpp>
+#include "libzeth/util.hpp"
 
 namespace libzeth
 {

diff --git a/libzeth/util_api.cpp b/libzeth/util_api.cpp
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: LGPL-3.0+
 
-#include <libzeth/util_api.hpp>
+#include "libzeth/util_api.hpp"
 
 // Message formatting and parsing utility
 

diff --git a/libzeth/util_api.tcc b/libzeth/util_api.tcc
@@ -5,7 +5,7 @@
 #ifndef __ZETH_UTIL_API_TCC__
 #define __ZETH_UTIL_API_TCC__
 
-#include <libzeth/util_api.hpp>
+#include "libzeth/util_api.hpp"
 
 namespace libzeth
 {

diff --git a/mpc_tools/mpc_phase2/cli/mpc_common.hpp b/mpc_tools/mpc_phase2/cli/mpc_common.hpp
@@ -5,9 +5,10 @@
 #ifndef __ZETH_MPC_CLI_COMMON_HPP__
 #define __ZETH_MPC_CLI_COMMON_HPP__
 
+#include "libzeth/circuit_types.hpp"
+
 #include <boost/program_options.hpp>
 #include <fstream>
-#include <libzeth/circuit_types.hpp>
 #include <map>
 #include <string>
 #include <vector>

diff --git a/mpc_tools/mpc_phase2/cli/mpc_phase2_contribute.cpp b/mpc_tools/mpc_phase2/cli/mpc_phase2_contribute.cpp
@@ -2,10 +2,9 @@
 //
 // SPDX-License-Identifier: LGPL-3.0+
 
+#include "libzeth/snarks/groth16/mpc/phase2.hpp"
 #include "mpc_common.hpp"
 
-#include <libzeth/snarks/groth16/mpc/phase2.hpp>
-
 using namespace libzeth;
 namespace po = boost::program_options;
 

diff --git a/mpc_tools/mpc_phase2/cli/mpc_phase2_verify_contribution.cpp b/mpc_tools/mpc_phase2/cli/mpc_phase2_verify_contribution.cpp
@@ -2,10 +2,9 @@
 //
 // SPDX-License-Identifier: LGPL-3.0+
 
+#include "libzeth/snarks/groth16/mpc/phase2.hpp"
 #include "mpc_common.hpp"
 
-#include <libzeth/snarks/groth16/mpc/phase2.hpp>
-
 using namespace libzeth;
 namespace po = boost::program_options;