diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp index 92839b90ec2..6867fefbcae 100644 --- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp +++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp @@ -712,7 +712,7 @@ struct BrilligOutputs { static BrilligOutputs bincodeDeserialize(std::vector); }; -struct ForeignCallOutput { +struct ForeignCallParam { struct Single { Circuit::Value value; @@ -732,13 +732,13 @@ struct ForeignCallOutput { std::variant value; - friend bool operator==(const ForeignCallOutput&, const ForeignCallOutput&); + friend bool operator==(const ForeignCallParam&, const ForeignCallParam&); std::vector bincodeSerialize() const; - static ForeignCallOutput bincodeDeserialize(std::vector); + static ForeignCallParam bincodeDeserialize(std::vector); }; struct ForeignCallResult { - std::vector values; + std::vector values; friend bool operator==(const ForeignCallResult&, const ForeignCallResult&); std::vector bincodeSerialize() const; @@ -4758,7 +4758,7 @@ Circuit::Expression serde::Deserializable::deserialize(Dese namespace Circuit { -inline bool operator==(const ForeignCallOutput& lhs, const ForeignCallOutput& rhs) +inline bool operator==(const ForeignCallParam& lhs, const ForeignCallParam& rhs) { if (!(lhs.value == rhs.value)) { return false; @@ -4766,17 +4766,17 @@ inline bool operator==(const ForeignCallOutput& lhs, const ForeignCallOutput& rh return true; } -inline std::vector ForeignCallOutput::bincodeSerialize() const +inline std::vector ForeignCallParam::bincodeSerialize() const { auto serializer = serde::BincodeSerializer(); - serde::Serializable::serialize(*this, serializer); + serde::Serializable::serialize(*this, serializer); return std::move(serializer).bytes(); } -inline ForeignCallOutput ForeignCallOutput::bincodeDeserialize(std::vector input) +inline ForeignCallParam ForeignCallParam::bincodeDeserialize(std::vector input) { auto deserializer = serde::BincodeDeserializer(input); - auto value = serde::Deserializable::deserialize(deserializer); + auto value = serde::Deserializable::deserialize(deserializer); if (deserializer.get_buffer_offset() < input.size()) { throw_or_abort("Some input bytes were not read"); } @@ -4787,8 +4787,8 @@ inline ForeignCallOutput ForeignCallOutput::bincodeDeserialize(std::vector template -void serde::Serializable::serialize(const Circuit::ForeignCallOutput& obj, - Serializer& serializer) +void serde::Serializable::serialize(const Circuit::ForeignCallParam& obj, + Serializer& serializer) { serializer.increase_container_depth(); serde::Serializable::serialize(obj.value, serializer); @@ -4797,10 +4797,10 @@ void serde::Serializable::serialize(const Circuit::F template <> template -Circuit::ForeignCallOutput serde::Deserializable::deserialize(Deserializer& deserializer) +Circuit::ForeignCallParam serde::Deserializable::deserialize(Deserializer& deserializer) { deserializer.increase_container_depth(); - Circuit::ForeignCallOutput obj; + Circuit::ForeignCallParam obj; obj.value = serde::Deserializable::deserialize(deserializer); deserializer.decrease_container_depth(); return obj; @@ -4808,7 +4808,7 @@ Circuit::ForeignCallOutput serde::Deserializable::de namespace Circuit { -inline bool operator==(const ForeignCallOutput::Single& lhs, const ForeignCallOutput::Single& rhs) +inline bool operator==(const ForeignCallParam::Single& lhs, const ForeignCallParam::Single& rhs) { if (!(lhs.value == rhs.value)) { return false; @@ -4816,17 +4816,17 @@ inline bool operator==(const ForeignCallOutput::Single& lhs, const ForeignCallOu return true; } -inline std::vector ForeignCallOutput::Single::bincodeSerialize() const +inline std::vector ForeignCallParam::Single::bincodeSerialize() const { auto serializer = serde::BincodeSerializer(); - serde::Serializable::serialize(*this, serializer); + serde::Serializable::serialize(*this, serializer); return std::move(serializer).bytes(); } -inline ForeignCallOutput::Single ForeignCallOutput::Single::bincodeDeserialize(std::vector input) +inline ForeignCallParam::Single ForeignCallParam::Single::bincodeDeserialize(std::vector input) { auto deserializer = serde::BincodeDeserializer(input); - auto value = serde::Deserializable::deserialize(deserializer); + auto value = serde::Deserializable::deserialize(deserializer); if (deserializer.get_buffer_offset() < input.size()) { throw_or_abort("Some input bytes were not read"); } @@ -4837,25 +4837,25 @@ inline ForeignCallOutput::Single ForeignCallOutput::Single::bincodeDeserialize(s template <> template -void serde::Serializable::serialize(const Circuit::ForeignCallOutput::Single& obj, - Serializer& serializer) +void serde::Serializable::serialize(const Circuit::ForeignCallParam::Single& obj, + Serializer& serializer) { serde::Serializable::serialize(obj.value, serializer); } template <> template -Circuit::ForeignCallOutput::Single serde::Deserializable::deserialize( +Circuit::ForeignCallParam::Single serde::Deserializable::deserialize( Deserializer& deserializer) { - Circuit::ForeignCallOutput::Single obj; + Circuit::ForeignCallParam::Single obj; obj.value = serde::Deserializable::deserialize(deserializer); return obj; } namespace Circuit { -inline bool operator==(const ForeignCallOutput::Array& lhs, const ForeignCallOutput::Array& rhs) +inline bool operator==(const ForeignCallParam::Array& lhs, const ForeignCallParam::Array& rhs) { if (!(lhs.value == rhs.value)) { return false; @@ -4863,17 +4863,17 @@ inline bool operator==(const ForeignCallOutput::Array& lhs, const ForeignCallOut return true; } -inline std::vector ForeignCallOutput::Array::bincodeSerialize() const +inline std::vector ForeignCallParam::Array::bincodeSerialize() const { auto serializer = serde::BincodeSerializer(); - serde::Serializable::serialize(*this, serializer); + serde::Serializable::serialize(*this, serializer); return std::move(serializer).bytes(); } -inline ForeignCallOutput::Array ForeignCallOutput::Array::bincodeDeserialize(std::vector input) +inline ForeignCallParam::Array ForeignCallParam::Array::bincodeDeserialize(std::vector input) { auto deserializer = serde::BincodeDeserializer(input); - auto value = serde::Deserializable::deserialize(deserializer); + auto value = serde::Deserializable::deserialize(deserializer); if (deserializer.get_buffer_offset() < input.size()) { throw_or_abort("Some input bytes were not read"); } @@ -4884,18 +4884,18 @@ inline ForeignCallOutput::Array ForeignCallOutput::Array::bincodeDeserialize(std template <> template -void serde::Serializable::serialize(const Circuit::ForeignCallOutput::Array& obj, - Serializer& serializer) +void serde::Serializable::serialize(const Circuit::ForeignCallParam::Array& obj, + Serializer& serializer) { serde::Serializable::serialize(obj.value, serializer); } template <> template -Circuit::ForeignCallOutput::Array serde::Deserializable::deserialize( +Circuit::ForeignCallParam::Array serde::Deserializable::deserialize( Deserializer& deserializer) { - Circuit::ForeignCallOutput::Array obj; + Circuit::ForeignCallParam::Array obj; obj.value = serde::Deserializable::deserialize(deserializer); return obj; } @@ -6115,4 +6115,4 @@ Circuit::Witness serde::Deserializable::deserialize(Deserializ obj.value = serde::Deserializable::deserialize(deserializer); deserializer.decrease_container_depth(); return obj; -} +} \ No newline at end of file