Skip to content

Commit

Permalink
Fix some compile warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
dtebbs committed Aug 7, 2019
1 parent 8e44fb3 commit 11daa4c
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 25 deletions.
12 changes: 6 additions & 6 deletions src/circuits/commitments/commitments.tcc
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ namespace libzeth {

template<typename FieldT>
COMM_gadget<FieldT>::COMM_gadget(libsnark::protoboard<FieldT>& pb,
libsnark::pb_variable<FieldT>& ZERO,
libsnark::pb_variable_array<FieldT> x,
libsnark::pb_variable_array<FieldT> y,
std::shared_ptr<libsnark::digest_variable<FieldT>> result,
const std::string &annotation_prefix
) : libsnark::gadget<FieldT>(pb), result(result)
libsnark::pb_variable<FieldT>& /* ZERO */,
libsnark::pb_variable_array<FieldT> x,
libsnark::pb_variable_array<FieldT> y,
std::shared_ptr<libsnark::digest_variable<FieldT>> result,
const std::string &annotation_prefix
) : libsnark::gadget<FieldT>(pb), result(result)
{
const std::string annotation_block = std::string("COMM_block-") + annotation_prefix;
const std::string annotation_hasher = std::string("COMM_ethereum_hasher-") + annotation_prefix;
Expand Down
4 changes: 2 additions & 2 deletions src/circuits/joinsplit.tcc
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ class joinsplit_gadget : libsnark::gadget<FieldT> {

// Primary inputs are packed to be added to the extended proof and given to the verifier on-chain
joinsplit_gadget(protoboard<FieldT> &pb,
const std::string &annotation_prefix = "joinsplit_gadget"
) : gadget<FieldT>(pb) {
const std::string &annotation_prefix = "joinsplit_gadget"
) : gadget<FieldT>(pb, annotation_prefix) {
// Block dedicated to generate the verifier inputs
{
// The verification inputs are all bit-strings of various
Expand Down
12 changes: 6 additions & 6 deletions src/circuits/prfs/prfs.tcc
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ namespace libzeth {

template<typename FieldT>
PRF_gadget<FieldT>::PRF_gadget(libsnark::protoboard<FieldT>& pb,
libsnark::pb_variable<FieldT>& ZERO,
libsnark::pb_variable_array<FieldT> x,
libsnark::pb_variable_array<FieldT> y,
std::shared_ptr<libsnark::digest_variable<FieldT>> result,
const std::string &annotation_prefix) :
libsnark::gadget<FieldT>(pb, annotation_prefix), result(result)
libsnark::pb_variable<FieldT>& /* ZERO */,
libsnark::pb_variable_array<FieldT> x,
libsnark::pb_variable_array<FieldT> y,
std::shared_ptr<libsnark::digest_variable<FieldT>> result,
const std::string &annotation_prefix) :
libsnark::gadget<FieldT>(pb, annotation_prefix), result(result)
{

block.reset(new libsnark::block_variable<FieldT>(pb, {
Expand Down
8 changes: 4 additions & 4 deletions src/circuits/sha256/sha256_ethereum.tcc
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ namespace libzeth {

template<typename FieldT>
sha256_ethereum<FieldT>::sha256_ethereum(libsnark::protoboard<FieldT> &pb,
const size_t block_length,
const libsnark::block_variable<FieldT> &input_block,
const libsnark::digest_variable<FieldT> &output,
const std::string &annotation_prefix) :
const size_t /* block_length */,
const libsnark::block_variable<FieldT> &input_block,
const libsnark::digest_variable<FieldT> &output,
const std::string &annotation_prefix) :
libsnark::gadget<FieldT>(pb, annotation_prefix)
{
intermediate_hash.reset(new libsnark::digest_variable<FieldT>(pb, 256, "intermediate"));
Expand Down
4 changes: 2 additions & 2 deletions src/libsnark_helpers/debug_helpers.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef __ZETH_DEBUG_HELPERS_HPP__
#define __ZETH_DEBUG_HELPERS_HPP
#define __ZETH_DEBUG_HELPERS_HPP__

#include <stdbool.h>
#include <stdint.h>
Expand Down Expand Up @@ -30,4 +30,4 @@ bool replace(std::string& str, const std::string& from, const std::string& to);

} // libzeth

#endif
#endif // __ZETH_DEBUG_HELPERS_HPP__
4 changes: 2 additions & 2 deletions src/prover_server.cc
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class ProverImpl final : public Prover::Service {
}

Status Prove(
ServerContext* context,
ServerContext*,
const ProofInputs* proofInputs,
ExtendedProof* proof
) override {
Expand Down Expand Up @@ -202,7 +202,7 @@ void RunServer(
server->Wait();
}

int main(int argc, char** argv) {
int main(int, char**) {
// We inititalize the curve parameters here
std::cout << "[DEBUG] Init params" << std::endl;
ppT::init_public_params();
Expand Down
4 changes: 2 additions & 2 deletions src/util.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace libzeth {
// Takes a binary string and swaps the bit endianness
template<typename T>
T swap_bit_endianness(T v) {
int len = v.size();
size_t len = v.size();
if (len == 0) {
throw std::length_error("Invalid bit length for the given boolean vector (should be > 0)");
}
Expand Down Expand Up @@ -96,7 +96,7 @@ bits64 hexadecimal_value_to_bits64(std::string str) {
return get_bits64_from_vector(hexadecimal_str_to_binary_vector(str));
}

std::vector<bool> address_bits_from_address(int address, int tree_depth) {
std::vector<bool> address_bits_from_address(int address, size_t tree_depth) {
std::vector<bool> binary = convert_int_to_binary(address);
std::vector<bool> result(tree_depth, 0);

Expand Down
2 changes: 1 addition & 1 deletion src/util.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ bits256 hexadecimal_digest_to_bits256(std::string digest_hex_str);
bits64 hexadecimal_value_to_bits64(std::string value_hex_str);

std::vector<bool> convert_int_to_binary(int x);
std::vector<bool> address_bits_from_address(int address, int tree_depth);
std::vector<bool> address_bits_from_address(int address, size_t tree_depth);

} // libzeth

Expand Down

0 comments on commit 11daa4c

Please sign in to comment.