From 69889d14a3be9da8ba5e8de742bb5e6a22748baa Mon Sep 17 00:00:00 2001
From: Andrew Mayorov <encube.ul@gmail.com>
Date: Tue, 19 Sep 2023 20:44:53 +0400
Subject: [PATCH] fix(sessds): fix use of undefined types

---
 apps/emqx/src/emqx_channel.erl                              | 2 +-
 apps/emqx/src/emqx_cm.erl                                   | 4 ++--
 apps/emqx/src/emqx_persistent_session_ds.erl                | 4 ++--
 apps/emqx/src/proto/emqx_persistent_session_ds_proto_v1.erl | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/emqx/src/emqx_channel.erl b/apps/emqx/src/emqx_channel.erl
index 93cd872c4..8669aea8e 100644
--- a/apps/emqx/src/emqx_channel.erl
+++ b/apps/emqx/src/emqx_channel.erl
@@ -84,7 +84,7 @@
     %% MQTT ClientInfo
     clientinfo :: emqx_types:clientinfo(),
     %% MQTT Session
-    session :: maybe(emqx_session:session()),
+    session :: maybe(emqx_session:t()),
     %% Keepalive
     keepalive :: maybe(emqx_keepalive:keepalive()),
     %% MQTT Will Msg
diff --git a/apps/emqx/src/emqx_cm.erl b/apps/emqx/src/emqx_cm.erl
index 33a2c007b..cea22652d 100644
--- a/apps/emqx/src/emqx_cm.erl
+++ b/apps/emqx/src/emqx_cm.erl
@@ -260,7 +260,7 @@ set_chan_stats(ClientId, ChanPid, Stats) ->
 %% @doc Open a session.
 -spec open_session(boolean(), emqx_types:clientinfo(), emqx_types:conninfo()) ->
     {ok, #{
-        session := emqx_session:session(),
+        session := emqx_session:t(),
         present := boolean(),
         replay => _ReplayContext
     }}
@@ -390,7 +390,7 @@ discard_session(ClientId) when is_binary(ClientId) ->
 %% benefits nobody.
 -spec request_stepdown(Action, module(), pid()) ->
     ok
-    | {ok, emqx_session:session() | list(emqx_types:deliver())}
+    | {ok, emqx_session:t() | _ReplayContext}
     | {error, term()}
 when
     Action :: kick | discard | {takeover, 'begin'} | {takeover, 'end'}.
diff --git a/apps/emqx/src/emqx_persistent_session_ds.erl b/apps/emqx/src/emqx_persistent_session_ds.erl
index f37eb7710..1e35c12fe 100644
--- a/apps/emqx/src/emqx_persistent_session_ds.erl
+++ b/apps/emqx/src/emqx_persistent_session_ds.erl
@@ -364,7 +364,7 @@ update_subscription(TopicFilterBin, Iterator, SubOpts, DSSessionID) ->
     ok = ?tp(persistent_session_ds_iterator_updated, #{iterator => Iterator}),
     NIterator.
 
--spec open_iterator_on_all_shards(emqx_topic:words(), emqx_ds:iterator()) -> ok.
+-spec open_iterator_on_all_shards(emqx_types:words(), emqx_ds:iterator()) -> ok.
 open_iterator_on_all_shards(TopicFilter, Iterator) ->
     ?tp(persistent_session_ds_will_open_iterators, #{iterator => Iterator}),
     %% Note: currently, shards map 1:1 to nodes, but this will change in the future.
@@ -384,7 +384,7 @@ open_iterator_on_all_shards(TopicFilter, Iterator) ->
     ok.
 
 %% RPC target.
--spec do_open_iterator(emqx_topic:words(), emqx_ds:time(), emqx_ds:iterator_id()) ->
+-spec do_open_iterator(emqx_types:words(), emqx_ds:time(), emqx_ds:iterator_id()) ->
     {ok, emqx_ds_storage_layer:iterator()} | {error, _Reason}.
 do_open_iterator(TopicFilter, StartMS, IteratorID) ->
     Replay = {TopicFilter, StartMS},
diff --git a/apps/emqx/src/proto/emqx_persistent_session_ds_proto_v1.erl b/apps/emqx/src/proto/emqx_persistent_session_ds_proto_v1.erl
index b1926098d..47c9ed541 100644
--- a/apps/emqx/src/proto/emqx_persistent_session_ds_proto_v1.erl
+++ b/apps/emqx/src/proto/emqx_persistent_session_ds_proto_v1.erl
@@ -36,7 +36,7 @@ introduced_in() ->
 
 -spec open_iterator(
     [node()],
-    emqx_topic:words(),
+    emqx_types:words(),
     emqx_ds:time(),
     emqx_ds:iterator_id()
 ) ->