From 6d8cadc4fc5ec1dd6f00906c5c0856198eea104b Mon Sep 17 00:00:00 2001 From: ledwards2225 Date: Tue, 10 Sep 2024 21:31:53 +0000 Subject: [PATCH] use uint32_t instead of size_t for databus data --- .../cpp/src/barretenberg/ecc/fields/field_conversion.hpp | 2 +- .../src/barretenberg/stdlib/primitives/databus/databus.hpp | 2 +- .../cpp/src/barretenberg/stdlib_circuit_builders/databus.hpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/barretenberg/cpp/src/barretenberg/ecc/fields/field_conversion.hpp b/barretenberg/cpp/src/barretenberg/ecc/fields/field_conversion.hpp index 6a92624af5e1..fa3dfe2864a1 100644 --- a/barretenberg/cpp/src/barretenberg/ecc/fields/field_conversion.hpp +++ b/barretenberg/cpp/src/barretenberg/ecc/fields/field_conversion.hpp @@ -93,7 +93,7 @@ std::vector convert_grumpkin_fr_to_bn254_frs(const grumpkin::fr& val); */ template std::vector convert_to_bn254_frs(const T& val) { - if constexpr (IsAnyOf) { + if constexpr (IsAnyOf) { std::vector fr_vec{ val }; return fr_vec; } else if constexpr (IsAnyOf) { diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/databus/databus.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/databus/databus.hpp index b8bc065e463e..22dccba62d75 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/databus/databus.hpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/databus/databus.hpp @@ -140,7 +140,7 @@ template class DataBusDepot { auto context = commitment.get_context(); // Set flag indicating propagation of return data; save the index at which it will be stored in public inputs - size_t start_idx = context->public_inputs.size(); + auto start_idx = static_cast(context->public_inputs.size()); if (is_kernel) { context->databus_propagation_data.contains_kernel_return_data_commitment = true; context->databus_propagation_data.kernel_return_data_public_input_idx = start_idx; diff --git a/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/databus.hpp b/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/databus.hpp index 98f815822d20..a93b68470c2a 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/databus.hpp +++ b/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/databus.hpp @@ -77,8 +77,8 @@ struct DatabusPropagationData { // The start index of the return data commitments (if present) in the public inputs. Note: a start index is all // that's needed here since the commitents are represented by a fixed number of witnesses and are contiguous in the // public inputs by construction. - size_t app_return_data_public_input_idx = 0; - size_t kernel_return_data_public_input_idx = 0; + uint32_t app_return_data_public_input_idx = 0; + uint32_t kernel_return_data_public_input_idx = 0; // Is this a kernel circuit (used to determine when databus consistency checks can be appended to a circuit in IVC) bool is_kernel = false;