From c2d7fcc2e1274c148f0ac94436c138022390ffc4 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Fri, 19 Sep 2014 14:33:25 +0200 Subject: Hash over the MerkleTreeLeaf. Hash over correct timestamp when adding submitted entries. Hash over the full #mtl{} when adding entries from db. --- src/ht.erl | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/ht.erl') diff --git a/src/ht.erl b/src/ht.erl index b6570a0..ec8527f 100644 --- a/src/ht.erl +++ b/src/ht.erl @@ -261,15 +261,14 @@ new([-1]) -> new([]); %% Initialise tree from db. new([Version]) when is_integer(Version) -> - foldl(fun(#mtl{entry = E}, Tree) -> - D = (E#timestamped_entry.entry)#plop_entry.data, - add(Tree, D) % Return value -> Tree in next invocation. + foldl(fun(MTL, Tree) -> + %% Return value becomes Tree in next invocation. + add(Tree, plop:serialise(MTL)) end, new([]), db:get_by_index_sorted(0, Version)); %% Initialise tree from List. new([List]) when is_list(List) -> - foldl(fun(D, Tree) -> - add(Tree, D) % Return value -> Tree in next invocation. - end, new([]), List). + foldl(fun(SerialisedMTL, Tree) -> add(Tree, SerialisedMTL) end, + new([]), List). update(Tree) -> update(Tree, Tree#tree.version). -- cgit v1.1