File 0011-remove-rand_compat-and-time_compat-deps.patch of Package lasp
From 5271fd659df930ddc33e2bc915630b388813417d Mon Sep 17 00:00:00 2001
From: Led <ledest@gmail.com>
Date: Mon, 11 Jun 2018 03:12:11 +0300
Subject: [PATCH] remove rand_compat and time_compat deps
---
rebar.config | 2 --
simulations/lasp_game_tournament_client.erl | 2 +-
simulations/lasp_status_resource.erl | 2 +-
src/lasp.app.src | 3 +--
src/lasp_delta_based_synchronization_backend.erl | 2 +-
src/lasp_memory_utilization_report.erl | 5 -----
src/lasp_plumtree_backend.erl | 7 +------
src/lasp_plumtree_memory_report.erl | 5 -----
src/lasp_state_based_synchronization_backend.erl | 4 ++--
src/lasp_synchronization_backend.erl | 5 +----
src/lasp_unique.erl | 2 +-
11 files changed, 9 insertions(+), 30 deletions(-)
diff --git a/rebar.config b/rebar.config
index 23b17007..cfec4939 100644
--- a/rebar.config
+++ b/rebar.config
@@ -5,8 +5,6 @@
{plumtree, "0.5.0"},
{partisan, {git, "https://github.com/lasp-lang/partisan", {branch, "master"}}},
{types, "0.1.8"},
- time_compat,
- rand_compat,
lasp_support,
{gen_flow, "0.0.5"}
]}.
diff --git a/simulations/lasp_game_tournament_client.erl b/simulations/lasp_game_tournament_client.erl
index dfa12cef..51d5d7ed 100644
--- a/simulations/lasp_game_tournament_client.erl
+++ b/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
diff --git a/simulations/lasp_status_resource.erl b/simulations/lasp_status_resource.erl
index 264100cc..a5cdb7a1 100644
--- a/simulations/lasp_status_resource.erl
+++ b/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)),
diff --git a/src/lasp.app.src b/src/lasp.app.src
index c52df2cb..20f73447 100644
--- a/src/lasp.app.src
+++ b/src/lasp.app.src
@@ -6,8 +6,7 @@
{licenses,["Apache 2"]},
{registered,[]},
{applications,[kernel,stdlib,types,gen_flow,lager,sasl,
- time_compat,lasp_support,rand_compat,partisan,
- plumtree]},
+ lasp_support,partisan,plumtree]},
{mod,{lasp_app,[]}},
{env,[{data_root,"data"},
{web_ip,"0.0.0.0"},
diff --git a/src/lasp_delta_based_synchronization_backend.erl b/src/lasp_delta_based_synchronization_backend.erl
index e0dab90d..d6c24092 100644
--- a/src/lasp_delta_based_synchronization_backend.erl
+++ b/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)
diff --git a/src/lasp_memory_utilization_report.erl b/src/lasp_memory_utilization_report.erl
index 90b44cb5..3c1a39d3 100644
--- a/src/lasp_memory_utilization_report.erl
+++ b/src/lasp_memory_utilization_report.erl
@@ -61,11 +61,6 @@ start_link(Opts) ->
%% @private
-spec init([]) -> {ok, #state{}}.
init([]) ->
- %% Seed the process at initialization.
- rand_compat:seed(erlang:phash2([lasp_support:mynode()]),
- erlang:monotonic_time(),
- erlang:unique_integer()),
-
%% Schedule reports.
%% schedule_memory_utilization_report(),
diff --git a/src/lasp_plumtree_backend.erl b/src/lasp_plumtree_backend.erl
index 65ca44b0..ceae66ba 100644
--- a/src/lasp_plumtree_backend.erl
+++ b/src/lasp_plumtree_backend.erl
@@ -130,11 +130,6 @@ exchange(_Peer) ->
%% @private
-spec init([]) -> {ok, #state{}}.
init([]) ->
- %% Seed the process at initialization.
- rand_compat:seed(erlang:phash2([lasp_support:mynode()]),
- erlang:monotonic_time(),
- erlang:unique_integer()),
-
schedule_heartbeat(),
%% Open an ETS table for tracking heartbeat messages.
@@ -185,7 +180,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
diff --git a/src/lasp_plumtree_memory_report.erl b/src/lasp_plumtree_memory_report.erl
index 848f888c..c2318f9d 100644
--- a/src/lasp_plumtree_memory_report.erl
+++ b/src/lasp_plumtree_memory_report.erl
@@ -61,11 +61,6 @@ start_link(Opts) ->
%% @private
-spec init([]) -> {ok, #state{}}.
init([]) ->
- %% Seed the process at initialization.
- rand_compat:seed(erlang:phash2([lasp_support:mynode()]),
- erlang:monotonic_time(),
- erlang:unique_integer()),
-
%% Schedule reports.
schedule_plumtree_memory_report(),
diff --git a/src/lasp_state_based_synchronization_backend.erl b/src/lasp_state_based_synchronization_backend.erl
index 72d7060a..b9117c3c 100644
--- a/src/lasp_state_based_synchronization_backend.erl
+++ b/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 ->
diff --git a/src/lasp_synchronization_backend.erl b/src/lasp_synchronization_backend.erl
index 3c976c18..6f865010 100644
--- a/src/lasp_synchronization_backend.erl
+++ b/src/lasp_synchronization_backend.erl
@@ -43,10 +43,7 @@ membership() ->
lasp_peer_service:members().
%% @private
-seed() ->
- rand_compat:seed(erlang:phash2([lasp_support:mynode()]),
- erlang:monotonic_time(),
- erlang:unique_integer()).
+seed() -> ok.
%% @private
compute_exchange(Peers) ->
diff --git a/src/lasp_unique.erl b/src/lasp_unique.erl
index b1ab6223..80b52e34 100644
--- a/src/lasp_unique.erl
+++ b/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).
\ No newline at end of file
--
2.16.4
