Auto merge of #3258 - Eirik0:3056-anchor-test-cases, r=str4d

Add tests for sapling anchors Closes #3253
2018-06-19 09:28:20 -07:00
parent 2ebde5860e 762ee0e896
commit 9acfa0067f
4 changed files with 159 additions and 126 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2514,8 +2514,8 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
        pos.nTxOffset += ::GetSerializeSize(tx, SER_DISK, CLIENT_VERSION);
    }

-    view.PushSproutAnchor(sprout_tree);
-    view.PushSaplingAnchor(sapling_tree);
+    view.PushAnchor(sprout_tree);
+    view.PushAnchor(sapling_tree);
    if (!fJustCheck) {
        pindex->hashFinalSproutRoot = sprout_tree.root();
    }