From ba26a8511c5c4a9d758579a04801c27350d50c36 Mon Sep 17 00:00:00 2001
From: JimMoen <LnJimMoen@outlook.com>
Date: Thu, 16 Sep 2021 14:27:11 +0800
Subject: [PATCH] fix(emqx_types): emqx_types:version() used but undefined.

---
 apps/emqx/src/emqx_frame.erl  |  4 ++--
 apps/emqx/src/emqx_packet.erl |  2 +-
 apps/emqx/src/emqx_types.erl  | 24 ++++++++++++------------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/apps/emqx/src/emqx_frame.erl b/apps/emqx/src/emqx_frame.erl
index 79a740bed..cea94eec8 100644
--- a/apps/emqx/src/emqx_frame.erl
+++ b/apps/emqx/src/emqx_frame.erl
@@ -44,7 +44,7 @@
 
 -type(options() :: #{strict_mode => boolean(),
                      max_size => 1..?MAX_PACKET_SIZE,
-                     version => emqx_types:version()
+                     version => emqx_types:proto_ver()
                     }).
 
 -type(parse_state() :: {none, options()} | {cont_state(), options()}).
@@ -490,7 +490,7 @@ serialize_pkt(Packet, #{version := Ver, max_size := MaxSize}) ->
 -spec(serialize(emqx_types:packet()) -> iodata()).
 serialize(Packet) -> serialize(Packet, ?MQTT_PROTO_V4).
 
--spec(serialize(emqx_types:packet(), emqx_types:version()) -> iodata()).
+-spec(serialize(emqx_types:packet(), emqx_types:proto_ver()) -> iodata()).
 serialize(#mqtt_packet{header   = Header,
                        variable = Variable,
                        payload  = Payload}, Ver) ->
diff --git a/apps/emqx/src/emqx_packet.erl b/apps/emqx/src/emqx_packet.erl
index a4d440ba1..d1577e0c7 100644
--- a/apps/emqx/src/emqx_packet.erl
+++ b/apps/emqx/src/emqx_packet.erl
@@ -114,7 +114,7 @@ proto_name(#mqtt_packet_connect{proto_name = Name}) ->
     Name.
 
 %% @doc Protocol version of the CONNECT Packet.
--spec(proto_ver(emqx_types:packet()|connect()) -> emqx_types:version()).
+-spec(proto_ver(emqx_types:packet()|connect()) -> emqx_types:proto_ver()).
 proto_ver(?CONNECT_PACKET(ConnPkt)) ->
     proto_ver(ConnPkt);
 proto_ver(#mqtt_packet_connect{proto_ver = Ver}) ->
diff --git a/apps/emqx/src/emqx_types.erl b/apps/emqx/src/emqx_types.erl
index 84868f473..940c9b630 100644
--- a/apps/emqx/src/emqx_types.erl
+++ b/apps/emqx/src/emqx_types.erl
@@ -20,7 +20,7 @@
 -include("emqx_mqtt.hrl").
 -include("types.hrl").
 
--export_type([ ver/0
+-export_type([ proto_ver/0
              , qos/0
              , qos_name/0
              ]).
@@ -91,11 +91,11 @@
 
 -export_type([oom_policy/0]).
 
--type(ver() :: ?MQTT_PROTO_V3
-             | ?MQTT_PROTO_V4
-             | ?MQTT_PROTO_V5
-             | non_neg_integer()
-             | binary() % For lwm2m, mqtt-sn...
+-type(proto_ver() :: ?MQTT_PROTO_V3
+                   | ?MQTT_PROTO_V4
+                   | ?MQTT_PROTO_V5
+                   | non_neg_integer()
+                   | binary() % For lwm2m, mqtt-sn...
      ).
 
 -type(qos() :: ?QOS_0 | ?QOS_1 | ?QOS_2).
@@ -116,7 +116,7 @@
                       peercert := nossl | undefined | esockd_peercert:peercert(),
                       conn_mod := module(),
                       proto_name => binary(),
-                      proto_ver => ver(),
+                      proto_ver => proto_ver(),
                       clean_start => boolean(),
                       clientid => clientid(),
                       username => username(),
@@ -187,12 +187,12 @@
 -type(message() :: #message{}).
 -type(flag() :: sys | dup | retain | atom()).
 -type(flags() :: #{flag() := boolean()}).
--type(headers() :: #{proto_ver => ver(),
-                     protocol => protocol(),
-                     username => username(),
-                     peerhost => peerhost(),
+-type(headers() :: #{proto_ver  => proto_ver(),
+                     protocol   => protocol(),
+                     username   => username(),
+                     peerhost   => peerhost(),
                      properties => properties(),
-                     atom() => term()}).
+                     atom()     => term()}).
 
 -type(banned() :: #banned{}).
 -type(deliver() :: {deliver, topic(), message()}).