From a1488b39461c55f835ab3a774e1a84e491775126 Mon Sep 17 00:00:00 2001
From: Shawn <506895667@qq.com>
Date: Thu, 15 Jul 2021 18:54:31 +0800
Subject: [PATCH] fix(test): merge conflicts

---
 apps/emqx/src/emqx_access_control.erl | 8 ++++----
 apps/emqx/src/emqx_channel.erl        | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/emqx/src/emqx_access_control.erl b/apps/emqx/src/emqx_access_control.erl
index b7731fdb5..71531c421 100644
--- a/apps/emqx/src/emqx_access_control.erl
+++ b/apps/emqx/src/emqx_access_control.erl
@@ -28,12 +28,12 @@
 
 -spec(authenticate(emqx_types:clientinfo()) ->
     ok | {ok, binary()} | {continue, map()} | {continue, binary(), map()} | {error, term()}).
-authenticate(Credential = #{zone := Zone, listener := Listener}) ->
-    run_hooks('client.authenticate', [Credential], ok)
+authenticate(Credential) ->
+    run_hooks('client.authenticate', [Credential], ok).
 
 %% @doc Check ACL
--spec(authorize(emqx_types:clientinfo(), emqx_types:pubsub(), emqx_types:topic())
-      -> allow | deny).
+-spec authorize(emqx_types:clientinfo(), emqx_types:pubsub(), emqx_types:topic())
+      -> allow | deny.
 authorize(ClientInfo = #{zone := Zone, listener := Listener}, PubSub, Topic) ->
     case emqx_acl_cache:is_enabled(Zone, Listener) of
         true  -> check_authorization_cache(ClientInfo, PubSub, Topic);
diff --git a/apps/emqx/src/emqx_channel.erl b/apps/emqx/src/emqx_channel.erl
index c10b937e5..4d9b8ae12 100644
--- a/apps/emqx/src/emqx_channel.erl
+++ b/apps/emqx/src/emqx_channel.erl
@@ -995,7 +995,7 @@ handle_info({sock_closed, Reason}, Channel = #channel{conn_state = connecting})
 
 handle_info({sock_closed, Reason}, Channel =
             #channel{conn_state = ConnState,
-                     clientinfo = ClientInfo = #{zone := Zone listener := Listener}})
+                     clientinfo = ClientInfo = #{zone := Zone, listener := Listener}})
         when ConnState =:= connected orelse ConnState =:= reauthenticating ->
     emqx_config:get_listener_conf(Zone, Listener, [flapping_detect, enable])
         andalso emqx_flapping:detect(ClientInfo),