Skip to content

Commit

Permalink
chore: bump ACIR deserializer (#2675)
Browse files Browse the repository at this point in the history 
This PR updates the deserializer to match that currently on Noir master.

We're just renaming the C++ structs created so this should be a
non-breaking change.
  • Loading branch information
@TomAFrench
TomAFrench authored Oct 9, 2023
1 parent d9ae189 commit 502ee87
Showing 1 changed file with 32 additions and 32 deletions.
64 changes: 32 additions & 32 deletions barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,7 @@ struct BrilligOutputs {
static BrilligOutputs bincodeDeserialize(std::vector<uint8_t>);
};

struct ForeignCallOutput {
struct ForeignCallParam {

struct Single {
Circuit::Value value;
Expand All @@ -732,13 +732,13 @@ struct ForeignCallOutput {

std::variant<Single, Array> value;

friend bool operator==(const ForeignCallOutput&, const ForeignCallOutput&);
friend bool operator==(const ForeignCallParam&, const ForeignCallParam&);
std::vector<uint8_t> bincodeSerialize() const;
static ForeignCallOutput bincodeDeserialize(std::vector<uint8_t>);
static ForeignCallParam bincodeDeserialize(std::vector<uint8_t>);
};

struct ForeignCallResult {
std::vector<Circuit::ForeignCallOutput> values;
std::vector<Circuit::ForeignCallParam> values;

friend bool operator==(const ForeignCallResult&, const ForeignCallResult&);
std::vector<uint8_t> bincodeSerialize() const;
Expand Down Expand Up @@ -4758,25 +4758,25 @@ Circuit::Expression serde::Deserializable<Circuit::Expression>::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;
}
return true;
}

inline std::vector<uint8_t> ForeignCallOutput::bincodeSerialize() const
inline std::vector<uint8_t> ForeignCallParam::bincodeSerialize() const
{
auto serializer = serde::BincodeSerializer();
serde::Serializable<ForeignCallOutput>::serialize(*this, serializer);
serde::Serializable<ForeignCallParam>::serialize(*this, serializer);
return std::move(serializer).bytes();
}

inline ForeignCallOutput ForeignCallOutput::bincodeDeserialize(std::vector<uint8_t> input)
inline ForeignCallParam ForeignCallParam::bincodeDeserialize(std::vector<uint8_t> input)
{
auto deserializer = serde::BincodeDeserializer(input);
auto value = serde::Deserializable<ForeignCallOutput>::deserialize(deserializer);
auto value = serde::Deserializable<ForeignCallParam>::deserialize(deserializer);
if (deserializer.get_buffer_offset() < input.size()) {
throw_or_abort("Some input bytes were not read");
}
Expand All @@ -4787,8 +4787,8 @@ inline ForeignCallOutput ForeignCallOutput::bincodeDeserialize(std::vector<uint8

template <>
template <typename Serializer>
void serde::Serializable<Circuit::ForeignCallOutput>::serialize(const Circuit::ForeignCallOutput& obj,
Serializer& serializer)
void serde::Serializable<Circuit::ForeignCallParam>::serialize(const Circuit::ForeignCallParam& obj,
Serializer& serializer)
{
serializer.increase_container_depth();
serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
Expand All @@ -4797,36 +4797,36 @@ void serde::Serializable<Circuit::ForeignCallOutput>::serialize(const Circuit::F

template <>
template <typename Deserializer>
Circuit::ForeignCallOutput serde::Deserializable<Circuit::ForeignCallOutput>::deserialize(Deserializer& deserializer)
Circuit::ForeignCallParam serde::Deserializable<Circuit::ForeignCallParam>::deserialize(Deserializer& deserializer)
{
deserializer.increase_container_depth();
Circuit::ForeignCallOutput obj;
Circuit::ForeignCallParam obj;
obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
deserializer.decrease_container_depth();
return obj;
}

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;
}
return true;
}

inline std::vector<uint8_t> ForeignCallOutput::Single::bincodeSerialize() const
inline std::vector<uint8_t> ForeignCallParam::Single::bincodeSerialize() const
{
auto serializer = serde::BincodeSerializer();
serde::Serializable<ForeignCallOutput::Single>::serialize(*this, serializer);
serde::Serializable<ForeignCallParam::Single>::serialize(*this, serializer);
return std::move(serializer).bytes();
}

inline ForeignCallOutput::Single ForeignCallOutput::Single::bincodeDeserialize(std::vector<uint8_t> input)
inline ForeignCallParam::Single ForeignCallParam::Single::bincodeDeserialize(std::vector<uint8_t> input)
{
auto deserializer = serde::BincodeDeserializer(input);
auto value = serde::Deserializable<ForeignCallOutput::Single>::deserialize(deserializer);
auto value = serde::Deserializable<ForeignCallParam::Single>::deserialize(deserializer);
if (deserializer.get_buffer_offset() < input.size()) {
throw_or_abort("Some input bytes were not read");
}
Expand All @@ -4837,43 +4837,43 @@ inline ForeignCallOutput::Single ForeignCallOutput::Single::bincodeDeserialize(s

template <>
template <typename Serializer>
void serde::Serializable<Circuit::ForeignCallOutput::Single>::serialize(const Circuit::ForeignCallOutput::Single& obj,
Serializer& serializer)
void serde::Serializable<Circuit::ForeignCallParam::Single>::serialize(const Circuit::ForeignCallParam::Single& obj,
Serializer& serializer)
{
serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
}

template <>
template <typename Deserializer>
Circuit::ForeignCallOutput::Single serde::Deserializable<Circuit::ForeignCallOutput::Single>::deserialize(
Circuit::ForeignCallParam::Single serde::Deserializable<Circuit::ForeignCallParam::Single>::deserialize(
Deserializer& deserializer)
{
Circuit::ForeignCallOutput::Single obj;
Circuit::ForeignCallParam::Single obj;
obj.value = serde::Deserializable<decltype(obj.value)>::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;
}
return true;
}

inline std::vector<uint8_t> ForeignCallOutput::Array::bincodeSerialize() const
inline std::vector<uint8_t> ForeignCallParam::Array::bincodeSerialize() const
{
auto serializer = serde::BincodeSerializer();
serde::Serializable<ForeignCallOutput::Array>::serialize(*this, serializer);
serde::Serializable<ForeignCallParam::Array>::serialize(*this, serializer);
return std::move(serializer).bytes();
}

inline ForeignCallOutput::Array ForeignCallOutput::Array::bincodeDeserialize(std::vector<uint8_t> input)
inline ForeignCallParam::Array ForeignCallParam::Array::bincodeDeserialize(std::vector<uint8_t> input)
{
auto deserializer = serde::BincodeDeserializer(input);
auto value = serde::Deserializable<ForeignCallOutput::Array>::deserialize(deserializer);
auto value = serde::Deserializable<ForeignCallParam::Array>::deserialize(deserializer);
if (deserializer.get_buffer_offset() < input.size()) {
throw_or_abort("Some input bytes were not read");
}
Expand All @@ -4884,18 +4884,18 @@ inline ForeignCallOutput::Array ForeignCallOutput::Array::bincodeDeserialize(std

template <>
template <typename Serializer>
void serde::Serializable<Circuit::ForeignCallOutput::Array>::serialize(const Circuit::ForeignCallOutput::Array& obj,
Serializer& serializer)
void serde::Serializable<Circuit::ForeignCallParam::Array>::serialize(const Circuit::ForeignCallParam::Array& obj,
Serializer& serializer)
{
serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
}

template <>
template <typename Deserializer>
Circuit::ForeignCallOutput::Array serde::Deserializable<Circuit::ForeignCallOutput::Array>::deserialize(
Circuit::ForeignCallParam::Array serde::Deserializable<Circuit::ForeignCallParam::Array>::deserialize(
Deserializer& deserializer)
{
Circuit::ForeignCallOutput::Array obj;
Circuit::ForeignCallParam::Array obj;
obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
return obj;
}
Expand Down Expand Up @@ -6115,4 +6115,4 @@ Circuit::Witness serde::Deserializable<Circuit::Witness>::deserialize(Deserializ
obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
deserializer.decrease_container_depth();
return obj;
}
}

0 comments on commit 502ee87

Please sign in to comment.