From 8048f4c048ff4f40883686b45fd43980ee31c9d4 Mon Sep 17 00:00:00 2001 From: Sean Bowe Date: Thu, 26 May 2016 13:58:58 -0600 Subject: [PATCH] Ensure merkle tree fixed point removal is tested against inside coins_tests. --- src/test/coins_tests.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/test/coins_tests.cpp b/src/test/coins_tests.cpp index 1a70fe922..8fb6abcc8 100644 --- a/src/test/coins_tests.cpp +++ b/src/test/coins_tests.cpp @@ -24,8 +24,12 @@ class CCoinsViewTest : public CCoinsView std::map mapSerials_; public: + CCoinsViewTest() { + hashBestAnchor_ = ZCIncrementalMerkleTree::empty_root(); + } + bool GetAnchorAt(const uint256& rt, ZCIncrementalMerkleTree &tree) const { - if (rt.IsNull()) { + if (rt == ZCIncrementalMerkleTree::empty_root()) { ZCIncrementalMerkleTree new_tree; tree = new_tree; return true; @@ -214,12 +218,13 @@ BOOST_AUTO_TEST_CASE(anchors_test) CCoinsViewTest base; CCoinsViewCacheTest cache(&base); - BOOST_CHECK(cache.GetBestAnchor() == uint256()); + BOOST_CHECK(cache.GetBestAnchor() == ZCIncrementalMerkleTree::empty_root()); { ZCIncrementalMerkleTree tree; BOOST_CHECK(cache.GetAnchorAt(cache.GetBestAnchor(), tree)); + BOOST_CHECK(cache.GetBestAnchor() == tree.root()); appendRandomCommitment(tree); appendRandomCommitment(tree); appendRandomCommitment(tree);