Integrate new incremental merkle tree implementation into consensus.

2016-04-02 23:31:26 -06:00
parent e1ff849d8d
commit 434f328446
9 changed files with 60 additions and 136 deletions
--- a/src/txdb.h
+++ b/src/txdb.h
@@ -36,7 +36,7 @@ protected:
 public:
    CCoinsViewDB(size_t nCacheSize, bool fMemory = false, bool fWipe = false);

-    bool GetAnchorAt(const uint256 &rt, libzerocash::IncrementalMerkleTree &tree) const;
+    bool GetAnchorAt(const uint256 &rt, ZCIncrementalMerkleTree &tree) const;
    bool GetSerial(const uint256 &serial) const;
    bool GetCoins(const uint256 &txid, CCoins &coins) const;
    bool HaveCoins(const uint256 &txid) const;