Fix wrong and add missing type specs

Author: ansd

deps/rabbit/src/rabbit_channel.erl

@@ -104,9 +104,7 @@
 
           %% same as capabilities in the reader
           capabilities,
-          %% tracing exchange resource if tracing is enabled,
-          %% 'none' otherwise
-          trace_state,
+          trace_state :: rabbit_trace:state(),
           consumer_prefetch,
           %% Message content size limit
           max_message_size,

deps/rabbit/src/rabbit_trace.erl

@@ -20,7 +20,8 @@
 
 %%----------------------------------------------------------------------------
 
--type state() :: rabbit_types:exchange() | 'none'.
+-opaque state() :: rabbit_types:exchange() | 'none'.
+-export_type([state/0]).
 
 %%----------------------------------------------------------------------------
 

deps/rabbitmq_mqtt/src/rabbit_mqtt_packet.erl

@@ -13,7 +13,7 @@
 -export([parse/2, initial_state/0, serialise/2]).
 -export_type([state/0]).
 
--opaque state() :: 'none' | {more, any()}.
+-opaque state() :: none | fun().
 
 -define(RESERVED, 0).
 -define(MAX_LEN, 16#fffffff).
@@ -23,7 +23,10 @@
 -spec initial_state() -> state().
 initial_state() -> none.
 
--spec parse(binary(), state()) -> {more, state()} | {ok, any(), any()} | {error, any()}.
+-spec parse(binary(), state()) ->
+    {more, state()} |
+    {ok, mqtt_packet(), binary()} |
+    {error, any()}.
 parse(<<>>, none) ->
     {more, fun(Bin) -> parse(Bin, none) end};
 parse(<<MessageType:4, Dup:1, QoS:2, Retain:1, Rest/binary>>, none) ->

deps/rabbitmq_mqtt/src/rabbit_mqtt_processor.erl

@@ -53,7 +53,7 @@
          ssl_login_name :: none | binary(),
          retainer_pid :: option(pid()),
          delivery_flow :: flow | noflow,
-         trace_state,
+         trace_state :: option(rabbit_trace:state()),
          prefetch :: non_neg_integer(),
          client_id :: option(binary()),
          conn_name :: option(binary()),

deps/rabbitmq_mqtt/src/rabbit_mqtt_reader.erl

@@ -334,10 +334,9 @@ process_received_bytes(Bytes,
         {ok, Packet, Rest} ->
             case rabbit_mqtt_processor:process_packet(Packet, ProcState) of
                 {ok, ProcState1} ->
-                    PS = rabbit_mqtt_packet:initial_state(),
                     process_received_bytes(
                       Rest,
-                      State #state{parse_state = PS,
+                      State #state{parse_state = rabbit_mqtt_packet:initial_state(),
                                    proc_state = ProcState1});
                 %% PUBLISH and more
                 {error, unauthorized = Reason, ProcState1} ->

deps/rabbitmq_stream/src/rabbit_stream_reader.erl

@@ -82,7 +82,7 @@
          heartbeater :: any(),
          client_properties = #{} :: #{binary() => binary()},
          monitors = #{} :: #{reference() => stream()},
-         stats_timer :: undefined | reference(),
+         stats_timer :: undefined | rabbit_event:state(),
          resource_alarm :: boolean(),
          send_file_oct ::
              atomics:atomics_ref(), % number of bytes sent with send_file (for metrics)

deps/rabbitmq_web_mqtt/src/rabbit_web_mqtt_handler.erl

@@ -30,13 +30,13 @@
 
 -record(state, {
           socket,
-          parse_state,
-          proc_state,
+          parse_state = rabbit_mqtt_packet:initial_state() :: rabbit_mqtt_packet:state(),
+          proc_state :: undefined | rabbit_mqtt_processor:state(),
           connection_state = running :: running | blocked,
           conserve = false :: boolean(),
-          stats_timer,
+          stats_timer :: undefined | rabbit_event:state(),
           keepalive = rabbit_mqtt_keepalive:init() :: rabbit_mqtt_keepalive:state(),
-          conn_name,
+          conn_name :: undefined | binary(),
           received_connect_packet = false :: boolean()
          }).
 
@@ -84,8 +84,7 @@ init(Req, Opts) ->
                 true ->
                     {?MODULE,
                      cowboy_req:set_resp_header(<<"sec-websocket-protocol">>, <<"mqtt">>, Req),
-                     {#state{parse_state = rabbit_mqtt_packet:initial_state(),
-                             socket = maps:get(proxy_header, Req, undefined)},
+                     {#state{socket = maps:get(proxy_header, Req, undefined)},
                       PeerAddr},
                      WsOpts}
             end
@@ -275,10 +274,9 @@ handle_data1(Data, State = #state{ parse_state = ParseState,
         {ok, Packet, Rest} ->
             case rabbit_mqtt_processor:process_packet(Packet, ProcState) of
                 {ok, ProcState1} ->
-                    PS = rabbit_mqtt_packet:initial_state(),
                     handle_data1(
                       Rest,
-                      State#state{parse_state = PS,
+                      State#state{parse_state = rabbit_mqtt_packet:initial_state(),
                                   proc_state = ProcState1});
                 {error, Reason, _} ->
                     stop_mqtt_protocol_error(State, Reason, ConnName);