feat: Sort includes (#571)

Author: codygunton

cpp/.clang-format

@@ -25,4 +25,4 @@ BraceWrapping:
   SplitEmptyRecord: false
   SplitEmptyNamespace: false
 AllowShortFunctionsOnASingleLine : Inline
-SortIncludes: false
+SortIncludes: true

cpp/src/barretenberg/barretenberg.hpp

@@ -21,10 +21,10 @@
 #include "ecc/curves/grumpkin/grumpkin.hpp"
 #include "numeric/random/engine.hpp"
 #include "numeric/uint256/uint256.hpp"
-#include "proof_system/circuit_builder/turbo_circuit_builder.hpp"
-#include "proof_system/circuit_builder/ultra_circuit_builder.hpp"
 #include "plonk/proof_system/types/proof.hpp"
 #include "plonk/proof_system/verification_key/verification_key.hpp"
+#include "proof_system/circuit_builder/turbo_circuit_builder.hpp"
+#include "proof_system/circuit_builder/ultra_circuit_builder.hpp"
 #include "proof_system/types/circuit_type.hpp"
 // TODO(https://github.com/AztecProtocol/barretenberg/issues/491):
 //     consider helper header(s) for serialization and other non-stdlib includes

cpp/src/barretenberg/benchmark/honk_bench/benchmark_utilities.hpp

@@ -2,16 +2,16 @@
 
 #include "barretenberg/stdlib/encryption/ecdsa/ecdsa.hpp"
 #include "barretenberg/stdlib/hash/keccak/keccak.hpp"
-#include "barretenberg/stdlib/primitives/curves/secp256k1.hpp"
-#include "barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.hpp"
 #include "barretenberg/stdlib/hash/sha256/sha256.hpp"
-#include "barretenberg/stdlib/primitives/bool/bool.hpp"
-#include "barretenberg/stdlib/primitives/field/field.hpp"
-#include "barretenberg/stdlib/primitives/witness/witness.hpp"
-#include "barretenberg/stdlib/merkle_tree/merkle_tree.hpp"
 #include "barretenberg/stdlib/merkle_tree/membership.hpp"
 #include "barretenberg/stdlib/merkle_tree/memory_store.hpp"
 #include "barretenberg/stdlib/merkle_tree/memory_tree.hpp"
+#include "barretenberg/stdlib/merkle_tree/merkle_tree.hpp"
+#include "barretenberg/stdlib/primitives/bool/bool.hpp"
+#include "barretenberg/stdlib/primitives/curves/secp256k1.hpp"
+#include "barretenberg/stdlib/primitives/field/field.hpp"
+#include "barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.hpp"
+#include "barretenberg/stdlib/primitives/witness/witness.hpp"
 
 using namespace benchmark;
 

cpp/src/barretenberg/benchmark/honk_bench/honk.bench.cpp

@@ -1,8 +1,8 @@
-#include <benchmark/benchmark.h>
-#include <cstddef>
 #include "barretenberg/honk/composer/standard_composer.hpp"
 #include "barretenberg/stdlib/primitives/field/field.hpp"
 #include "barretenberg/stdlib/primitives/witness/witness.hpp"
+#include <benchmark/benchmark.h>
+#include <cstddef>
 
 using namespace benchmark;
 using namespace proof_system::plonk::stdlib;

cpp/src/barretenberg/benchmark/honk_bench/standard_honk.bench.cpp

@@ -1,6 +1,6 @@
 #include "barretenberg/benchmark/honk_bench/benchmark_utilities.hpp"
-#include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp"
 #include "barretenberg/honk/composer/standard_composer.hpp"
+#include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp"
 
 using namespace benchmark;
 

cpp/src/barretenberg/benchmark/honk_bench/standard_plonk.bench.cpp

@@ -1,6 +1,6 @@
 #include "barretenberg/benchmark/honk_bench/benchmark_utilities.hpp"
-#include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp"
 #include "barretenberg/plonk/composer/standard_composer.hpp"
+#include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp"
 
 using namespace benchmark;
 

cpp/src/barretenberg/benchmark/honk_bench/ultra_honk.bench.cpp

@@ -1,8 +1,8 @@
 #include <benchmark/benchmark.h>
 
-#include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
-#include "barretenberg/honk/composer/ultra_composer.hpp"
 #include "barretenberg/benchmark/honk_bench/benchmark_utilities.hpp"
+#include "barretenberg/honk/composer/ultra_composer.hpp"
+#include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
 
 using namespace benchmark;
 using namespace proof_system::plonk;

cpp/src/barretenberg/benchmark/honk_bench/ultra_plonk.bench.cpp

@@ -1,6 +1,6 @@
 #include "barretenberg/benchmark/honk_bench/benchmark_utilities.hpp"
-#include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
 #include "barretenberg/plonk/composer/ultra_composer.hpp"
+#include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
 
 using namespace benchmark;
 

cpp/src/barretenberg/benchmark/pippenger_bench/main.cpp

@@ -1,10 +1,10 @@
-#include <chrono>
 #include "barretenberg/common/assert.hpp"
-#include <cstdlib>
-#include "barretenberg/srs/factories/file_crs_factory.hpp"
 #include "barretenberg/ecc/curves/bn254/bn254.hpp"
 #include "barretenberg/ecc/scalar_multiplication/scalar_multiplication.hpp"
 #include "barretenberg/polynomials/polynomial_arithmetic.hpp"
+#include "barretenberg/srs/factories/file_crs_factory.hpp"
+#include <chrono>
+#include <cstdlib>
 
 // #include <valgrind/callgrind.h>
 //  CALLGRIND_START_INSTRUMENTATION;

cpp/src/barretenberg/benchmark/plonk_bench/plonk.bench.cpp

@@ -1,7 +1,7 @@
-#include <benchmark/benchmark.h>
-#include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp"
 #include "barretenberg/plonk/composer/standard_composer.hpp"
+#include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp"
 #include "barretenberg/stdlib/primitives/field/field.hpp"
+#include <benchmark/benchmark.h>
 
 using namespace benchmark;