Skip to content

Commit 09a09ad

Browse files
madarsmadars
authored
Merge pull request #79 from popoffka/sort-includes
Ensure everything compiles individually & sort includes
2 parents 0a92e22 + e259064 commit 09a09ad

File tree

176 files changed

+366
-440
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

176 files changed

+366
-440
lines changed

‎libsnark/common/data_structures/accumulation_vector.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
#ifndef ACCUMULATION_VECTOR_HPP_
1313
#define ACCUMULATION_VECTOR_HPP_
1414

15+
#include <iostream>
16+
1517
#include <libsnark/common/data_structures/sparse_vector.hpp>
1618

1719
namespace libsnark {

‎libsnark/common/data_structures/integer_permutation.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
* @copyright MIT license (see LICENSE file)
1212
*****************************************************************************/
1313

14-
#include <libsnark/common/data_structures/integer_permutation.hpp>
15-
1614
#include <algorithm>
1715
#include <cassert>
1816
#include <numeric>
1917
#include <unordered_set>
2018

19+
#include <libsnark/common/data_structures/integer_permutation.hpp>
20+
2121
namespace libsnark {
2222

2323
integer_permutation::integer_permutation(const size_t size) :

‎libsnark/common/data_structures/merkle_tree.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
#include <map>
1616
#include <vector>
17+
1718
#include <libff/common/utils.hpp>
1819

1920
namespace libsnark {

‎libsnark/common/data_structures/set_commitment.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
* @copyright MIT license (see LICENSE file)
66
*****************************************************************************/
77

8-
#include <libsnark/common/data_structures/set_commitment.hpp>
98
#include <libff/common/serialization.hpp>
109

10+
#include <libsnark/common/data_structures/set_commitment.hpp>
11+
1112
namespace libsnark {
1213

1314
bool set_membership_proof::operator==(const set_membership_proof &other) const

‎libsnark/common/data_structures/set_commitment.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#define SET_COMMITMENT_HPP_
1414

1515
#include <libff/common/utils.hpp>
16+
1617
#include <libsnark/common/data_structures/merkle_tree.hpp>
1718
#include <libsnark/gadgetlib1/gadgets/hashes/hash_io.hpp> // TODO: the current structure is suboptimal
1819

‎libsnark/common/data_structures/sparse_vector.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#ifndef SPARSE_VECTOR_HPP_
1313
#define SPARSE_VECTOR_HPP_
1414

15+
#include <iostream>
1516
#include <vector>
1617

1718
namespace libsnark {

‎libsnark/common/data_structures/sparse_vector.tcc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
#ifndef SPARSE_VECTOR_TCC_
1515
#define SPARSE_VECTOR_TCC_
1616

17-
#include <libff/algebra/scalar_multiplication/multiexp.hpp>
18-
1917
#include <numeric>
2018

19+
#include <libff/algebra/scalar_multiplication/multiexp.hpp>
20+
2121
namespace libsnark {
2222

2323
template<typename T>

‎libsnark/common/routing_algorithms/as_waksman_routing_algorithm.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
#include <vector>
4444

4545
#include <libff/common/utils.hpp>
46+
4647
#include <libsnark/common/data_structures/integer_permutation.hpp>
4748

4849
namespace libsnark {

‎libsnark/common/routing_algorithms/benes_routing_algorithm.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@
1111
* @copyright MIT license (see LICENSE file)
1212
*****************************************************************************/
1313

14-
#include <libsnark/common/routing_algorithms/benes_routing_algorithm.hpp>
1514
#include <cassert>
1615

16+
#include <libsnark/common/routing_algorithms/benes_routing_algorithm.hpp>
17+
1718
namespace libsnark {
1819

1920
/**

‎libsnark/common/routing_algorithms/benes_routing_algorithm.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,10 @@
2727

2828
#include <vector>
2929

30-
#include <libsnark/common/data_structures/integer_permutation.hpp>
3130
#include <libff/common/utils.hpp>
3231

32+
#include <libsnark/common/data_structures/integer_permutation.hpp>
33+
3334
namespace libsnark {
3435

3536
/**

‎libsnark/common/routing_algorithms/profiling/profile_routing_algorithms.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include <algorithm>
1313

1414
#include <libff/common/profiling.hpp>
15+
1516
#include <libsnark/common/routing_algorithms/as_waksman_routing_algorithm.hpp>
1617
#include <libsnark/common/routing_algorithms/benes_routing_algorithm.hpp>
1718

‎libsnark/common/routing_algorithms/tests/test_routing_algorithms.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212
#include <cassert>
1313

1414
#include <libff/common/profiling.hpp>
15-
#include <libsnark/common/routing_algorithms/benes_routing_algorithm.hpp>
15+
1616
#include <libsnark/common/routing_algorithms/as_waksman_routing_algorithm.hpp>
17+
#include <libsnark/common/routing_algorithms/benes_routing_algorithm.hpp>
1718

1819
using namespace libsnark;
1920

‎libsnark/gadgetlib1/constraint_profiling.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@
1111
* @copyright MIT license (see LICENSE file)
1212
*****************************************************************************/
1313

14-
#include <libsnark/gadgetlib1/constraint_profiling.hpp>
1514
#include <libff/common/profiling.hpp>
1615

16+
#include <libsnark/gadgetlib1/constraint_profiling.hpp>
17+
1718
namespace libsnark {
1819

1920
size_t constraint_profiling_indent = 0;

‎libsnark/gadgetlib1/gadgets/cpu_checkers/fooram/examples/test_fooram.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
* and contributors (see AUTHORS).
55
* @copyright MIT license (see LICENSE file)
66
*****************************************************************************/
7-
#include <libsnark/common/default_types/r1cs_ppzksnark_pp.hpp>
8-
#include <libsnark/common/default_types/r1cs_ppzkpcd_pp.hpp>
97
#include <libff/common/utils.hpp>
10-
#include <libsnark/zk_proof_systems/zksnark/ram_zksnark/examples/run_ram_zksnark.hpp>
11-
#include <libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/run_ram_ppzksnark.hpp>
128

9+
#include <libsnark/common/default_types/r1cs_ppzkpcd_pp.hpp>
10+
#include <libsnark/common/default_types/r1cs_ppzksnark_pp.hpp>
1311
#include <libsnark/relations/ram_computations/rams/fooram/fooram_params.hpp>
12+
#include <libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/run_ram_ppzksnark.hpp>
13+
#include <libsnark/zk_proof_systems/zksnark/ram_zksnark/examples/run_ram_zksnark.hpp>
1414

1515
namespace libsnark {
1616

‎libsnark/gadgetlib1/gadgets/cpu_checkers/fooram/fooram_cpu_checker.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,11 @@
2929
#include <memory>
3030

3131
#include <libff/common/serialization.hpp>
32+
3233
#include <libsnark/gadgetlib1/gadget.hpp>
3334
#include <libsnark/gadgetlib1/gadgets/basic_gadgets.hpp>
34-
#include <libsnark/gadgetlib1/gadgets/cpu_checkers/fooram/components/fooram_protoboard.hpp>
3535
#include <libsnark/gadgetlib1/gadgets/cpu_checkers/fooram/components/bar_gadget.hpp>
36+
#include <libsnark/gadgetlib1/gadgets/cpu_checkers/fooram/components/fooram_protoboard.hpp>
3637
#include <libsnark/relations/ram_computations/memory/memory_interface.hpp>
3738

3839
namespace libsnark {

‎libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_arithmetic.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515
#define ALU_ARITHMETIC_HPP_
1616
#include <memory>
1717

18-
#include <libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/tinyram_protoboard.hpp>
1918
#include <libsnark/gadgetlib1/gadgets/basic_gadgets.hpp>
19+
#include <libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/tinyram_protoboard.hpp>
20+
#include <libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/word_variable_gadget.hpp>
2021

2122
namespace libsnark {
2223

‎libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_control_flow.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@
1414
#ifndef ALU_CONTROL_FLOW_HPP_
1515
#define ALU_CONTROL_FLOW_HPP_
1616

17-
#include <libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/tinyram_protoboard.hpp>
1817
#include <libsnark/gadgetlib1/gadgets/basic_gadgets.hpp>
18+
#include <libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/tinyram_protoboard.hpp>
19+
#include <libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/word_variable_gadget.hpp>
1920

2021
namespace libsnark {
2122

‎libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/argument_decoder_gadget.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
#ifndef ARGUMENT_DECODER_GADGET_HPP_
1313
#define ARGUMENT_DECODER_GADGET_HPP_
1414

15+
#include <libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/tinyram_protoboard.hpp>
16+
1517
namespace libsnark {
1618

1719
template<typename FieldT>

‎libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/consistency_enforcer_gadget.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
#ifndef CONSISTENCY_ENFORCER_GADGET_HPP_
1313
#define CONSISTENCY_ENFORCER_GADGET_HPP_
1414

15+
#include <libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/tinyram_protoboard.hpp>
16+
1517
namespace libsnark {
1618

1719
template<typename FieldT>

‎libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/instruction_packing_gadget.hpp

Lines changed: 0 additions & 58 deletions
This file was deleted.

0 commit comments

Comments
 (0)