Add zerocash tests and utilities.

src/zerocash/GenerateParamsForFiles.cpp

@@ -15,8 +15,6 @@
 #include "ZerocashParams.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_gadget.hpp"
-#include "zerocash_pour_ppzksnark/zerocash_pour_ppzksnark.hpp"
 
 using namespace libzerocash;
 

src/zerocash/tests/merkleTest.cpp

@@ -9,7 +9,7 @@
  * @copyright  MIT license (see LICENSE file)
  *****************************************************************************/
 
-#include "libzerocash/IncrementalMerkleTree.h"
+#include "zerocash/IncrementalMerkleTree.h"
 
 #include <iostream>
 #include <vector>

src/zerocash/tests/test_zerocash_pour_ppzksnark.cpp

@@ -15,8 +15,8 @@
 #include "libsnark/common/utils.hpp"
 #include "libsnark/common/profiling.hpp"
 #include "libsnark/gadgetlib1/gadgets/hashes/sha256/sha256_gadget.hpp"
-#include "zerocash_pour_ppzksnark/zerocash_pour_gadget.hpp"
-#include "zerocash_pour_ppzksnark/zerocash_pour_ppzksnark.hpp"
+#include "zerocash/zerocash_pour_gadget.hpp"
+#include "zerocash/zerocash_pour_ppzksnark.hpp"
 
 using namespace libzerocash;
 

src/zerocash/tests/timer.cpp

@@ -12,7 +12,7 @@
 #include <stdio.h>
 #include <sys/time.h>
 
-#include "tests/timer.h"
+#include "zerocash/tests/timer.h"
 
 namespace libzerocash {
 

src/zerocash/tests/utilTest.cpp

@@ -2,8 +2,8 @@
 #define BOOST_TEST_MODULE utilTest
 #include <boost/test/included/unit_test.hpp>
 
-#include "libzerocash/utils/util.h"
-#include "libzerocash/utils/sha256.h"
+#include "zerocash/utils/util.h"
+#include "zerocash/utils/sha256.h"
 
 #define SHA256_PREIMAGE_BYTES 3
 const unsigned char sha256_preimage[SHA256_PREIMAGE_BYTES] = { 'a', 'b', 'c' };

src/zerocash/tests/zerocashTest.cpp

@@ -17,17 +17,17 @@
 
 #include "timer.h"
 
-#include "libzerocash/Zerocash.h"
-#include "libzerocash/ZerocashParams.h"
-#include "libzerocash/Address.h"
-#include "libzerocash/CoinCommitment.h"
-#include "libzerocash/Coin.h"
-#include "libzerocash/IncrementalMerkleTree.h"
-#include "libzerocash/MintTransaction.h"
-#include "libzerocash/PourTransaction.h"
-#include "libzerocash/PourInput.h"
-#include "libzerocash/PourOutput.h"
-#include "libzerocash/utils/util.h"
+#include "zerocash/Zerocash.h"
+#include "zerocash/ZerocashParams.h"
+#include "zerocash/Address.h"
+#include "zerocash/CoinCommitment.h"
+#include "zerocash/Coin.h"
+#include "zerocash/IncrementalMerkleTree.h"
+#include "zerocash/MintTransaction.h"
+#include "zerocash/PourTransaction.h"
+#include "zerocash/PourInput.h"
+#include "zerocash/PourOutput.h"
+#include "zerocash/utils/util.h"
 
 using namespace std;
 using namespace libsnark;