Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix access specifiers in gadget inheritance tree #395

Merged
merged 3 commits into from
Aug 24, 2021
Merged

Fix access specifiers in gadget inheritance tree #395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ccaca1c
Added explicit access specifier for private inheritance
AntoineRondelet Aug 20, 2021
b3a7294
Fixed inconsistency in inheritances and added missing access specifiers
AntoineRondelet Aug 20, 2021
660bb6c
libzeth: public inheritance for some internal hash_stream classes
dtebbs Aug 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions libzeth/circuits/binary_operation.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ class xor_constant_gadget : public libsnark::gadget<FieldT>
/// however given the inputs are boolean, the output is automatically boolean
template<typename FieldT> class xor_rot_gadget : public libsnark::gadget<FieldT>
{

private:
const libsnark::pb_variable_array<FieldT> a;
const libsnark::pb_variable_array<FieldT> b;
Expand Down Expand Up @@ -98,7 +97,6 @@ template<typename FieldT> class xor_rot_gadget : public libsnark::gadget<FieldT>
template<typename FieldT>
class double_bit32_sum_eq_gadget : public libsnark::gadget<FieldT>
{

private:
libsnark::pb_variable_array<FieldT> a;
libsnark::pb_variable_array<FieldT> b;
Expand Down
2 changes: 1 addition & 1 deletion libzeth/circuits/commitments/commitment.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace libzeth
{

template<typename FieldT, typename HashT>
class COMM_gadget : libsnark::gadget<FieldT>
class COMM_gadget : public libsnark::gadget<FieldT>
{
private:
// input variable block = {x, y}
Expand Down
2 changes: 1 addition & 1 deletion libzeth/circuits/joinsplit.tcc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ template<
size_t NumInputs,
size_t NumOutputs,
size_t TreeDepth>
class joinsplit_gadget : libsnark::gadget<FieldT>
class joinsplit_gadget : public libsnark::gadget<FieldT>
{
private:
const size_t digest_len_minus_field_cap =
Expand Down
4 changes: 2 additions & 2 deletions libzeth/core/hash_stream.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ template<typename HashT> class hash_ostream_wrapper;
template<typename HashT> class hash_istream_wrapper;

/// Internal streambuf for hash_ostream. Hash and discard all written data.
template<typename HashT> class hash_streambuf : std::streambuf
template<typename HashT> class hash_streambuf : public std::streambuf
{
protected:
hash_streambuf();
Expand All @@ -44,7 +44,7 @@ template<typename HashT> class hash_streambuf : std::streambuf
};

/// Internal streambuf for wrapped streams. Hash data and forward.
template<typename HashT> class hash_streambuf_wrapper : std::streambuf
template<typename HashT> class hash_streambuf_wrapper : public std::streambuf
{
protected:
explicit hash_streambuf_wrapper(std::ostream *inner);
Expand Down