upgrade partisan to 4.1.0 and remove unneeded time/rand_compat

Author: tsloughter

rebar.config

@@ -3,10 +3,8 @@
 {deps, [
     {lager, "3.6.8"},
     {plumtree, "0.5.0"},
-    {partisan, "3.0.0"},
+    {partisan, "4.1.0"},
     {types, "0.1.8"},
-    time_compat,
-    rand_compat,
     lasp_support,
     {gen_flow, "0.0.5"},
     {gen_fsm_compat, "0.3.0"}

rebar.lock

@@ -5,11 +5,9 @@
  {<<"goldrush">>,{pkg,<<"goldrush">>,<<"0.1.9">>},1},
  {<<"lager">>,{pkg,<<"lager">>,<<"3.6.8">>},0},
  {<<"lasp_support">>,{pkg,<<"lasp_support">>,<<"0.0.3">>},0},
- {<<"partisan">>,{pkg,<<"partisan">>,<<"3.0.0">>},0},
+ {<<"partisan">>,{pkg,<<"partisan">>,<<"4.1.0">>},0},
  {<<"plumtree">>,{pkg,<<"plumtree">>,<<"0.5.0">>},0},
  {<<"quickrand">>,{pkg,<<"quickrand">>,<<"1.7.5">>},2},
- {<<"rand_compat">>,{pkg,<<"rand_compat">>,<<"0.0.3">>},0},
- {<<"time_compat">>,{pkg,<<"time_compat">>,<<"0.0.1">>},0},
  {<<"types">>,{pkg,<<"types">>,<<"0.1.8">>},0},
  {<<"uuid">>,{pkg,<<"uuid_erl">>,<<"1.7.5">>},1}]}.
 [
@@ -20,11 +18,9 @@
  {<<"goldrush">>, <<"F06E5D5F1277DA5C413E84D5A2924174182FB108DABB39D5EC548B27424CD106">>},
  {<<"lager">>, <<"897EFC7679BB82383448646C96768CDC4E747464DD18B999C7AACA485686B0DA">>},
  {<<"lasp_support">>, <<"C1B7E1A472037AE82C71D2D16A10B7D644A621B66AE5AFE834CECF170F2E9169">>},
- {<<"partisan">>, <<"960877C00E72203CA23023971C1D8DE835AC050148381814832AB334268D9616">>},
+ {<<"partisan">>, <<"51D3C1D6487BBB8F94D4FD313D03D93F1C0426350A3ADF84CC3B3243B8EA204E">>},
  {<<"plumtree">>, <<"F3521CE631AD22AC00635E79C7F046A163BD1135889CDC1D0B18AB577F76EC70">>},
  {<<"quickrand">>, <<"E3086A153EB13A057FC19192D05E2D4C6BB2BDBB55746A699BEAE9847AC17CA8">>},
- {<<"rand_compat">>, <<"011646BC1F0B0C432FE101B816F25B9BBB74A085713CEE1DAFD2D62E9415EAD3">>},
- {<<"time_compat">>, <<"23FE0AD1FDF3B5B88821B2D04B4B5E865BF587AE66056D671FE0F53514ED8139">>},
  {<<"types">>, <<"5782B67231E8C174FE2835395E71E669FE0121076779D2A09F1C0D58EE0E2F13">>},
  {<<"uuid">>, <<"3862FF9A21C42566DFD0376B97512FA202922897129E09A05E2AFA0D9CAFD97A">>}]}
 ].

simulations/lasp_game_tournament_client.erl

@@ -217,7 +217,7 @@ code_change(_OldVsn, State, _Extra) ->
 %% @private
 schedule_enrollment() ->
     %% Add random jitter.
-    Jitter = rand_compat:uniform(?ENROLLMENT_INTERVAL),
+    Jitter = rand:uniform(?ENROLLMENT_INTERVAL),
     timer:send_after(?ENROLLMENT_INTERVAL + Jitter, view).
 
 %% @private

simulations/lasp_status_resource.erl

@@ -38,7 +38,7 @@ content_types_provided(Req, Ctx) ->
 -ifdef(TEST).
 
 to_json(ReqData, State) ->
-    NumNodes = rand_compat:uniform(2),
+    NumNodes = rand:uniform(2),
     NodeList = lists:seq(0, NumNodes),
     Nodes = [#{id => Name, name => Name, group => 1} || Name <- NodeList],
     Links = lists:flatten(generate_links(NodeList)),

src/lasp.app.src

@@ -6,7 +6,7 @@
               {licenses,["Apache 2"]},
               {registered,[]},
               {applications,[kernel,stdlib,types,gen_flow,lager,sasl,
-                             time_compat,lasp_support,rand_compat,partisan,
+                             lasp_support,partisan,
                              plumtree, gen_fsm_compat]},
               {mod,{lasp_app,[]}},
               {env,[{data_root,"data"},

src/lasp.erl

@@ -70,7 +70,7 @@ invariant(Id, Threshold, EnforceFun) ->
 %%
 enforce_once(Id, Threshold, EnforceFun) ->
     case lasp_config:peer_service_manager() of
-        partisan_default_peer_service_manager ->
+        partisan_pluggable_peer_service_manager ->
             do(enforce_once, [Id, Threshold, EnforceFun]);
         Manager ->
             {error, {incompatible_manager, Manager}}
@@ -303,7 +303,7 @@ do(Function, Args) ->
 %% @private
 can_partially_replicate() ->
     case partisan_config:get(partisan_peer_service_manager) of
-        partisan_default_peer_service_manager ->
+        partisan_pluggable_peer_service_manager ->
             case ?SYNC_BACKEND:broadcast_tree_mode() of
                 true ->
                     false;
@@ -317,4 +317,4 @@ can_partially_replicate() ->
             end;
         _ ->
             false
-    end.
+    end.

src/lasp_config.erl

@@ -65,4 +65,4 @@ web_config() ->
 %% @private
 peer_service_manager() ->
     partisan_config:get(partisan_peer_service_manager,
-                        partisan_default_peer_service_manager).
+                        partisan_pluggable_peer_service_manager).

src/lasp_delta_based_synchronization_backend.erl

@@ -340,7 +340,7 @@ schedule_delta_synchronization() ->
             case lasp_config:get(jitter, false) of
                 true ->
                     %% Add random jitter.
-                    Jitter = rand_compat:uniform(Interval),
+                    Jitter = rand:uniform(Interval),
                     timer:send_after(Interval + Jitter, delta_sync);
                 false ->
                     timer:send_after(Interval, delta_sync)

src/lasp_memory_utilization_report.erl

@@ -62,9 +62,9 @@ start_link(Opts) ->
 -spec init([]) -> {ok, #state{}}.
 init([]) ->
     %% Seed the process at initialization.
-    rand_compat:seed(erlang:phash2([lasp_support:mynode()]),
-                     erlang:monotonic_time(),
-                     erlang:unique_integer()),
+    rand:seed(exsplus, {erlang:phash2([lasp_support:mynode()]),
+                        erlang:monotonic_time(),
+                        erlang:unique_integer()}),
 
     %% Schedule reports.
     %% schedule_memory_utilization_report(),

src/lasp_plumtree_backend.erl

@@ -131,9 +131,9 @@ exchange(_Peer) ->
 -spec init([]) -> {ok, #state{}}.
 init([]) ->
     %% Seed the process at initialization.
-    rand_compat:seed(erlang:phash2([lasp_support:mynode()]),
-                     erlang:monotonic_time(),
-                     erlang:unique_integer()),
+    rand:seed(exsplus, {erlang:phash2([lasp_support:mynode()]),
+                        erlang:monotonic_time(),
+                        erlang:unique_integer()}),
 
     schedule_heartbeat(),
 
@@ -185,7 +185,7 @@ handle_info(heartbeat, State) ->
     case lists:member(Node, Servers) of
         true ->
             %% Generate message with monotonically increasing integer.
-            Counter = time_compat:unique_integer([monotonic, positive]),
+            Counter = erlang:unique_integer([monotonic, positive]),
 
             %% Make sure the node prefixes the timestamp with it's own
             %% identifier: this means that we can have this tree

src/lasp_plumtree_memory_report.erl

@@ -62,9 +62,9 @@ start_link(Opts) ->
 -spec init([]) -> {ok, #state{}}.
 init([]) ->
     %% Seed the process at initialization.
-    rand_compat:seed(erlang:phash2([lasp_support:mynode()]),
-                     erlang:monotonic_time(),
-                     erlang:unique_integer()),
+    rand:seed(exsplus, {erlang:phash2([lasp_support:mynode()]),
+                        erlang:monotonic_time(),
+                        erlang:unique_integer()}),
 
     %% Schedule reports.
     schedule_plumtree_memory_report(),

src/lasp_state_based_synchronization_backend.erl

@@ -349,7 +349,7 @@ schedule_state_synchronization() ->
                             %% No jitter.
                             timer:send_after(Interval, {state_sync, ObjectFilterFun});
                         JitterInterval ->
-                            Jitter = rand_compat:uniform(JitterInterval * 2) - JitterInterval,
+                            Jitter = rand:uniform(JitterInterval * 2) - JitterInterval,
                             timer:send_after(Interval + Jitter, {state_sync, ObjectFilterFun})
                     end;
                 false ->
@@ -365,7 +365,7 @@ schedule_plumtree_peer_refresh() ->
         true ->
             Interval = lasp_config:get(plumtree_peer_refresh_interval,
                                        ?PLUMTREE_PEER_REFRESH_INTERVAL),
-            Jitter = rand_compat:uniform(Interval),
+            Jitter = rand:uniform(Interval),
             timer:send_after(Jitter + ?PLUMTREE_PEER_REFRESH_INTERVAL,
                              plumtree_peer_refresh);
         false ->
@@ -521,4 +521,4 @@ is_dynamic(Metadata) ->
             true;
         _ ->
             false
-    end.
+    end.

src/lasp_support.erl

@@ -265,9 +265,9 @@ start_runner() ->
                              [lasp_plumtree_backend]),
     ok = lasp_config:set(workflow, true),
     ok = partisan_config:set(partisan_peer_service_manager,
-                             partisan_default_peer_service_manager),
+                             partisan_pluggable_peer_service_manager),
     lager:info("Configured peer_service_manager ~p on node ~p",
-               [partisan_default_peer_service_manager, lasp_support:mynode()]),
+               [partisan_pluggable_peer_service_manager, lasp_support:mynode()]),
 
     {ok, _} = application:ensure_all_started(lasp),
 
@@ -336,9 +336,9 @@ load_lasp(Node, _Config, Case) ->
     ok = rpc:call(Node, lasp_config, set, [blocking_sync, false]),
 
     ok = rpc:call(Node, partisan_config, set, [partisan_peer_service_manager,
-                                               partisan_default_peer_service_manager]),
+                                               partisan_pluggable_peer_service_manager]),
     lager:info("Configured peer_service_manager ~p on node ~p",
-               [partisan_default_peer_service_manager, Node]),
+               [partisan_pluggable_peer_service_manager, Node]),
 
     ok = rpc:call(Node, application, set_env, [lasp,
                                                data_root,

src/lasp_synchronization_backend.erl

@@ -44,9 +44,9 @@ membership() ->
 
 %% @private
 seed() ->
-    rand_compat:seed(erlang:phash2([lasp_support:mynode()]),
-                     erlang:monotonic_time(),
-                     erlang:unique_integer()).
+    rand:seed(exsplus, {erlang:phash2([lasp_support:mynode()]),
+                        erlang:monotonic_time(),
+                        erlang:unique_integer()}).
 
 %% @private
 compute_exchange(Peers) ->
@@ -117,7 +117,7 @@ client_server_mode() ->
 %% @private
 peer_to_peer_mode() ->
     lasp_config:peer_service_manager() == partisan_hyparview_peer_service_manager orelse
-    lasp_config:peer_service_manager() == partisan_default_peer_service_manager.
+    lasp_config:peer_service_manager() == partisan_pluggable_peer_service_manager.
 
 %% @private
 i_am_server() ->

src/lasp_unique.erl

@@ -107,7 +107,7 @@ code_change(_OldVsn, State, _Extra) ->
 %% @private
 mk_unique() ->
     Node = atom_to_list(lasp_support:mynode()),
-    Unique = time_compat:unique_integer([monotonic, positive]),
+    Unique = erlang:unique_integer([monotonic, positive]),
     TS = integer_to_list(Unique),
     Term = Node ++ TS,
-    crypto:hash(sha, Term).
+    crypto:hash(sha, Term).

test/lasp_SUITE.erl

@@ -1195,7 +1195,7 @@ membership_test(Config) ->
                                                 [WrongPassive])
                                 end
                           end, Nodes);
-        partisan_default_peer_service_manager ->
+        partisan_pluggable_peer_service_manager ->
             lists:foreach(fun(Node) ->
                                 {ok, Members} = rpc:call(Node, Manager, members, []),
                                 lists:usort(Members) =:= lists:usort(Nodes)

test/lasp_peer_to_peer_advertisement_counter_SUITE.erl

@@ -99,7 +99,7 @@ full_peer_to_peer_state_based_tree_test(Config) ->
         Config,
         [{mode, state_based},
          {simulation, ad_counter},
-         {partisan_peer_service_manager, partisan_default_peer_service_manager},
+         {partisan_peer_service_manager, partisan_pluggable_peer_service_manager},
          {set, orset},
          {broadcast, true},
          {evaluation_identifier, full_peer_to_peer_state_based_tree}]),