upgrade deps and remove rand_compat

Author: tsloughter

.travis.yml

@@ -1,10 +1,12 @@
 language: erlang
 otp_release:
-  - 20.0
+  - 22.0
+  - 21.2.5
+  - 20.3
   - 19.3
 install:
+  - wget https://s3.amazonaws.com/rebar3/rebar3 && chmod u+x rebar3
   - make
-  - ./rebar3 update
 script:
   - make test
   - make xref

rebar.config

@@ -1,9 +1,7 @@
 {min_otp_version, "19.0"}.
 
-{deps, [{lasp_support, "~>0.0"},
-        time_compat,
-        rand_compat,
-        {partisan, "~>2.1"},
+{deps, [{lasp_support, "~>0.1"},
+        {partisan, "~>4.1"},
         {lager, "~>3.5"}]}.
 
 {dialyzer_base_plt_apps, [kernel, stdlib, erts, sasl, eunit, syntax_tools, compiler, crypto]}.

rebar.lock

@@ -1,24 +1,20 @@
 {"1.1.0",
-[{<<"acceptor_pool">>,{pkg,<<"acceptor_pool">>,<<"1.0.0-rc.0">>},1},
+[{<<"acceptor_pool">>,{pkg,<<"acceptor_pool">>,<<"1.0.0">>},1},
  {<<"goldrush">>,{pkg,<<"goldrush">>,<<"0.1.9">>},1},
- {<<"lager">>,{pkg,<<"lager">>,<<"3.5.2">>},0},
- {<<"lasp_support">>,{pkg,<<"lasp_support">>,<<"0.0.3">>},0},
- {<<"partisan">>,{pkg,<<"partisan">>,<<"2.1.0">>},0},
- {<<"quickrand">>,{pkg,<<"quickrand">>,<<"1.7.3">>},2},
- {<<"rand_compat">>,{pkg,<<"rand_compat">>,<<"0.0.3">>},0},
- {<<"time_compat">>,{pkg,<<"time_compat">>,<<"0.0.1">>},0},
+ {<<"lager">>,{pkg,<<"lager">>,<<"3.8.0">>},0},
+ {<<"lasp_support">>,{pkg,<<"lasp_support">>,<<"0.1.0">>},0},
+ {<<"partisan">>,{pkg,<<"partisan">>,<<"4.1.0">>},0},
+ {<<"quickrand">>,{pkg,<<"quickrand">>,<<"1.7.5">>},2},
  {<<"types">>,{pkg,<<"types">>,<<"0.1.8">>},1},
- {<<"uuid">>,{pkg,<<"uuid_erl">>,<<"1.7.3">>},1}]}.
+ {<<"uuid">>,{pkg,<<"uuid_erl">>,<<"1.7.5">>},1}]}.
 [
 {pkg_hash,[
- {<<"acceptor_pool">>, <<"679D741DF87FC13599B1AEF2DF8F78F1F880449A6BEFAB7C44FB6FAE0E92A2DE">>},
+ {<<"acceptor_pool">>, <<"43C20D2ACAE35F0C2BCD64F9D2BDE267E459F0F3FD23DAB26485BF518C281B21">>},
  {<<"goldrush">>, <<"F06E5D5F1277DA5C413E84D5A2924174182FB108DABB39D5EC548B27424CD106">>},
- {<<"lager">>, <<"614A8C8F67BF99B69EB264EA22121AD25511C055AAEC09B086773D5108C6767F">>},
- {<<"lasp_support">>, <<"C1B7E1A472037AE82C71D2D16A10B7D644A621B66AE5AFE834CECF170F2E9169">>},
- {<<"partisan">>, <<"4B193F0D7D46F65894AE3A32E0DF379F7A00B5E853A2EBCA6CF6F2F42943D1E0">>},
- {<<"quickrand">>, <<"0E4FB48FAC904FE0C6E21D7E8C31A288A0700E1E81A35B38B649FC119079755D">>},
- {<<"rand_compat">>, <<"011646BC1F0B0C432FE101B816F25B9BBB74A085713CEE1DAFD2D62E9415EAD3">>},
- {<<"time_compat">>, <<"23FE0AD1FDF3B5B88821B2D04B4B5E865BF587AE66056D671FE0F53514ED8139">>},
+ {<<"lager">>, <<"3402B9A7E473680CA179FC2F1D827CAB88DD37DD1E6113090C6F45EF05228A1C">>},
+ {<<"lasp_support">>, <<"A6D665138BD8C10555FE7A4A2A81A8A47079EAE5FFC368D411DE660EB7A66F04">>},
+ {<<"partisan">>, <<"51D3C1D6487BBB8F94D4FD313D03D93F1C0426350A3ADF84CC3B3243B8EA204E">>},
+ {<<"quickrand">>, <<"E3086A153EB13A057FC19192D05E2D4C6BB2BDBB55746A699BEAE9847AC17CA8">>},
  {<<"types">>, <<"5782B67231E8C174FE2835395E71E669FE0121076779D2A09F1C0D58EE0E2F13">>},
- {<<"uuid">>, <<"C5DF97D1A3D626235C2415E74053C47B2138BB863C5CD802AB5CAECB8ECC019F">>}]}
+ {<<"uuid">>, <<"3862FF9A21C42566DFD0376B97512FA202922897129E09A05E2AFA0D9CAFD97A">>}]}
 ].

rebar3

@@ -1,8 +1,8 @@
 {application,plumtree,
              [{description,"Epidemic Broadcast Trees"},
-              {vsn,"0.5.0"},
+              {vsn,"0.6.0"},
               {registered,[]},
-              {applications,[kernel,stdlib,crypto,lager,rand_compat,partisan]},
+              {applications,[kernel,stdlib,crypto,lager,partisan]},
               {mod,{plumtree_app,[]}},
               {modules,[]},
               {env,[{plumtree_data_dir,"data"}]},

src/plumtree.app.src

@@ -566,7 +566,7 @@ random_other_node(OrdSet) ->
     case Size of
         0 -> undefined;
         _ ->
-            lists:nth(rand_compat:uniform(Size),
+            lists:nth(rand:uniform(Size),
                      ordsets:to_list(OrdSet))
     end.
 

src/plumtree_broadcast.erl

@@ -127,7 +127,7 @@ membership_high_client_test(Config) ->
 membership_test(Config) ->
     %% Use the default peer service manager.
     Manager = proplists:get_value(partisan_peer_service_manager,
-                                  Config, partisan_default_peer_service_manager),
+                                  Config, partisan_pluggable_peer_service_manager),
     NServers = proplists:get_value(n_servers, Config, 1),
     NClients = proplists:get_value(n_clients, Config, ?CLIENT_NUMBER),
     % Partition = proplists:get_value(partition, Config, false),
@@ -154,15 +154,15 @@ membership_test(Config) ->
     %% check membership after cluster
     check_membership(Nodes),
 
-    BroadcastRounds1 = rand_compat:uniform(100),
+    BroadcastRounds1 = rand:uniform(100),
     ct:pal("now doing ~p rounds of broadcast",
            [BroadcastRounds1]),
     %% do several rounds of broadcast from random nodes, then wait a bit for propagation
     lists:foreach(fun(_) ->
                     {_, Node} = plumtree_test_utils:select_random(Nodes),
                     ok = rpc:call(Node,
                                   plumtree_broadcast, broadcast,
-                                  [{k, rand_compat:uniform()}, plumtree_test_broadcast_handler])
+                                  [{k, rand:uniform()}, plumtree_test_broadcast_handler])
                   end, lists:seq(1, BroadcastRounds1)),
     %% allow 100ms per broadcast to settle
     timer:sleep(100 * BroadcastRounds1),
@@ -173,12 +173,12 @@ membership_test(Config) ->
     %% now inject partitions in the broadcast tree until the graph is no longer connected
 
     %% do some rounds of broadcast in order to repair the tree
-    BroadcastRounds2 = rand_compat:uniform(100),
+    BroadcastRounds2 = rand:uniform(100),
     lists:foreach(fun(_) ->
                     {_, Node} = plumtree_test_utils:select_random(Nodes),
                     ok = rpc:call(Node,
                                   plumtree_broadcast, broadcast,
-                                  [{k, rand_compat:uniform()}, plumtree_test_broadcast_handler])
+                                  [{k, rand:uniform()}, plumtree_test_broadcast_handler])
                   end, lists:seq(1, BroadcastRounds2)),
     %% allow 100ms per broadcast to settle
     timer:sleep(100 * BroadcastRounds1),
@@ -190,7 +190,7 @@ membership_test(Config) ->
 broadcast_test(Config) ->
     %% Use the default peer service manager.
     Manager = proplists:get_value(partisan_peer_service_manager,
-                                  Config, partisan_default_peer_service_manager),
+                                  Config, partisan_pluggable_peer_service_manager),
     NServers = proplists:get_value(n_servers, Config, 1),
     NClients = proplists:get_value(n_clients, Config, ?CLIENT_NUMBER),
     Partition = proplists:get_value(partition, Config, false),
@@ -221,12 +221,12 @@ broadcast_test(Config) ->
     maybe_resolve_partition(Partition, Reference, Manager, Nodes),
 
     %% do several rounds of broadcast from random nodes, then wait a bit for propagation
-    BroadcastRounds1 = rand_compat:uniform(100),
+    BroadcastRounds1 = rand:uniform(100),
     lists:foreach(fun(_) ->
                     {_, Node} = plumtree_test_utils:select_random(Nodes),
                     ok = rpc:call(Node,
                                   plumtree_broadcast, broadcast,
-                                  [{k, rand_compat:uniform()}, plumtree_test_broadcast_handler])
+                                  [{k, rand:uniform()}, plumtree_test_broadcast_handler])
                   end, lists:seq(1, BroadcastRounds1)),
     %% allow 500ms per broadcast to settle
     timer:sleep(200 * BroadcastRounds1),
@@ -235,7 +235,7 @@ broadcast_test(Config) ->
     check_membership(Nodes),
 
     %% do a final round of broadcast, also from a random node, which is the one we'll be checking
-    Rand = rand_compat:uniform(),
+    Rand = rand:uniform(),
     {_, RandomNode} = plumtree_test_utils:select_random(Nodes),
     ok = rpc:call(RandomNode,
                   plumtree_broadcast, broadcast,
@@ -434,7 +434,7 @@ cluster({Name, _Node} = Myself, Nodes, Options) when is_list(Nodes) ->
     AmIClient = lists:member(Name, Clients),
 
     OtherNodes = case Manager of
-                     partisan_default_peer_service_manager ->
+                     partisan_pluggable_peer_service_manager ->
                          %% Omit just ourselves.
                          omit([Name], Nodes);
                      partisan_client_server_peer_service_manager ->

test/plumtree_SUITE.erl

@@ -159,7 +159,7 @@ select_random(List0, Omit) ->
     List = List0 -- lists:flatten([Omit]),
     %% Catch exceptions where there may not be enough members.
     try
-        Index = rand_compat:uniform(length(List)),
+        Index = rand:uniform(length(List)),
         lists:nth(Index, List)
     catch
         _:_ ->