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

Bugfix: correct epoch number checking when inner proj

Browse source
This commit is contained in:
Scott Lystig Fritchie 2015-08-27 22:22:15 +09:00
parent 93b9b948fc
commit deb2cdee2c
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/machi_chain_manager1.erl
View file

@ -2422,11 +2422,11 @@ projection_transition_is_sane(P1, P2, RelativeToServer, RetrospectiveP) ->
if HasInner1 orelse HasInner2 -> if HasInner1 orelse HasInner2 ->
Inner1 = inner_projection_or_self(P1), Inner1 = inner_projection_or_self(P1),
Inner2 = inner_projection_or_self(P2), Inner2 = inner_projection_or_self(P2),
if HasInner1 andalso HasInner2 -> if HasInner1 orelse HasInner2 ->
%% In case of inner->inner transition, we must allow %% In case of transition with inner projections, we
%% the epoch number to remain constant. Thus, we %% must allow the epoch number to remain constant.
%% call the function that does not check for a %% Thus, we call the function that does not check for
%% strictly-increasing epoch. %% a strictly-increasing epoch.
?RETURN2( ?RETURN2(
projection_transition_is_sane_final_review(P1, P2, projection_transition_is_sane_final_review(P1, P2,
projection_transition_is_sane_except_si_epoch( projection_transition_is_sane_except_si_epoch(