From a897db652fcaad3143ae6ad865b0ba3bfa029020 Mon Sep 17 00:00:00 2001 From: Sean Bowe Date: Mon, 15 Feb 2016 02:26:09 -0700 Subject: [PATCH] Reorganizing the zerocash tree. --- src/coins.h | 2 +- src/init.h | 2 +- src/primitives/transaction.cpp | 4 +- src/primitives/transaction.h | 6 +-- src/test/coins_tests.cpp | 2 +- src/test/transaction_tests.cpp | 12 +++--- src/txdb.h | 2 +- src/zerocash/.travis.yml | 35 ----------------- src/zerocash/{libzerocash => }/Address.cpp | 0 src/zerocash/{libzerocash => }/Address.h | 0 src/zerocash/{libzerocash => }/Coin.cpp | 0 src/zerocash/{libzerocash => }/Coin.h | 0 .../{libzerocash => }/CoinCommitment.cpp | 0 .../{libzerocash => }/CoinCommitment.h | 0 .../GenerateParamsForFiles.cpp | 0 .../IncrementalMerkleTree.cpp | 0 .../{libzerocash => }/IncrementalMerkleTree.h | 0 .../{libzerocash => }/MintTransaction.cpp | 0 .../{libzerocash => }/MintTransaction.h | 0 src/zerocash/{libzerocash => }/PourInput.cpp | 0 src/zerocash/{libzerocash => }/PourInput.h | 0 src/zerocash/{libzerocash => }/PourOutput.cpp | 0 src/zerocash/{libzerocash => }/PourOutput.h | 0 src/zerocash/{libzerocash => }/PourProver.cpp | 0 src/zerocash/{libzerocash => }/PourProver.h | 0 .../{libzerocash => }/PourTransaction.cpp | 4 +- .../{libzerocash => }/PourTransaction.h | 0 src/zerocash/{libzerocash => }/Zerocash.h | 2 +- .../{libzerocash => }/ZerocashParams.cpp | 0 .../{libzerocash => }/ZerocashParams.h | 2 +- src/zerocash/get-cryptopp | 27 ------------- src/zerocash/get-libsnark | 39 ------------------- .../profile_zerocash_pour_gadget.cpp | 0 .../tests/test_zerocash_pour_ppzksnark.cpp | 0 .../{libzerocash => }/utils/sha256.cpp | 0 src/zerocash/{libzerocash => }/utils/sha256.h | 0 src/zerocash/{libzerocash => }/utils/util.cpp | 0 src/zerocash/{libzerocash => }/utils/util.h | 0 .../zerocash_pour_gadget.hpp | 4 +- .../zerocash_pour_gadget.tcc | 0 .../zerocash_pour_params.hpp | 0 .../zerocash_pour_ppzksnark.hpp | 2 +- .../zerocash_pour_ppzksnark.tcc | 2 +- 43 files changed, 23 insertions(+), 124 deletions(-) delete mode 100644 src/zerocash/.travis.yml rename src/zerocash/{libzerocash => }/Address.cpp (100%) rename src/zerocash/{libzerocash => }/Address.h (100%) rename src/zerocash/{libzerocash => }/Coin.cpp (100%) rename src/zerocash/{libzerocash => }/Coin.h (100%) rename src/zerocash/{libzerocash => }/CoinCommitment.cpp (100%) rename src/zerocash/{libzerocash => }/CoinCommitment.h (100%) rename src/zerocash/{libzerocash => }/GenerateParamsForFiles.cpp (100%) rename src/zerocash/{libzerocash => }/IncrementalMerkleTree.cpp (100%) rename src/zerocash/{libzerocash => }/IncrementalMerkleTree.h (100%) rename src/zerocash/{libzerocash => }/MintTransaction.cpp (100%) rename src/zerocash/{libzerocash => }/MintTransaction.h (100%) rename src/zerocash/{libzerocash => }/PourInput.cpp (100%) rename src/zerocash/{libzerocash => }/PourInput.h (100%) rename src/zerocash/{libzerocash => }/PourOutput.cpp (100%) rename src/zerocash/{libzerocash => }/PourOutput.h (100%) rename src/zerocash/{libzerocash => }/PourProver.cpp (100%) rename src/zerocash/{libzerocash => }/PourProver.h (100%) rename src/zerocash/{libzerocash => }/PourTransaction.cpp (99%) rename src/zerocash/{libzerocash => }/PourTransaction.h (100%) rename src/zerocash/{libzerocash => }/Zerocash.h (98%) rename src/zerocash/{libzerocash => }/ZerocashParams.cpp (100%) rename src/zerocash/{libzerocash => }/ZerocashParams.h (97%) delete mode 100755 src/zerocash/get-cryptopp delete mode 100755 src/zerocash/get-libsnark rename src/zerocash/{zerocash_pour_ppzksnark => }/profiling/profile_zerocash_pour_gadget.cpp (100%) rename src/zerocash/{zerocash_pour_ppzksnark => }/tests/test_zerocash_pour_ppzksnark.cpp (100%) rename src/zerocash/{libzerocash => }/utils/sha256.cpp (100%) rename src/zerocash/{libzerocash => }/utils/sha256.h (100%) rename src/zerocash/{libzerocash => }/utils/util.cpp (100%) rename src/zerocash/{libzerocash => }/utils/util.h (100%) rename src/zerocash/{zerocash_pour_ppzksnark => }/zerocash_pour_gadget.hpp (98%) rename src/zerocash/{zerocash_pour_ppzksnark => }/zerocash_pour_gadget.tcc (100%) rename src/zerocash/{zerocash_pour_ppzksnark => }/zerocash_pour_params.hpp (100%) rename src/zerocash/{zerocash_pour_ppzksnark => }/zerocash_pour_ppzksnark.hpp (99%) rename src/zerocash/{zerocash_pour_ppzksnark => }/zerocash_pour_ppzksnark.tcc (99%) diff --git a/src/coins.h b/src/coins.h index 7f16aa0f..d128eb9b 100644 --- a/src/coins.h +++ b/src/coins.h @@ -16,7 +16,7 @@ #include #include -#include "libzerocash/IncrementalMerkleTree.h" +#include "zerocash/IncrementalMerkleTree.h" static const unsigned int INCREMENTAL_MERKLE_TREE_DEPTH = 20; diff --git a/src/init.h b/src/init.h index 0dd6da7e..fcc94626 100644 --- a/src/init.h +++ b/src/init.h @@ -8,7 +8,7 @@ #include -#include "libzerocash/ZerocashParams.h" +#include "zerocash/ZerocashParams.h" class CScheduler; class CWallet; diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp index 0c252203..81e9af51 100644 --- a/src/primitives/transaction.cpp +++ b/src/primitives/transaction.cpp @@ -9,8 +9,8 @@ #include "tinyformat.h" #include "utilstrencodings.h" -#include "libzerocash/PourProver.h" -#include "libzerocash/PourTransaction.h" +#include "zerocash/PourProver.h" +#include "zerocash/PourTransaction.h" template boost::array, N> uint256_to_array(const boost::array& in) { diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h index a7c54be1..727cc14a 100644 --- a/src/primitives/transaction.h +++ b/src/primitives/transaction.h @@ -13,9 +13,9 @@ #include -#include "libzerocash/ZerocashParams.h" -#include "libzerocash/PourInput.h" -#include "libzerocash/PourOutput.h" +#include "zerocash/ZerocashParams.h" +#include "zerocash/PourInput.h" +#include "zerocash/PourOutput.h" using namespace libzerocash; diff --git a/src/test/coins_tests.cpp b/src/test/coins_tests.cpp index 0a5c7853..d03863cc 100644 --- a/src/test/coins_tests.cpp +++ b/src/test/coins_tests.cpp @@ -11,7 +11,7 @@ #include #include -#include "libzerocash/IncrementalMerkleTree.h" +#include "zerocash/IncrementalMerkleTree.h" namespace { diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp index 523bd790..c869e37f 100644 --- a/src/test/transaction_tests.cpp +++ b/src/test/transaction_tests.cpp @@ -25,12 +25,12 @@ #include #include "json/json_spirit_writer_template.h" -#include "libzerocash/ZerocashParams.h" -#include "libzerocash/IncrementalMerkleTree.h" -#include "libzerocash/PourInput.h" -#include "libzerocash/PourOutput.h" -#include "libzerocash/Address.h" -#include "libzerocash/Coin.h" +#include "zerocash/ZerocashParams.h" +#include "zerocash/IncrementalMerkleTree.h" +#include "zerocash/PourInput.h" +#include "zerocash/PourOutput.h" +#include "zerocash/Address.h" +#include "zerocash/Coin.h" using namespace std; using namespace json_spirit; diff --git a/src/txdb.h b/src/txdb.h index 2992a03e..bd401b80 100644 --- a/src/txdb.h +++ b/src/txdb.h @@ -14,7 +14,7 @@ #include #include -#include "libzerocash/IncrementalMerkleTree.h" +#include "zerocash/IncrementalMerkleTree.h" class CBlockFileInfo; class CBlockIndex; diff --git a/src/zerocash/.travis.yml b/src/zerocash/.travis.yml deleted file mode 100644 index b3be38c0..00000000 --- a/src/zerocash/.travis.yml +++ /dev/null @@ -1,35 +0,0 @@ -os: linux - -env: - global: - - ZCTRAVIS_BOOST_OPTS="threading=multi link=static -sNO_BZIP2=1 -sNO_ZLIB=1 address-model=64" - - ZCTRAVIS_BOOST_LIBRARIES="chrono,filesystem,program_options,system,thread,test" - - ZCTRAVIS_SNARK_FLAGS="-j2 CURVE=ALT_BN128 NO_PROCPS=1 NO_GTEST=1 NO_DOCS=1 STATIC=1" - - ZCTRAVIS_LIBZEROCASH_CXXFLAGS="-w -DCURVE_ALT_BN128 -DBOOST_SPIRIT_THREADSAFE -DHAVE_BUILD_INFO -D__STDC_FORMAT_MACROS -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -std=c++11 -pipe -O2 -O0 -g -Wstack-protector -fstack-protector-all -fPIE -fvisibility=hidden -fPIC" - - ZCTRAVIS_LIBZEROCASH_FLAGS="-j2 NO_PROCPS=1 MINDEPS=1 LINK_RT=1" - -before_install: - - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y # For g++-4.9 - - sudo apt-get update -qq - - sudo apt-get install -qq g++-4.9 - - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.9 90 - # Install dependencies - - sudo apt-get install cmake libgmp-dev libssl-dev - # We still need boost, let's get it. - - wget http://downloads.sourceforge.net/project/boost/boost/1.57.0/boost_1_57_0.tar.bz2 - - echo "910c8c022a33ccec7f088bd65d4f14b466588dda94ba2124e78b8c57db264967 boost_1_57_0.tar.bz2" | sha256sum -c - - tar -xjf boost_*.tar.bz2 - - cd boost_1_57_0 - - ./bootstrap.sh --without-icu --with-libraries="$ZCTRAVIS_BOOST_LIBRARIES" - - ./b2 -d2 -j2 -d1 $ZCTRAVIS_BOOST_OPTS - - sudo ./b2 -d0 -j2 $ZCTRAVIS_BOOST_OPTS install - - cd .. - # We still need crypto++, let's get it. - - ./get-cryptopp - -script: - - LIBSNARK_FLAGS="$ZCTRAVIS_SNARK_FLAGS" ./get-libsnark - - CXXFLAGS="$ZCTRAVIS_LIBZEROCASH_CXXFLAGS" make $ZCTRAVIS_LIBZEROCASH_FLAGS -# - ./zerocash_pour_ppzksnark/tests/test_zerocash_pour_ppzksnark -# - ./tests/merkleTest -# - ./tests/zerocashTest \ No newline at end of file diff --git a/src/zerocash/libzerocash/Address.cpp b/src/zerocash/Address.cpp similarity index 100% rename from src/zerocash/libzerocash/Address.cpp rename to src/zerocash/Address.cpp diff --git a/src/zerocash/libzerocash/Address.h b/src/zerocash/Address.h similarity index 100% rename from src/zerocash/libzerocash/Address.h rename to src/zerocash/Address.h diff --git a/src/zerocash/libzerocash/Coin.cpp b/src/zerocash/Coin.cpp similarity index 100% rename from src/zerocash/libzerocash/Coin.cpp rename to src/zerocash/Coin.cpp diff --git a/src/zerocash/libzerocash/Coin.h b/src/zerocash/Coin.h similarity index 100% rename from src/zerocash/libzerocash/Coin.h rename to src/zerocash/Coin.h diff --git a/src/zerocash/libzerocash/CoinCommitment.cpp b/src/zerocash/CoinCommitment.cpp similarity index 100% rename from src/zerocash/libzerocash/CoinCommitment.cpp rename to src/zerocash/CoinCommitment.cpp diff --git a/src/zerocash/libzerocash/CoinCommitment.h b/src/zerocash/CoinCommitment.h similarity index 100% rename from src/zerocash/libzerocash/CoinCommitment.h rename to src/zerocash/CoinCommitment.h diff --git a/src/zerocash/libzerocash/GenerateParamsForFiles.cpp b/src/zerocash/GenerateParamsForFiles.cpp similarity index 100% rename from src/zerocash/libzerocash/GenerateParamsForFiles.cpp rename to src/zerocash/GenerateParamsForFiles.cpp diff --git a/src/zerocash/libzerocash/IncrementalMerkleTree.cpp b/src/zerocash/IncrementalMerkleTree.cpp similarity index 100% rename from src/zerocash/libzerocash/IncrementalMerkleTree.cpp rename to src/zerocash/IncrementalMerkleTree.cpp diff --git a/src/zerocash/libzerocash/IncrementalMerkleTree.h b/src/zerocash/IncrementalMerkleTree.h similarity index 100% rename from src/zerocash/libzerocash/IncrementalMerkleTree.h rename to src/zerocash/IncrementalMerkleTree.h diff --git a/src/zerocash/libzerocash/MintTransaction.cpp b/src/zerocash/MintTransaction.cpp similarity index 100% rename from src/zerocash/libzerocash/MintTransaction.cpp rename to src/zerocash/MintTransaction.cpp diff --git a/src/zerocash/libzerocash/MintTransaction.h b/src/zerocash/MintTransaction.h similarity index 100% rename from src/zerocash/libzerocash/MintTransaction.h rename to src/zerocash/MintTransaction.h diff --git a/src/zerocash/libzerocash/PourInput.cpp b/src/zerocash/PourInput.cpp similarity index 100% rename from src/zerocash/libzerocash/PourInput.cpp rename to src/zerocash/PourInput.cpp diff --git a/src/zerocash/libzerocash/PourInput.h b/src/zerocash/PourInput.h similarity index 100% rename from src/zerocash/libzerocash/PourInput.h rename to src/zerocash/PourInput.h diff --git a/src/zerocash/libzerocash/PourOutput.cpp b/src/zerocash/PourOutput.cpp similarity index 100% rename from src/zerocash/libzerocash/PourOutput.cpp rename to src/zerocash/PourOutput.cpp diff --git a/src/zerocash/libzerocash/PourOutput.h b/src/zerocash/PourOutput.h similarity index 100% rename from src/zerocash/libzerocash/PourOutput.h rename to src/zerocash/PourOutput.h diff --git a/src/zerocash/libzerocash/PourProver.cpp b/src/zerocash/PourProver.cpp similarity index 100% rename from src/zerocash/libzerocash/PourProver.cpp rename to src/zerocash/PourProver.cpp diff --git a/src/zerocash/libzerocash/PourProver.h b/src/zerocash/PourProver.h similarity index 100% rename from src/zerocash/libzerocash/PourProver.h rename to src/zerocash/PourProver.h diff --git a/src/zerocash/libzerocash/PourTransaction.cpp b/src/zerocash/PourTransaction.cpp similarity index 99% rename from src/zerocash/libzerocash/PourTransaction.cpp rename to src/zerocash/PourTransaction.cpp index fccb56da..6a32ca14 100644 --- a/src/zerocash/libzerocash/PourTransaction.cpp +++ b/src/zerocash/PourTransaction.cpp @@ -36,8 +36,8 @@ using CryptoPP::PK_EncryptorFilter; #include "PourOutput.h" #include "libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp" -#include "zerocash_pour_ppzksnark/zerocash_pour_gadget.hpp" -#include "zerocash_pour_ppzksnark/zerocash_pour_ppzksnark.hpp" +#include "zerocash_pour_gadget.hpp" +#include "zerocash_pour_ppzksnark.hpp" namespace libzerocash { diff --git a/src/zerocash/libzerocash/PourTransaction.h b/src/zerocash/PourTransaction.h similarity index 100% rename from src/zerocash/libzerocash/PourTransaction.h rename to src/zerocash/PourTransaction.h diff --git a/src/zerocash/libzerocash/Zerocash.h b/src/zerocash/Zerocash.h similarity index 98% rename from src/zerocash/libzerocash/Zerocash.h rename to src/zerocash/Zerocash.h index a9d533ea..e77bf12b 100644 --- a/src/zerocash/libzerocash/Zerocash.h +++ b/src/zerocash/Zerocash.h @@ -59,6 +59,6 @@ namespace libzerocash { using namespace libsnark; }; -#include "libzerocash/utils/util.h" +#include "zerocash/utils/util.h" #endif /* ZEROCASH_H_ */ diff --git a/src/zerocash/libzerocash/ZerocashParams.cpp b/src/zerocash/ZerocashParams.cpp similarity index 100% rename from src/zerocash/libzerocash/ZerocashParams.cpp rename to src/zerocash/ZerocashParams.cpp diff --git a/src/zerocash/libzerocash/ZerocashParams.h b/src/zerocash/ZerocashParams.h similarity index 97% rename from src/zerocash/libzerocash/ZerocashParams.h rename to src/zerocash/ZerocashParams.h index a4d2e499..7b38226f 100644 --- a/src/zerocash/libzerocash/ZerocashParams.h +++ b/src/zerocash/ZerocashParams.h @@ -15,7 +15,7 @@ #include "Zerocash.h" #include "libsnark/common/default_types/r1cs_ppzksnark_pp.hpp" #include "libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp" -#include "zerocash_pour_ppzksnark/zerocash_pour_ppzksnark.hpp" +#include "zerocash_pour_ppzksnark.hpp" namespace libzerocash { diff --git a/src/zerocash/get-cryptopp b/src/zerocash/get-cryptopp deleted file mode 100755 index 8f9663cf..00000000 --- a/src/zerocash/get-cryptopp +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -# To pass parameters to the cryptopp makefile, use `CRYPTOPP_FLAGS=... ./get-cryptopp` -set -e - -DEPSRC=./depsrc -DEPINST=./depinst -DUMMIES="cryptopp-dummy.exe" - -set -x - -mkdir -p $DEPINST -DEPINST=`pwd -P`/$DEPINST # remember absolute path - -mkdir -p $DEPSRC -cd $DEPSRC - -mkdir -p cryptopp562 && cd cryptopp562 -if [ ! -f hmac.cpp ]; then - wget http://www.cryptopp.com/cryptopp562.zip - echo "5cbfd2fcb4a6b3aab35902e2e0f3b59d9171fee12b3fc2b363e1801dfec53574 cryptopp562.zip" | sha256sum -c - unzip cryptopp562.zip -fi - -make static dynamic CXXFLAGS='-DNDEBUG -g -O2 -fPIC' $CRYPTOPP_FLAGS -touch $DUMMIES # kludge: cryptopp's "make install" breaks if there are no such files to install -make install PREFIX=$DEPINST/ $CRYPTOPP_FLAGS -rm -f $DUMMIES diff --git a/src/zerocash/get-libsnark b/src/zerocash/get-libsnark deleted file mode 100755 index 0d6b50af..00000000 --- a/src/zerocash/get-libsnark +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash -# To pass options options to libsnark Makefile, put them in env var LIBSNARK_FLAGS. -# To clone libsnark from an alternate location, set env var LIBSNARK_SRC. For example: -# LIBSNARK_SRC="$HOME/libsnark.git --branch master" ./get-libsnark -# To use curve ALT_BN128 instead of BN128 (which is x64-only), use: -# CURVE=ALT_BN128 ./get-libsnark - -set -e - -LIBSNARK_SRC=${LIBSNARK_SRC:-https://github.com/scipr-lab/libsnark} - -CURVE=${CURVE:-BN128} - -LIBSNARK_FLAGS="$LIBSNARK_FLAGS NO_SUPERCOP=1 NO_GTEST=1 NO_DOCS=1 CURVE=$CURVE" -if [[ `uname -s` == "Darwin" ]]; then - LIBSNARK_FLAGS="$LIBSNARK_FLAGS NO_PROCPS=1" -fi - -set -x - -DEPSRC=./depsrc -DEPINST=./depinst - -mkdir -p $DEPINST -DEPINST=`pwd -P`/$DEPINST # remember absolute path - -mkdir -p $DEPSRC -cd $DEPSRC - -[ ! -d libsnark ] && git clone $LIBSNARK_SRC libsnark -cd libsnark -git pull -if [ "$CURVE" == "BN128" ]; then - # TODO: submit -fPIC patch to ate-pairing - INC_DIR=-fPIC ./prepare-depends.sh -fi -make clean -CXXFLAGS="-DNO_PT_COMPRESSION=1" make lib $LIBSNARK_FLAGS -make install PREFIX=$DEPINST $LIBSNARK_FLAGS diff --git a/src/zerocash/zerocash_pour_ppzksnark/profiling/profile_zerocash_pour_gadget.cpp b/src/zerocash/profiling/profile_zerocash_pour_gadget.cpp similarity index 100% rename from src/zerocash/zerocash_pour_ppzksnark/profiling/profile_zerocash_pour_gadget.cpp rename to src/zerocash/profiling/profile_zerocash_pour_gadget.cpp diff --git a/src/zerocash/zerocash_pour_ppzksnark/tests/test_zerocash_pour_ppzksnark.cpp b/src/zerocash/tests/test_zerocash_pour_ppzksnark.cpp similarity index 100% rename from src/zerocash/zerocash_pour_ppzksnark/tests/test_zerocash_pour_ppzksnark.cpp rename to src/zerocash/tests/test_zerocash_pour_ppzksnark.cpp diff --git a/src/zerocash/libzerocash/utils/sha256.cpp b/src/zerocash/utils/sha256.cpp similarity index 100% rename from src/zerocash/libzerocash/utils/sha256.cpp rename to src/zerocash/utils/sha256.cpp diff --git a/src/zerocash/libzerocash/utils/sha256.h b/src/zerocash/utils/sha256.h similarity index 100% rename from src/zerocash/libzerocash/utils/sha256.h rename to src/zerocash/utils/sha256.h diff --git a/src/zerocash/libzerocash/utils/util.cpp b/src/zerocash/utils/util.cpp similarity index 100% rename from src/zerocash/libzerocash/utils/util.cpp rename to src/zerocash/utils/util.cpp diff --git a/src/zerocash/libzerocash/utils/util.h b/src/zerocash/utils/util.h similarity index 100% rename from src/zerocash/libzerocash/utils/util.h rename to src/zerocash/utils/util.h diff --git a/src/zerocash/zerocash_pour_ppzksnark/zerocash_pour_gadget.hpp b/src/zerocash/zerocash_pour_gadget.hpp similarity index 98% rename from src/zerocash/zerocash_pour_ppzksnark/zerocash_pour_gadget.hpp rename to src/zerocash/zerocash_pour_gadget.hpp index 5081090d..a08f06a8 100644 --- a/src/zerocash/zerocash_pour_ppzksnark/zerocash_pour_gadget.hpp +++ b/src/zerocash/zerocash_pour_gadget.hpp @@ -23,7 +23,7 @@ #ifndef ZEROCASH_POUR_GADGET_HPP_ #define ZEROCASH_POUR_GADGET_HPP_ -#include "zerocash_pour_ppzksnark/zerocash_pour_params.hpp" +#include "zerocash_pour_params.hpp" #include "libsnark/gadgetlib1/gadgets/hashes/sha256/sha256_gadget.hpp" #include "libsnark/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_read_gadget.hpp" @@ -183,6 +183,6 @@ r1cs_primary_input zerocash_pour_input_map(const size_t num_old_coins, } // libzerocash -#include "zerocash_pour_ppzksnark/zerocash_pour_gadget.tcc" +#include "zerocash_pour_gadget.tcc" #endif // ZEROCASH_POUR_GADGET_HPP_ diff --git a/src/zerocash/zerocash_pour_ppzksnark/zerocash_pour_gadget.tcc b/src/zerocash/zerocash_pour_gadget.tcc similarity index 100% rename from src/zerocash/zerocash_pour_ppzksnark/zerocash_pour_gadget.tcc rename to src/zerocash/zerocash_pour_gadget.tcc diff --git a/src/zerocash/zerocash_pour_ppzksnark/zerocash_pour_params.hpp b/src/zerocash/zerocash_pour_params.hpp similarity index 100% rename from src/zerocash/zerocash_pour_ppzksnark/zerocash_pour_params.hpp rename to src/zerocash/zerocash_pour_params.hpp diff --git a/src/zerocash/zerocash_pour_ppzksnark/zerocash_pour_ppzksnark.hpp b/src/zerocash/zerocash_pour_ppzksnark.hpp similarity index 99% rename from src/zerocash/zerocash_pour_ppzksnark/zerocash_pour_ppzksnark.hpp rename to src/zerocash/zerocash_pour_ppzksnark.hpp index c70b4f98..0eeb77db 100644 --- a/src/zerocash/zerocash_pour_ppzksnark/zerocash_pour_ppzksnark.hpp +++ b/src/zerocash/zerocash_pour_ppzksnark.hpp @@ -227,6 +227,6 @@ bool zerocash_pour_ppzksnark_verifier(const zerocash_pour_verification_key