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/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -320,7 +320,7 @@ void CTxMemPool::check(const CCoinsViewCache *pcoins) const
            }

            // TODO: chained pours
-            libzerocash::IncrementalMerkleTree tree(INCREMENTAL_MERKLE_TREE_DEPTH);
+            ZCIncrementalMerkleTree tree;
            assert(pcoins->GetAnchorAt(pour.anchor, tree));
        }
        if (fDependsWait)