Attempt to ensure messages are output in the correct order

helium · Jul 10, 2018 · 567760a · 567760a
1 parent 220b9d0
commit 567760a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/hbbft_acs.erl b/src/hbbft_acs.erl
@@ -136,6 +136,7 @@ handle_msg(Data = #acs_data{n=N, f=F}, J, {{bba, I}, BBAMsg}) ->
                                                                       Acc
                                                               end
                                                       end, {NewData, []}, lists:seq(0, N - 1)),
+                    %% each BBA is independant, so the total ordering here is unimportant
                     {NextData#acs_data{done=true}, {send, lists:flatten(Replies)}};
                 false ->
                     check_completion(NewData)

diff --git a/src/hbbft_bba.erl b/src/hbbft_bba.erl
@@ -177,7 +177,7 @@ bval(Data=#bba_data{n=N, f=F}, Id, V) ->
                                       true ->
                                           %% XXX How many times do we send AUX per round? I think just once
                                           Random = rand_val(NewData2#bba_data.bin_values),
-                                          {NewData2#bba_data{aux_sent = true}, [{multicast, {aux, NewData2#bba_data.round, Random}} | ToSend]};
+                                          {NewData2#bba_data{aux_sent = true}, ToSend ++ [{multicast, {aux, NewData2#bba_data.round, Random}}]};
                                       false ->
                                           {NewData2, ToSend}
                                   end,
@@ -192,7 +192,7 @@ bval(Data=#bba_data{n=N, f=F}, Id, V) ->
                             %% TODO need more entropy for the SID
                             %% We have enough AUX and CON messages to reveal our share of the coin
                             {CoinData, {send, CoinSend}} = hbbft_cc:get_coin(maybe_init_coin(NewData3)),
-                            {NewData3#bba_data{coin=CoinData, coin_sent=true}, {send, hbbft_utils:wrap({coin, Data#bba_data.round}, CoinSend) ++ ToSend2}};
+                            {NewData3#bba_data{coin=CoinData, coin_sent=true}, {send, ToSend2 ++ hbbft_utils:wrap({coin, Data#bba_data.round}, CoinSend)}};
                         _ ->
                             {NewData3, {send, ToSend2}}
                     end;