Mas 310 merge (#990)

Merge in 3.0.10 updates, as well as removal of deprecated functions pre OTP 22

Co-authored-by: Thomas Arts <thomas.arts@quviq.com>

Author: martinsumner

eqc/hashtree_eqc.erl

@@ -66,13 +66,8 @@
 integer_to_binary(Int) ->
     list_to_binary(integer_to_list(Int)).
 
--ifndef(old_hash).
 sha(Bin) ->
     crypto:hash(sha, Bin).
--else.
-sha(Bin) ->
-    crypto:sha(Bin).
--endif.
 
 key() ->
     ?LET(Key, int(), ?MODULE:integer_to_binary(Key)).

include/riak_core.hrl

@@ -1,7 +1,2 @@
--ifdef(namespaced_types).
 -type riak_core_dict() :: dict:dict().
--type riak_core_set() :: sets:set().
--else.
--type riak_core_dict() :: dict().
--type riak_core_set() :: set().
--endif.
+-type riak_core_set() :: sets:set().

include/riak_core_handoff.hrl

@@ -1,8 +1,4 @@
--ifdef(namespaced_types).
 -type riak_core_handoff_dict() :: dict:dict().
--else.
--type riak_core_handoff_dict() :: dict().
--endif.
 
 -define(PT_MSG_INIT, 0).
 -define(PT_MSG_OBJ, 1).

rebar.config

@@ -5,12 +5,7 @@
 
 {cover_enabled, true}.
 
-{erl_opts, [warnings_as_errors,
-            debug_info,
-            {platform_define, "^[0-9]+", namespaced_types},
-            {platform_define, "^R15", "old_hash"},
-            {platform_define, "^[2-9][1-9][0-9]*(.?[0-9]*)", deprecated_21},
-            {platform_define, "^[2-9][2-9][0-9]*(.?[0-9]*)", deprecated_22}]}.
+{erl_opts, [warnings_as_errors, debug_info]}.
 
 {edoc_opts, [{preprocess, true}]}.
 

src/chash.erl

@@ -97,13 +97,8 @@ lookup(IndexAsInt, CHash) ->
     {IndexAsInt, X} = proplists:lookup(IndexAsInt, Nodes),
     X.
 
--ifndef(old_hash).
 sha(Bin) ->
     crypto:hash(sha, Bin).
--else.
-sha(Bin) ->
-    crypto:sha(Bin).
--endif.
 
 %% @doc Given any term used to name an object, produce that object's key
 %%      into the ring.  Two names with the same SHA-1 hash value are

src/hashtree.erl

@@ -135,13 +135,8 @@
 
 -include_lib("kernel/include/logger.hrl").
 
--ifdef(namespaced_types).
 -type hashtree_dict() :: dict:dict().
 -type hashtree_array() :: array:array().
--else.
--type hashtree_dict() :: dict().
--type hashtree_array() :: array().
--endif.
 
 -define(ALL_SEGMENTS, ['*', '*']).
 -define(BIN_TO_INT(B), list_to_integer(binary_to_list(B))).
@@ -638,7 +633,6 @@ get_bucket(Level, Bucket, State) ->
 %%% Internal functions
 %%%===================================================================
 
--ifndef(old_hash).
 md5(Bin) ->
     crypto:hash(md5, Bin).
 
@@ -655,25 +649,7 @@ esha_update(Ctx, Bin) ->
 
 esha_final(Ctx) ->
     crypto:hash_final(Ctx).
--else.
-md5(Bin) ->
-    crypto:md5(Bin).
 
--ifdef(TEST).
-esha(Bin) ->
-    crypto:sha(Bin).
--endif.
-
-esha_init() ->
-    crypto:sha_init().
-
-esha_update(Ctx, Bin) ->
-    crypto:sha_update(Ctx, Bin).
-
-esha_final(Ctx) ->
-    crypto:sha_final(Ctx).
-
--endif.
 
 -spec set_bucket(integer(), integer(), any(), hashtree()) -> hashtree().
 set_bucket(Level, Bucket, Val, State) ->

src/hashtree_tree.erl

@@ -119,11 +119,7 @@
 
 -export_type([tree/0, tree_node/0, handler_fun/1, remote_fun/0]).
 
--ifdef(namespaced_types).
 -type hashtree_gb_set() :: gb_sets:set().
--else.
--type hashtree_gb_set() :: gb_set().
--endif.
 
 -record(hashtree_tree, {
           %% the identifier for this tree. used as part of the ids

src/riak_core_gen_server.erl

@@ -182,13 +182,8 @@
 %%%  Preprocessor
 %%%=========================================================================
 
--ifdef(deprecated_22).
 get_log(Debug) ->
     sys:get_log(Debug).
--else.
-get_log(Debug) ->
-    sys:get_debug(log, Debug, []).
--endif.
 
 %%%  -----------------------------------------------------------------
 %%% Starts a generic server.

src/riak_core_handoff_receiver.erl

@@ -52,13 +52,8 @@
 %% set the timeout for the vnode to process the handoff_data msg to 60s
 -define(VNODE_TIMEOUT, 60000).
 
--ifdef(deprecated_21).
 ssl_handshake(Socket, SslOpts, Timeout) ->
     ssl:handshake(Socket, SslOpts, Timeout).
--else.
-ssl_handshake(Socket, SslOpts, Timeout) ->
-    ssl:ssl_accept(Socket, SslOpts, Timeout).
--endif.
 
 start_link() ->
     start_link([]).

src/riak_core_node_watcher.erl

@@ -135,7 +135,7 @@ service_down(Id) ->
     gen_server:call(?MODULE, {service_down, Id}, infinity).
 
 service_down(Id, true) ->
-    gen_server:call(?MODULE, {service_down, Id, health_check}, infinitiy);
+    gen_server:call(?MODULE, {service_down, Id, health_check}, infinity);
 service_down(Id, false) ->
     service_down(Id).