Skip to content

Commit 5e53345

Browse files
jeanmonjeanmon
authored
chore(circuits): clean up of some superfluous header includes (#2302)
A cleanup PR consisting mainly in removing superfluous header includes. # Checklist: Remove the checklist to signal you've completed it. Enable auto-merge if the PR is ready to merge. - [x] If the pull request requires a cryptography review (e.g. cryptographic algorithm implementations) I have added the 'crypto' tag. - [x] I have reviewed my diff in github, line by line and removed unexpected formatting changes, testing logs, or commented-out code. - [x] Every change is related to the PR description. - [ ] I have [linked](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue) this pull request to relevant issues (if any exist).
1 parent 8b76a12 commit 5e53345

16 files changed

+24
-49
lines changed

‎circuits/cpp/src/aztec3/circuits/abis/c_bind.h

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#include "aztec3/circuits/hash.hpp"
2-
31
#include <barretenberg/barretenberg.hpp>
42

53
#include <algorithm>

‎circuits/cpp/src/aztec3/circuits/abis/call_stack_item.hpp

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
#include "aztec3/circuits/abis/types.hpp"
88
#include "aztec3/utils/msgpack_derived_equals.hpp"
9-
#include "aztec3/utils/msgpack_derived_output.hpp"
109
#include "aztec3/utils/types/circuit_types.hpp"
1110
#include "aztec3/utils/types/convert.hpp"
1211
#include "aztec3/utils/types/native_types.hpp"

‎circuits/cpp/src/aztec3/circuits/abis/contract_storage_read.hpp

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#pragma once
2-
#include "aztec3/utils/msgpack_derived_output.hpp"
32
#include "aztec3/utils/types/circuit_types.hpp"
43
#include "aztec3/utils/types/convert.hpp"
54
#include "aztec3/utils/types/native_types.hpp"

‎circuits/cpp/src/aztec3/circuits/abis/private_circuit_public_inputs.hpp

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include "aztec3/utils/types/convert.hpp"
1010
#include "aztec3/utils/types/native_types.hpp"
1111

12-
#include "barretenberg/common/serialize.hpp"
1312
#include <barretenberg/barretenberg.hpp>
1413

1514
namespace aztec3::circuits::abis {

‎circuits/cpp/src/aztec3/circuits/abis/public_circuit_public_inputs.hpp

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#include "../../constants.hpp"
77

88
#include "aztec3/circuits/abis/historic_block_data.hpp"
9-
#include "aztec3/utils/msgpack_derived_output.hpp"
109
#include "aztec3/utils/types/circuit_types.hpp"
1110
#include "aztec3/utils/types/native_types.hpp"
1211

‎circuits/cpp/src/aztec3/circuits/abis/rollup/merge/merge_rollup_inputs.hpp

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#pragma once
2-
#include "aztec3/circuits/abis/append_only_tree_snapshot.hpp"
32
#include "aztec3/circuits/abis/rollup/merge/previous_rollup_data.hpp"
43

54
#include <type_traits>

‎circuits/cpp/src/aztec3/circuits/abis/rollup/merge/previous_rollup_data.hpp

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#pragma once
2-
#include "aztec3/circuits/abis/append_only_tree_snapshot.hpp"
32
#include "aztec3/circuits/abis/membership_witness.hpp"
43
#include "aztec3/circuits/abis/rollup/base/base_or_merge_rollup_public_inputs.hpp"
54
#include "aztec3/constants.hpp"

‎circuits/cpp/src/aztec3/circuits/abis/rollup/root/root_rollup_public_inputs.hpp

-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
#include "aztec3/circuits/abis/append_only_tree_snapshot.hpp"
44
#include "aztec3/circuits/abis/global_variables.hpp"
55
#include "aztec3/constants.hpp"
6-
#include "aztec3/utils/types/circuit_types.hpp"
7-
#include "aztec3/utils/types/convert.hpp"
8-
#include "aztec3/utils/types/native_types.hpp"
96

107
#include <barretenberg/barretenberg.hpp>
118

‎circuits/cpp/src/aztec3/circuits/abis/types.hpp

-6
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,6 @@
22
#include "private_circuit_public_inputs.hpp"
33
#include "public_circuit_public_inputs.hpp"
44

5-
#include "aztec3/constants.hpp"
6-
#include "aztec3/utils/array.hpp"
7-
#include "aztec3/utils/types/circuit_types.hpp"
8-
#include "aztec3/utils/types/convert.hpp"
9-
#include "aztec3/utils/types/native_types.hpp"
10-
115
#include <barretenberg/barretenberg.hpp>
126

137
namespace aztec3::circuits::abis {

‎circuits/cpp/src/aztec3/circuits/kernel/public/.test.cpp

+4-10
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,8 @@
66
#include "aztec3/circuits/abis/call_stack_item.hpp"
77
#include "aztec3/circuits/abis/combined_accumulated_data.hpp"
88
#include "aztec3/circuits/abis/combined_constant_data.hpp"
9-
#include "aztec3/circuits/abis/contract_deployment_data.hpp"
10-
#include "aztec3/circuits/abis/function_data.hpp"
11-
#include "aztec3/circuits/abis/historic_block_data.hpp"
12-
#include "aztec3/circuits/abis/kernel_circuit_public_inputs.hpp"
9+
#include "aztec3/circuits/abis/contract_storage_update_request.hpp"
1310
#include "aztec3/circuits/abis/previous_kernel_data.hpp"
14-
#include "aztec3/circuits/abis/private_circuit_public_inputs.hpp"
1511
#include "aztec3/circuits/abis/public_kernel/public_call_data.hpp"
1612
#include "aztec3/circuits/abis/public_kernel/public_kernel_inputs.hpp"
1713
#include "aztec3/circuits/abis/tx_context.hpp"
@@ -26,14 +22,16 @@
2622

2723
#include <array>
2824

29-
namespace {
25+
namespace aztec3::circuits::kernel::public_kernel {
3026
using DummyCircuitBuilder = aztec3::utils::DummyCircuitBuilder;
3127
using aztec3::circuits::abis::public_kernel::PublicKernelInputs;
3228
using NT = aztec3::utils::types::NativeTypes;
3329
using aztec3::circuits::abis::CallContext;
3430
using aztec3::circuits::abis::CallStackItem;
3531
using aztec3::circuits::abis::CombinedAccumulatedData;
3632
using aztec3::circuits::abis::CombinedConstantData;
33+
using aztec3::circuits::abis::ContractStorageRead;
34+
using aztec3::circuits::abis::ContractStorageUpdateRequest;
3735
using aztec3::circuits::abis::HistoricBlockData;
3836
using aztec3::circuits::abis::NewContractData;
3937
using aztec3::circuits::abis::OptionallyRevealedData;
@@ -45,10 +43,6 @@ using aztec3::circuits::abis::TxContext;
4543
using aztec3::circuits::abis::TxRequest;
4644
using aztec3::circuits::abis::public_kernel::PublicCallData;
4745
using aztec3::utils::source_arrays_are_in_target;
48-
} // namespace
49-
50-
namespace aztec3::circuits::kernel::public_kernel {
51-
5246
using PublicCallStackItem = CallStackItem<NT, aztec3::circuits::abis::PublicTypes>;
5347

5448
template <size_t SIZE>

‎circuits/cpp/src/aztec3/circuits/kernel/public/c_bind.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@
1414
namespace {
1515
using Builder = UltraCircuitBuilder;
1616
using NT = aztec3::utils::types::NativeTypes;
17-
using DummyCircuitBuilder = aztec3::utils::DummyCircuitBuilder;
17+
using DummyBuilder = aztec3::utils::DummyCircuitBuilder;
1818
using aztec3::circuits::abis::KernelCircuitPublicInputs;
1919
using aztec3::circuits::abis::public_kernel::PublicKernelInputs;
2020
using aztec3::circuits::kernel::public_kernel::native_public_kernel_circuit_private_previous_kernel;
2121
using aztec3::circuits::kernel::public_kernel::native_public_kernel_circuit_public_previous_kernel;
22-
} // namespace
2322

2423
// WASM Cbinds
25-
26-
CBIND(public_kernel__sim, [](PublicKernelInputs<NT> public_kernel_inputs) {
24+
CBIND(public_kernel__sim, [](PublicKernelInputs<NT> const& public_kernel_inputs) {
2725
DummyBuilder builder = DummyBuilder("public_kernel__sim");
2826
KernelCircuitPublicInputs<NT> const result =
2927
public_kernel_inputs.previous_kernel.public_inputs.is_private
3028
? native_public_kernel_circuit_private_previous_kernel(builder, public_kernel_inputs)
3129
: native_public_kernel_circuit_public_previous_kernel(builder, public_kernel_inputs);
3230
return builder.result_or_error(result);
3331
});
32+
33+
} // namespace

‎circuits/cpp/src/aztec3/circuits/kernel/public/common.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
namespace aztec3::circuits::kernel::public_kernel {
99

10+
using aztec3::utils::array_pop;
11+
1012
void common_initialise_end_values(PublicKernelInputs<NT> const& public_kernel_inputs,
1113
KernelCircuitPublicInputs<NT>& circuit_outputs)
1214
{

‎circuits/cpp/src/aztec3/circuits/kernel/public/common.hpp

+2-11
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,25 @@
22

33
#include "init.hpp"
44

5-
#include "aztec3/circuits/abis/contract_storage_read.hpp"
6-
#include "aztec3/circuits/abis/contract_storage_update_request.hpp"
75
#include "aztec3/circuits/abis/kernel_circuit_public_inputs.hpp"
86
#include "aztec3/circuits/abis/public_data_update_request.hpp"
97
#include "aztec3/circuits/abis/public_kernel/public_kernel_inputs.hpp"
108
#include "aztec3/circuits/hash.hpp"
119
#include "aztec3/utils/array.hpp"
1210
#include "aztec3/utils/dummy_circuit_builder.hpp"
1311

12+
namespace aztec3::circuits::kernel::public_kernel {
13+
1414
using NT = aztec3::utils::types::NativeTypes;
15-
using aztec3::circuits::abis::ContractStorageRead;
16-
using aztec3::circuits::abis::ContractStorageUpdateRequest;
1715
using aztec3::circuits::abis::KernelCircuitPublicInputs;
1816
using aztec3::circuits::abis::PublicDataRead;
1917
using aztec3::circuits::abis::PublicDataUpdateRequest;
2018
using aztec3::circuits::abis::public_kernel::PublicKernelInputs;
2119
using DummyBuilder = aztec3::utils::DummyCircuitBuilder;
22-
using aztec3::circuits::check_membership;
23-
using aztec3::circuits::compute_public_data_tree_index;
24-
using aztec3::circuits::compute_public_data_tree_value;
25-
using aztec3::circuits::root_from_sibling_path;
2620
using aztec3::utils::array_length;
27-
using aztec3::utils::array_pop;
2821
using aztec3::utils::array_push;
2922
using aztec3::utils::push_array_to_array;
3023

31-
namespace aztec3::circuits::kernel::public_kernel {
32-
3324
/**
3425
* @brief Validate that all pre-images on the call stack hash to equal the accumulated data
3526
* @tparam The type of kernel input

‎circuits/cpp/src/aztec3/circuits/kernel/public/init.hpp

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#pragma once
2-
#include "aztec3/circuits/abis/public_kernel/public_kernel_inputs.hpp"
32
#include "aztec3/circuits/apps/oracle_wrapper.hpp"
43
#include "aztec3/circuits/recursion/aggregator.hpp"
54
#include "aztec3/oracle/oracle.hpp"

‎circuits/cpp/src/aztec3/circuits/kernel/public/native_public_kernel_circuit_private_previous_kernel.cpp

+6-3
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,18 @@
44

55
#include "aztec3/circuits/abis/kernel_circuit_public_inputs.hpp"
66
#include "aztec3/circuits/abis/public_kernel/public_kernel_inputs.hpp"
7-
#include "aztec3/constants.hpp"
87
#include "aztec3/utils/array.hpp"
98
#include "aztec3/utils/circuit_errors.hpp"
109
#include "aztec3/utils/dummy_circuit_builder.hpp"
1110

11+
// Purpose of this anonymous namespace is to avoid to clash with the validate_inputs()
12+
// counterpart defined in native_public_kernel_circuit_public_previous_kernel.cpp
1213
namespace {
1314
using CircuitErrorCode = aztec3::utils::CircuitErrorCode;
15+
using aztec3::circuits::kernel::public_kernel::NT;
16+
using DummyBuilder = aztec3::utils::DummyCircuitBuilder;
17+
using aztec3::circuits::abis::public_kernel::PublicKernelInputs;
18+
using aztec3::utils::array_length;
1419

1520
/**
1621
* @brief Validates the kernel circuit inputs specific to having a private previous kernel
@@ -32,11 +37,9 @@ void validate_inputs(DummyBuilder& builder, PublicKernelInputs<NT> const& public
3237
namespace aztec3::circuits::kernel::public_kernel {
3338

3439
using aztec3::circuits::abis::KernelCircuitPublicInputs;
35-
using aztec3::circuits::abis::public_kernel::PublicKernelInputs;
3640
using aztec3::circuits::kernel::public_kernel::common_initialise_end_values;
3741
using aztec3::circuits::kernel::public_kernel::common_validate_kernel_execution;
3842

39-
using DummyBuilder = aztec3::utils::DummyCircuitBuilder;
4043

4144
/**
4245
* @brief Entry point for the native public kernel circuit with a private previous kernel

‎circuits/cpp/src/aztec3/circuits/kernel/public/native_public_kernel_circuit_public_previous_kernel.cpp

+6-3
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,16 @@
55

66
#include "aztec3/circuits/abis/kernel_circuit_public_inputs.hpp"
77
#include "aztec3/circuits/abis/public_kernel/public_kernel_inputs.hpp"
8-
#include "aztec3/utils/array.hpp"
98
#include "aztec3/utils/dummy_circuit_builder.hpp"
109

10+
// Purpose of this anonymous namespace is to avoid to clash with the validate_inputs()
11+
// counterpart defined in native_public_kernel_circuit_private_previous_kernel.cpp
1112
namespace {
1213
using CircuitErrorCode = aztec3::utils::CircuitErrorCode;
14+
using aztec3::circuits::kernel::public_kernel::NT;
15+
using DummyBuilder = aztec3::utils::DummyCircuitBuilder;
16+
using aztec3::circuits::abis::public_kernel::PublicKernelInputs;
17+
1318
/**
1419
* @brief Validates the kernel circuit inputs specific to having a public previous kernel
1520
* @param builder The circuit builder
@@ -27,10 +32,8 @@ void validate_inputs(DummyBuilder& builder, PublicKernelInputs<NT> const& public
2732
namespace aztec3::circuits::kernel::public_kernel {
2833

2934
using aztec3::circuits::abis::KernelCircuitPublicInputs;
30-
using aztec3::circuits::abis::public_kernel::PublicKernelInputs;
3135
using aztec3::circuits::kernel::public_kernel::common_validate_kernel_execution;
3236

33-
using DummyBuilder = aztec3::utils::DummyCircuitBuilder;
3437

3538
/**
3639
* @brief Entry point for the native public kernel circuit with a public previous kernel

0 commit comments

Comments
 (0)