Merge pull request #4415 from esl/base16

Get rid of base16

Author: telezynski

big_tests/rebar.config

@@ -8,7 +8,6 @@
 
 %% We use https:// instead of git://
 {deps, [
-        {base16, "2.0.1"},
         {exml, "3.4.1", {pkg, hexml}},
         {bbmustache, "1.12.2"},
         {jiffy, "1.1.2"},

big_tests/rebar.lock

@@ -1,6 +1,6 @@
 {"1.2.0",
 [{<<"amqp_client">>,{pkg,<<"amqp_client">>,<<"4.0.3">>},0},
- {<<"base16">>,{pkg,<<"base16">>,<<"2.0.1">>},0},
+ {<<"base16">>,{pkg,<<"base16">>,<<"2.0.1">>},1},
  {<<"bbmustache">>,{pkg,<<"bbmustache">>,<<"1.12.2">>},0},
  {<<"cowboy">>,{pkg,<<"cowboy">>,<<"2.12.0">>},0},
  {<<"cowlib">>,{pkg,<<"cowlib">>,<<"2.13.0">>},1},

big_tests/tests/component_helper.erl

@@ -104,7 +104,7 @@ component_handshake(Conn = #client{props = Props}, []) ->
 component_handshake_el(SID, Password) ->
     Handshake = crypto:hash(sha, <<SID/binary, Password/binary>>),
     #xmlel{name = <<"handshake">>,
-           children = [#xmlcdata{content = base16:encode(Handshake)}]}.
+           children = [#xmlcdata{content = binary:encode_hex(Handshake, lowercase)}]}.
 
 component_start_stream_subdomain(Conn = #client{props = Props}, []) ->
     {component, Component} = lists:keyfind(component, 1, Props),

big_tests/tests/graphql_helper.erl

@@ -170,7 +170,7 @@ init_domain_admin_handler(Config) ->
 init_domain_admin_handler(Config, Domain) ->
     case mongoose_helper:is_rdbms_enabled(Domain) of
         true ->
-            Password = base16:encode(crypto:strong_rand_bytes(8)),
+            Password = binary:encode_hex(crypto:strong_rand_bytes(8)),
             Creds = {<<"admin@", Domain/binary>>, Password},
             domain_helper:set_domain_password(mim(), Domain, Password),
             add_specs([{protocol, http}, {domain_admin, Creds}, {schema_endpoint, domain_admin}

big_tests/tests/graphql_stanza_SUITE.erl

@@ -372,7 +372,7 @@ user_send_stanza_without_from_with_id(Config) ->
 
 user_send_stanza_without_from_with_id_story(Config, Alice, Bob) ->
     Body = <<"Hi!">>,
-    StanzaId = base16:encode(crypto:strong_rand_bytes(8)),
+    StanzaId = binary:encode_hex(crypto:strong_rand_bytes(8)),
     Stanza = escalus_stanza:set_id(escalus_stanza:chat_to_short_jid(Bob, Body), StanzaId),
     Res = user_send_stanza(Alice, exml:to_binary(Stanza), Config),
     ?assertEqual(#{<<"id">> => StanzaId}, get_ok_value([data, stanza, sendStanza], Res)),

big_tests/tests/inbox_helper.erl

@@ -317,9 +317,9 @@ check_result(Packet, ExpectedResult) ->
                 ExpectedResult).
 
 maybe_make_queryid(iq_id) ->
-    #{iq_id => base16:encode(crypto:strong_rand_bytes(16))};
+    #{iq_id => binary:encode_hex(crypto:strong_rand_bytes(16), lowercase)};
 maybe_make_queryid(queryid) ->
-    #{queryid => base16:encode(crypto:strong_rand_bytes(16))};
+    #{queryid => binary:encode_hex(crypto:strong_rand_bytes(16), lowercase)};
 maybe_make_queryid(undefined) ->
     #{}.
 

big_tests/tests/jingle_sip_translator.erl

@@ -118,7 +118,7 @@ make_200_ok_for_conference_call(Socket, Tr, #sip{hdrs = Hdrs} = Sip, #sip{hdrs =
     make_200_ok_for_phone_call(Tr, Sip, Resp183),
     {_, #uri{user = ReceiverUser}, _Params} = Receiver = esip:get_hdr(to, RespHdrs),
     {_, _, _} = Initiator = esip:get_hdr(from, RespHdrs),
-    Branch = base16:encode(crypto:strong_rand_bytes(3)),
+    Branch = binary:encode_hex(crypto:strong_rand_bytes(3), lowercase),
     URIBin = <<"sip:",ReceiverUser/binary,"@127.0.0.1:12345;ob;transport=tcp">>,
     ContactURI = esip_codec:decode_uri(URIBin),
     Contact = {<<>>, ContactURI, []},
@@ -142,7 +142,7 @@ make_200_ok_for_conference_call(Socket, Tr, #sip{hdrs = Hdrs} = Sip, #sip{hdrs =
 
 make_forward_req(#sip{hdrs = Hdrs} = Sip) ->
     %% Forward the request back to MongooseIM
-    Branch = base16:encode(crypto:strong_rand_bytes(3)),
+    Branch = binary:encode_hex(crypto:strong_rand_bytes(3), lowercase),
     {_, #uri{user = FromUser}, _} = esip:get_hdr(to, Hdrs),
     URIBin = <<"sip:",FromUser/binary,"@127.0.0.1:12345;ob;transport=tcp">>,
     ContactURI = esip_codec:decode_uri(URIBin),
@@ -246,7 +246,7 @@ dialog_callback(#sip{type = request, hdrs = Hdrs} = Req, Socket, _Tr) ->
     {_, #uri{user = ToUser}, _} = To,
     {_, #uri{user = _FromUser}, _} = From,
 
-    Branch = base16:encode(crypto:strong_rand_bytes(3)),
+    Branch = binary:encode_hex(crypto:strong_rand_bytes(3), lowercase),
     URIBin = <<"sip:",ToUser/binary,"@127.0.0.1:12345;ob;transport=tcp">>,
     ContactURI = esip_codec:decode_uri(URIBin),
     Contact = {<<>>, ContactURI, []},
@@ -277,15 +277,15 @@ send_invite(From, To, Pid) ->
 
     FromURI = esip_codec:decode_uri(<<"sip:", FromJID/binary>>),
     FromSIP = {FromUser, FromURI,
-               [{<<"tag">>, base16:encode(crypto:strong_rand_bytes(2))}]},
+               [{<<"tag">>, binary:encode_hex(crypto:strong_rand_bytes(2), lowercase)}]},
 
     ToUser = escalus_client:username(To),
     ToJID = escalus_client:short_jid(To),
     ToURI = esip_codec:decode_uri(<<"sip:", ToJID/binary>>),
     ToSIP = {ToUser, ToURI, []},
-    CallID = base16:encode(crypto:strong_rand_bytes(6)),
+    CallID = binary:encode_hex(crypto:strong_rand_bytes(6), lowercase),
     CSeq = 141501489,
-    Branch = base16:encode(crypto:strong_rand_bytes(3)),
+    Branch = binary:encode_hex(crypto:strong_rand_bytes(3), lowercase),
     ContactURI = esip_codec:decode_uri(<<"sip:",FromUser/binary,"@127.0.0.1:12345;ob">>),
     Contact = {<<>>, ContactURI, []},
 
@@ -322,7 +322,7 @@ send_ack_for_200_ok(#sip{type = response, method = <<"INVITE">>,
                               'route', 'max-forwards',
                               'authorization', 'to', 'from',
                               'proxy-authorization'], Hdrs),
-    Branch = base16:encode(crypto:strong_rand_bytes(3)),
+    Branch = binary:encode_hex(crypto:strong_rand_bytes(3), lowercase),
     Via = #via{transport = <<"UDP">>, host = <<"127.0.0.1">>, port = 12345,
                params = [{<<"rport">>, <<>>},
                          {<<"branch">>, <<"z9hG4bK-", Branch/binary>>}]},

big_tests/tests/mam_helper.erl

@@ -958,7 +958,7 @@ generate_msg_for_date_user(Owner, Remote, DateTime) ->
     generate_msg_for_date_user(Owner, Remote, DateTime, random_text()).
 
 random_text() ->
-    base16:encode(crypto:strong_rand_bytes(4)).
+    binary:encode_hex(crypto:strong_rand_bytes(4)).
 
 generate_msg_for_date_user(Owner, {RemoteBin, _, _} = Remote, DateTime, Content) ->
     Microsec = datetime_to_microseconds(DateTime),

big_tests/tests/mim_c2s_SUITE.erl

@@ -132,7 +132,7 @@ two_users_can_log_and_chat(Config) ->
 too_big_stanza_is_rejected(Config) ->
     AliceSpec = escalus_fresh:create_fresh_user(Config, alice),
     {ok, Alice, _Features} = escalus_connection:start(AliceSpec),
-    BigBody = base16:encode(crypto:strong_rand_bytes(?MAX_STANZA_SIZE)),
+    BigBody = binary:encode_hex(crypto:strong_rand_bytes(?MAX_STANZA_SIZE)),
     escalus_client:send(Alice, escalus_stanza:chat_to(Alice, BigBody)),
     escalus:assert(is_stream_error, [<<"policy-violation">>, <<>>], escalus_client:wait_for_stanza(Alice)),
     escalus:assert(is_stream_end, escalus_client:wait_for_stanza(Alice)),
@@ -141,7 +141,7 @@ too_big_stanza_is_rejected(Config) ->
 too_big_opening_tag_is_rejected(Config) ->
     AliceSpec = escalus_fresh:create_fresh_user(Config, alice),
     {ok, Alice, _Features} = escalus_connection:start(AliceSpec, []),
-    BigAttrs = [{<<"bigattr">>,  base16:encode(crypto:strong_rand_bytes(?MAX_STANZA_SIZE))}],
+    BigAttrs = [{<<"bigattr">>,  binary:encode_hex(crypto:strong_rand_bytes(?MAX_STANZA_SIZE))}],
     escalus_client:send(Alice, #xmlel{name = <<"stream:stream">>, attrs = BigAttrs}),
     escalus:assert(is_stream_start, escalus_client:wait_for_stanza(Alice)),
     escalus:assert(is_stream_error, [<<"xml-not-well-formed">>, <<>>],

big_tests/tests/muc_SUITE.erl

@@ -5419,4 +5419,4 @@ fresh_nick_name(Prefix) ->
     <<Prefix/binary, (fresh_nick_name())/binary>>.
 
 fresh_nick_name() ->
-    fresh_room_name(base16:encode(crypto:strong_rand_bytes(5))).
+    fresh_room_name(binary:encode_hex(crypto:strong_rand_bytes(5), lowercase)).