From 230678975519215324480ed20cf9699ee7db7055 Mon Sep 17 00:00:00 2001
From: Shawn <506895667@qq.com>
Date: Wed, 3 Apr 2019 19:41:21 +0800
Subject: [PATCH] Remove bin_key_map/1 (#2393)

* Remove bin_key_map/1

* Fix Travis-CI failure
---
 src/emqx_message.erl       | 27 ---------------------------
 test/emqx_bridge_SUITE.erl |  1 +
 2 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/src/emqx_message.erl b/src/emqx_message.erl
index 7e78a3dac..23ddd69d4 100644
--- a/src/emqx_message.erl
+++ b/src/emqx_message.erl
@@ -57,8 +57,6 @@
 
 -export([ to_map/1
         , to_list/1
-        , to_bin_key_map/1
-        , to_bin_key_list/1
         ]).
 
 -export([format/1]).
@@ -193,24 +191,11 @@ update_expiry(Msg) -> Msg.
 to_map(Msg) ->
     maps:from_list(to_list(Msg)).
 
-%% @doc Message to map
--spec(to_bin_key_map(emqx_types:message()) -> #{binary() => any()}).
-to_bin_key_map(Msg) ->
-    maps:from_list(to_bin_key_list(Msg)).
-
 %% @doc Message to tuple list
 -spec(to_list(emqx_types:message()) -> map()).
 to_list(Msg) ->
     lists:zip(record_info(fields, message), tl(tuple_to_list(Msg))).
 
-%% @doc Message to tuple list
--spec(to_bin_key_list(emqx_types:message()) -> map()).
-to_bin_key_list(Msg) ->
-    lists:zipwith(
-        fun(Key, Val) ->
-            {bin(Key), bin_key_map(Val)}
-        end, record_info(fields, message), tl(tuple_to_list(Msg))).
-
 %% MilliSeconds
 elapsed(Since) ->
     max(0, timer:now_diff(os:timestamp(), Since) div 1000).
@@ -225,15 +210,3 @@ format(flags, Flags) ->
     io_lib:format("~p", [[Flag || {Flag, true} <- maps:to_list(Flags)]]);
 format(headers, Headers) ->
     io_lib:format("~p", [Headers]).
-
-bin_key_map(Map) when is_map(Map) ->
-    maps:fold(fun(Key, Val, Acc) ->
-                      Acc#{bin(Key) => bin_key_map(Val)}
-              end, #{}, Map);
-bin_key_map(Data) ->
-    Data.
-
-bin(Bin) when is_binary(Bin) -> Bin;
-bin(Atom) when is_atom(Atom) -> list_to_binary(atom_to_list(Atom));
-bin(Str) when is_list(Str) -> list_to_binary(Str).
-
diff --git a/test/emqx_bridge_SUITE.erl b/test/emqx_bridge_SUITE.erl
index 238871d05..b33a64210 100644
--- a/test/emqx_bridge_SUITE.erl
+++ b/test/emqx_bridge_SUITE.erl
@@ -87,6 +87,7 @@ t_rpc(Config) when is_list(Config) ->
         %% message from a different client, to avoid getting terminated by no-local
         Msg1 = emqx_message:make(<<"ClientId-2">>, ?QOS_2, <<"t_rpc/one">>, <<"hello">>),
         ok = emqx_session:subscribe(SPid, [{<<"forwarded/t_rpc/one">>, #{qos => ?QOS_1}}]),
+        ct:sleep(100),
         PacketId = 1,
         emqx_session:publish(SPid, PacketId, Msg1),
         ?wait(case emqx_mock_client:get_last_message(ConnPid) of