greg/machi
1
0
Fork 0
Code Issues 11 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Add merkle library #48

Merged
jadeallenx merged 13 commits from mra/merkle-cleanup into master 2015-12-02 07:25:51 +00:00
Conversation 1 Commits 13 Files changed 4 +19 -1
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 72a4fab49d - Show all commits

20
src/machi_merkle_tree.erl
View file

@ -102,7 +102,7 @@ filename(#mt{ filename = F }) -> F.
diff(#mt{backend = naive, tree = T1}, #mt{backend = naive, tree = T2}) ->
case T1#naive.root == T2#naive.root of
true -> same;
false -> different %% TODO: implement diff
false -> naive_diff(T1, T2)
end;
diff(#mt{backend = merklet, tree = T1}, #mt{backend = merklet, tree = T2}) ->
case merklet:diff(T1, T2) of
@ -201,3 +201,21 @@ build_level_1(Size, [{Pos, Len, Hash}|T], Multiple, [ Ctx | Rest ])
build_level_1(Size, [{Pos, Len, Hash}|T], Multiple, [ Ctx | Rest ])
when ( Pos + Len ) =< ( Size * Multiple ) ->
build_level_1(Size, T, Multiple, [ crypto:hash_update(Ctx, Hash) | Rest ]).
naive_diff(#naive{lvl1 = L1}, #naive{lvl1=L2, chunk_size=CS2}) ->
lager:debug("naive diff: Our lvl1: ~p~n", [L1]),
lager:debug("naive diff: Their chunk size: ~p, lvl1: ~p~n", [CS2, L2]),
Set1 = gb_sets:from_list(lists:zip(lists:seq(1, length(L1), L1))),
Set2 = gb_sets:from_list(lists:zip(lists:seq(1, length(L2), L2))),
%% The byte ranges in list 2 that do not match in list 1
%%
%% We have to decide what to do now - should we filter the
%% leaf nodes using these ranges and find specific divergence
%% between Tree1 and Tree2?
%%
%% Or should we do something else?
[ {(X-1)*CS2, CS2, SHA} || {X, SHA} <- gb_sets:to_list(gb_sets:subtract(Set1, Set2)) ].