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

Revert UPI [] -> [FirstRepairing] to commit 91496c6

Browse source
This commit is contained in:
Scott Lystig Fritchie 2015-08-06 15:21:44 +09:00
parent 01da7a7046
commit 82b6726261
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/machi_chain_manager1.erl
View file

@ -666,17 +666,13 @@ calc_projection(_OldThreshold, _NoPartitionThreshold, LastProj,
TentativeUPI = NewUPI_list3, TentativeUPI = NewUPI_list3,
TentativeRepairing = Repairing_list5, TentativeRepairing = Repairing_list5,
AllTentativeUPI_witnesses_p =
lists:all(fun(X) -> lists:member(X, OldWitness_list) end,
TentativeUPI),
{NewUPI, NewRepairing} = {NewUPI, NewRepairing} =
if (TentativeUPI == [] orelse AllTentativeUPI_witnesses_p) if TentativeUPI == [] andalso TentativeRepairing /= [] ->
andalso TentativeRepairing /= [] -> %% UPI is empty (not including witnesses), so grab
%% UPI is empty or all in UPI are witnesses, so grab
%% the first from the repairing list and make it the %% the first from the repairing list and make it the
%% only non-witness in the UPI. %% only non-witness in the UPI.
[FirstRepairing|TailRepairing] = TentativeRepairing, [FirstRepairing|TailRepairing] = TentativeRepairing,
{TentativeUPI ++ [FirstRepairing], TailRepairing}; {[FirstRepairing], TailRepairing};
true -> true ->
{TentativeUPI, TentativeRepairing} {TentativeUPI, TentativeRepairing}
end, end,