1074 - msgpack_derived_equals (addressing review comments)

AztecProtocol · Aug 30, 2023 · dd8ad16 · dd8ad16
1 parent b1db37f
commit dd8ad16
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 13 deletions.
diff --git a/circuits/cpp/src/aztec3/circuits/abis/combined_constant_data.hpp b/circuits/cpp/src/aztec3/circuits/abis/combined_constant_data.hpp
@@ -4,7 +4,6 @@
 
 #include "aztec3/circuits/abis/historic_block_data.hpp"
 #include "aztec3/utils/types/circuit_types.hpp"
-#include "aztec3/utils/types/convert.hpp"
 #include "aztec3/utils/types/native_types.hpp"
 
 #include <barretenberg/barretenberg.hpp>
@@ -27,7 +26,7 @@ template <typename NCT> struct CombinedConstantData {
     MSGPACK_FIELDS(block_data, tx_context);
     boolean operator==(CombinedConstantData<NCT> const& other) const
     {
-        return block_data == other.block_data && tx_context == other.tx_context;
+        return msgpack_derived_equals<boolean>(*this, other);
     }
 
     template <typename Builder> CombinedConstantData<CircuitTypes<Builder>> to_circuit_type(Builder& builder) const

diff --git a/circuits/cpp/src/aztec3/circuits/abis/final_accumulated_data.hpp b/circuits/cpp/src/aztec3/circuits/abis/final_accumulated_data.hpp
@@ -68,14 +68,7 @@ template <typename NCT> struct FinalAccumulatedData {
                    optionally_revealed_data);
     boolean operator==(FinalAccumulatedData<NCT> const& other) const
     {
-        return aggregation_object == other.aggregation_object && new_commitments == other.new_commitments &&
-               new_nullifiers == other.new_nullifiers && nullified_commitments == other.nullified_commitments &&
-               private_call_stack == other.private_call_stack && public_call_stack == other.public_call_stack &&
-               new_l2_to_l1_msgs == other.new_l2_to_l1_msgs && encrypted_logs_hash == other.encrypted_logs_hash &&
-               unencrypted_logs_hash == other.unencrypted_logs_hash &&
-               encrypted_log_preimages_length == other.encrypted_log_preimages_length &&
-               unencrypted_log_preimages_length == other.unencrypted_log_preimages_length &&
-               new_contracts == other.new_contracts && optionally_revealed_data == other.optionally_revealed_data;
+        return msgpack_derived_equals<boolean>(*this, other);
     };
 
     template <typename Builder> FinalAccumulatedData<CircuitTypes<Builder>> to_circuit_type(Builder& builder) const

diff --git a/circuits/cpp/src/aztec3/circuits/abis/kernel_circuit_public_inputs.hpp b/circuits/cpp/src/aztec3/circuits/abis/kernel_circuit_public_inputs.hpp
@@ -28,7 +28,7 @@ template <typename NCT> struct KernelCircuitPublicInputs {
 
     boolean operator==(KernelCircuitPublicInputs<NCT> const& other) const
     {
-        return end == other.end && constants == other.constants && is_private == other.is_private;
+        return msgpack_derived_equals<boolean>(*this, other);
     };
 
     template <typename Builder> KernelCircuitPublicInputs<CircuitTypes<Builder>> to_circuit_type(Builder& builder) const

diff --git a/circuits/cpp/src/aztec3/circuits/abis/kernel_circuit_public_inputs_final.hpp b/circuits/cpp/src/aztec3/circuits/abis/kernel_circuit_public_inputs_final.hpp
@@ -28,8 +28,8 @@ template <typename NCT> struct KernelCircuitPublicInputsFinal {
 
     boolean operator==(KernelCircuitPublicInputsFinal<NCT> const& other) const
     {
-        return end == other.end && constants == other.constants && is_private == other.is_private;
-    };
+        return msgpack_derived_equals<boolean>(*this, other);
+    }
 
     template <typename Builder>
     KernelCircuitPublicInputsFinal<CircuitTypes<Builder>> to_circuit_type(Builder& builder) const