Add helper functions to IncrementalMerkleTree.

Electric-Coin-Company · Dec 31, 2015 · 0c062e7 · nathan-at-least · Jan 14, 2016 · 0c062e7
1 parent f756c36
commit 0c062e7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/libzerocash/IncrementalMerkleTree.cpp b/libzerocash/IncrementalMerkleTree.cpp
@@ -63,7 +63,7 @@ namespace libzerocash {
         return serialized;
     }
 
-    IncrementalMerkleTreeCompact IncrementalMerkleTreeCompact::Deserialize(std::vector<unsigned char> serialized) {
+    IncrementalMerkleTreeCompact IncrementalMerkleTreeCompact::deserialize(const std::vector<unsigned char>& serialized) {
         IncrementalMerkleTreeCompact deserialized;
 
         size_t currentPos = 0;

diff --git a/libzerocash/IncrementalMerkleTree.h b/libzerocash/IncrementalMerkleTree.h
@@ -46,7 +46,7 @@ class IncrementalMerkleTreeCompact {
     std::vector< bool > const& getHashList() { return hashList; }
 
     std::vector<unsigned char> serialize();
-    static IncrementalMerkleTreeCompact Deserialize(std::vector<unsigned char> serialized);
+    static IncrementalMerkleTreeCompact deserialize(const std::vector<unsigned char>& serialized);
 
 private:
     IncrementalMerkleTreeCompact() : treeHeight(0) {}
@@ -115,6 +115,15 @@ class IncrementalMerkleTree {
 	std::vector<unsigned char>getRoot();
     bool prune();
     IncrementalMerkleTreeCompact getCompactRepresentation();
+    std::vector<unsigned char> serialize() {
+        auto compact = getCompactRepresentation();
+        return compact.serialize();
+    }
+
+    static IncrementalMerkleTree deserialize(const std::vector<unsigned char>& serialized) {
+        auto deserialized = IncrementalMerkleTreeCompact::deserialize(serialized);
+        return IncrementalMerkleTree(deserialized);
+    }
 
     bool fromCompactRepresentation(IncrementalMerkleTreeCompact &rep);
 

diff --git a/tests/merkleTest.cpp b/tests/merkleTest.cpp
@@ -110,7 +110,7 @@ BOOST_AUTO_TEST_CASE( testCompactRepresentation ) {
 
         /* Test serializing and deserializing. */
         std::vector<unsigned char> serializedCompact = compact.serialize();
-        IncrementalMerkleTreeCompact deserializedCompact = IncrementalMerkleTreeCompact::Deserialize(serializedCompact);
+        IncrementalMerkleTreeCompact deserializedCompact = IncrementalMerkleTreeCompact::deserialize(serializedCompact);
         BOOST_REQUIRE(compact.getTreeHeight() == deserializedCompact.getTreeHeight());
         BOOST_REQUIRE(compact.getHashList() == deserializedCompact.getHashList());
         BOOST_REQUIRE(compact.getHashVec() == deserializedCompact.getHashVec());
@@ -138,7 +138,7 @@ BOOST_AUTO_TEST_CASE( testCompactDeserializationFailures ) {
     for (size_t trunc_len = 0; trunc_len < serialized.size(); trunc_len++) {
         std::vector<unsigned char> truncated(serialized.begin(), serialized.begin() + trunc_len);
         BOOST_CHECK_THROW(
-            IncrementalMerkleTreeCompact::Deserialize(truncated),
+            IncrementalMerkleTreeCompact::deserialize(truncated),
             std::out_of_range
         );
     }
@@ -147,7 +147,7 @@ BOOST_AUTO_TEST_CASE( testCompactDeserializationFailures ) {
     std::vector<unsigned char> extra_byte = serialized;
     extra_byte.push_back(0x00);
     BOOST_CHECK_THROW(
-        IncrementalMerkleTreeCompact::Deserialize(extra_byte),
+        IncrementalMerkleTreeCompact::deserialize(extra_byte),
         std::runtime_error
     );
 }