Merge pull request #20 from microsoft/fix_path_serialised_size

Fix path serialised_size calculation
microsoft · Dec 15, 2023 · 30d1dc7 · 30d1dc7
2 parents 1a8a3a0 + f4997c0
commit 30d1dc7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/merklecpp.h b/merklecpp.h
@@ -424,7 +424,14 @@ namespace merkle
     /// @brief The size of the serialised path in number of bytes
     size_t serialised_size() const
     {
-      return sizeof(_leaf) + elements.size() * sizeof(Element);
+      return sizeof(_leaf) +
+      sizeof(uint64_t) + // leaf index
+      sizeof(uint64_t) + // max index
+      sizeof(uint64_t) + // number of elements
+      elements.size() * (
+        sizeof(Element::hash) + // hash
+        sizeof(uint8_t) // direction
+      );
     }
 
     /// @brief Index of the leaf of the path

diff --git a/test/paths.cpp b/test/paths.cpp
@@ -56,6 +56,10 @@ int main()
         auto path = mt.path(i);
         if (!path->verify(root))
           throw std::runtime_error("path verification failed");
+        std::vector<uint8_t> serialised_path;
+        path->serialise(serialised_path);
+        if (path->serialised_size() != serialised_path.size())
+          throw std::runtime_error("serialised_size() != serialised_path.size()");
       }
     }