Merge pull request #42 from esl/escalus-update

Escalus update

Author: NelsonVides

rebar.config

@@ -6,8 +6,8 @@
 
 { deps, [
     {amoc_arsenal, {git, "https://github.com/esl/amoc-arsenal.git", {branch, "main"}}},
-    {escalus, "4.2.16"},
-    {exml, "3.4.1", {pkg, hexml}},
+    {escalus, "4.4.0"},
+    {exml, "~> 4.0", {pkg, hexml}},
     {gun, "2.1.0"},
     {fusco, "0.1.1"}
 ]}.

rebar.lock

@@ -1,88 +1,93 @@
 {"1.2.0",
-[{<<"accept">>,{pkg,<<"accept">>,<<"0.3.5">>},3},
- {<<"amoc">>,{pkg,<<"amoc">>,<<"3.3.0">>},1},
+[{<<"amoc">>,{pkg,<<"amoc">>,<<"3.3.0">>},1},
  {<<"amoc_arsenal">>,
   {git,"https://github.com/esl/amoc-arsenal.git",
-       {ref,"5e2140ff8c11295a45ff8a555444baf7d0ebab27"}},
+       {ref,"a0a4115f8595e20f4b454b67f66beca60580aafd"}},
   0},
  {<<"amoc_rest">>,
   {git,"https://github.com/esl/amoc_rest.git",
-       {ref,"d9f642255f48d14a1ff9601500796f5edb4e11e6"}},
+       {ref,"1e41be5b6b332a827d125380fa4f7ea23a00748e"}},
   1},
- {<<"base16">>,{pkg,<<"base16">>,<<"2.0.1">>},1},
  {<<"bbmustache">>,{pkg,<<"bbmustache">>,<<"1.12.2">>},1},
+ {<<"bear">>,{pkg,<<"bear">>,<<"1.0.0">>},2},
  {<<"cowboy">>,{pkg,<<"cowboy">>,<<"2.12.0">>},2},
  {<<"cowlib">>,{pkg,<<"cowlib">>,<<"2.13.0">>},1},
- {<<"escalus">>,{pkg,<<"escalus">>,<<"4.2.16">>},0},
- {<<"exml">>,{pkg,<<"hexml">>,<<"3.4.1">>},0},
- {<<"fast_pbkdf2">>,{pkg,<<"fast_pbkdf2">>,<<"1.0.5">>},2},
- {<<"fast_scram">>,{pkg,<<"fast_scram">>,<<"0.6.0">>},1},
- {<<"fast_tls">>,{pkg,<<"fast_tls">>,<<"1.1.21">>},1},
+ {<<"docsh">>,{pkg,<<"docsh">>,<<"0.7.2">>},1},
+ {<<"escalus">>,{pkg,<<"escalus">>,<<"4.4.0">>},0},
+ {<<"exml">>,{pkg,<<"hexml">>,<<"4.0.0">>},0},
+ {<<"exometer_core">>,
+  {git,"https://github.com/esl/exometer_core.git",
+       {ref,"123daa053a4abb3ff4bdbf52f08344da535294e9"}},
+  1},
+ {<<"exometer_report_graphite">>,
+  {git,"https://github.com/esl/exometer_report_graphite.git",
+       {ref,"59e475a094818294443de9dc68e08ee0116a5626"}},
+  1},
+ {<<"fast_pbkdf2">>,{pkg,<<"fast_pbkdf2">>,<<"1.0.6">>},2},
+ {<<"fast_scram">>,{pkg,<<"fast_scram">>,<<"0.6.1">>},1},
  {<<"fusco">>,{pkg,<<"fusco">>,<<"0.1.1">>},0},
+ {<<"getopt">>,{pkg,<<"getopt">>,<<"1.0.1">>},3},
  {<<"gun">>,{pkg,<<"gun">>,<<"2.1.0">>},0},
- {<<"jesse">>,{pkg,<<"jesse">>,<<"1.8.1">>},2},
- {<<"meck">>,{pkg,<<"meck">>,<<"0.9.2">>},1},
- {<<"p1_utils">>,{pkg,<<"p1_utils">>,<<"1.0.26">>},2},
- {<<"prometheus">>,{pkg,<<"prometheus">>,<<"4.11.0">>},1},
- {<<"prometheus_cowboy">>,{pkg,<<"prometheus_cowboy">>,<<"0.1.8">>},1},
- {<<"prometheus_httpd">>,{pkg,<<"prometheus_httpd">>,<<"2.1.11">>},2},
- {<<"quantile_estimator">>,{pkg,<<"quantile_estimator">>,<<"0.2.1">>},2},
+ {<<"jesse">>,{pkg,<<"jesse">>,<<"1.8.0">>},2},
+ {<<"jsx">>,{pkg,<<"jsx">>,<<"3.1.0">>},2},
+ {<<"meck">>,{pkg,<<"meck">>,<<"1.0.0">>},1},
+ {<<"parse_trans">>,{pkg,<<"parse_trans">>,<<"3.4.0">>},2},
+ {<<"providers">>,{pkg,<<"providers">>,<<"1.8.1">>},2},
  {<<"quickrand">>,{pkg,<<"quickrand">>,<<"2.0.7">>},2},
  {<<"ranch">>,{pkg,<<"ranch">>,<<"2.1.0">>},2},
- {<<"telemetry">>,{pkg,<<"telemetry">>,<<"1.3.0">>},1},
+ {<<"rfc3339">>,{pkg,<<"rfc3339">>,<<"0.9.0">>},3},
+ {<<"telemetry">>,{pkg,<<"telemetry">>,<<"1.2.1">>},1},
  {<<"uuid">>,{pkg,<<"uuid_erl">>,<<"2.0.7">>},1},
- {<<"worker_pool">>,{pkg,<<"worker_pool">>,<<"6.2.1">>},1}]}.
+ {<<"worker_pool">>,{pkg,<<"worker_pool">>,<<"6.4.0">>},1}]}.
 [
 {pkg_hash,[
- {<<"accept">>, <<"B33B127ABCA7CC948BBE6CAA4C263369ABF1347CFA9D8E699C6D214660F10CD1">>},
  {<<"amoc">>, <<"531B7E8CE39D40B4BF5A819868091C4451DC3D3FDAE753E3E3B1D0E5E8E81CDD">>},
- {<<"base16">>, <<"F0549F732E03BE8124ED0D19FD5EE52146CC8BE24C48CBC3F23AB44B157F11A2">>},
  {<<"bbmustache">>, <<"0CABDCE0DB9FE6D3318131174B9F2B351328A4C0AFBEB3E6E99BB0E02E9B621D">>},
+ {<<"bear">>, <<"430419C1126B477686CDE843E88BA0F2C7DC5CDF0881C677500074F704339A99">>},
  {<<"cowboy">>, <<"F276D521A1FF88B2B9B4C54D0E753DA6C66DD7BE6C9FCA3D9418B561828A3731">>},
  {<<"cowlib">>, <<"DB8F7505D8332D98EF50A3EF34B34C1AFDDEC7506E4EE4DD4A3A266285D282CA">>},
- {<<"escalus">>, <<"EC83C277DECD721C3B219823C159D66CF94981A0796473617E4C0835E7395FE5">>},
- {<<"exml">>, <<"9581FE6512D9772C61BBE611CD4A8E5BB90B4D4481275325EC520F7A931A9393">>},
- {<<"fast_pbkdf2">>, <<"6045138C4C209FC8222A0B18B2CB1D7BD7407EF4ADAD0F14C5E0F7F4726E3E41">>},
- {<<"fast_scram">>, <<"70724F584A118DA147A51EE38DEE56203F217D58AD61E0BB2C2EF834C16B35B8">>},
- {<<"fast_tls">>, <<"65D7D547A09EEFB37A1C0D04D8601FAC4F3E6E2C1EDE859A7787081670F9648D">>},
+ {<<"docsh">>, <<"F893D5317A0E14269DD7FE79CF95FB6B9BA23513DA0480EC6E77C73221CAE4F2">>},
+ {<<"escalus">>, <<"EBD887FA44FB64484DB17AAC42D694E223DB932B54B47C6F8E24A0CFA67AFCD0">>},
+ {<<"exml">>, <<"54C1AAD5BD290EC31C19CE4A5D449C7E3236107AA2D3610FC04FC963DC8EAF13">>},
+ {<<"fast_pbkdf2">>, <<"199BCEC73A1A246941E9465D3DC41052953B638128841ED24B29ED03CF70AF27">>},
+ {<<"fast_scram">>, <<"BEEADB03D774640F0671681759CE53B2FF33CB58C86FD9BF2A793E2FC1ED0F5D">>},
  {<<"fusco">>, <<"3DD6A90151DFEF30EA1937CC44E9A59177C0094918388D9BCAA2F2DC5E2AE4AA">>},
+ {<<"getopt">>, <<"C73A9FA687B217F2FF79F68A3B637711BB1936E712B521D8CE466B29CBF7808A">>},
  {<<"gun">>, <<"B4E4CBBF3026D21981C447E9E7CA856766046EFF693720BA43114D7F5DE36E87">>},
- {<<"jesse">>, <<"C9E3670C7EE40F719734E3BC716578143AABA93FC7525A02A7D5CB300B3AD71E">>},
- {<<"meck">>, <<"85CCBAB053F1DB86C7CA240E9FC718170EE5BDA03810A6292B5306BF31BAE5F5">>},
- {<<"p1_utils">>, <<"67B0C4AC9FA3BA3EF563B31AA111B0A004439A37FAC85E027F1C3617E1C7EC6C">>},
- {<<"prometheus">>, <<"B95F8DE8530F541BD95951E18E355A840003672E5EDA4788C5FA6183406BA29A">>},
- {<<"prometheus_cowboy">>, <<"CFCE0BC7B668C5096639084FCD873826E6220EA714BF60A716F5BD080EF2A99C">>},
- {<<"prometheus_httpd">>, <<"F616ED9B85B536B195D94104063025A91F904A4CFC20255363F49A197D96C896">>},
- {<<"quantile_estimator">>, <<"EF50A361F11B5F26B5F16D0696E46A9E4661756492C981F7B2229EF42FF1CD15">>},
+ {<<"jesse">>, <<"CF7615C3F2BE892F77BCCF736F23B4BD54A0FC686C7040431AEBA5EF7932CC4D">>},
+ {<<"jsx">>, <<"D12516BAA0BB23A59BB35DCCAF02A1BD08243FCBB9EFE24F2D9D056CCFF71268">>},
+ {<<"meck">>, <<"24676CB6EE6951530093A93EDCD410CFE4CB59FE89444B875D35C9D3909A15D0">>},
+ {<<"parse_trans">>, <<"BB87AC362A03CA674EBB7D9D498F45C03256ADED7214C9101F7035EF44B798C7">>},
+ {<<"providers">>, <<"70B4197869514344A8A60E2B2A4EF41CA03DEF43CFB1712ECF076A0F3C62F083">>},
  {<<"quickrand">>, <<"D2BD76676A446E6A058D678444B7FDA1387B813710D1AF6D6E29BB92186C8820">>},
  {<<"ranch">>, <<"2261F9ED9574DCFCC444106B9F6DA155E6E540B2F82BA3D42B339B93673B72A3">>},
- {<<"telemetry">>, <<"FEDEBBAE410D715CF8E7062C96A1EF32EC22E764197F70CDA73D82778D61E7A2">>},
+ {<<"rfc3339">>, <<"2075653DC9407541C84B1E15F8BDA2ABE95FB17C9694025E079583F2D19C1060">>},
+ {<<"telemetry">>, <<"68FDFE8D8F05A8428483A97D7AAB2F268AAFF24B49E0F599FAA091F1D4E7F61C">>},
  {<<"uuid">>, <<"B2078D2CC814F53AFA52D36C91E08962C7E7373585C623F4C0EA6DFB04B2AF94">>},
- {<<"worker_pool">>, <<"BD98A0BE1D20057AE9967CBE73D263AEA5BE14BBE4C73CAFEB1378572FF14561">>}]},
+ {<<"worker_pool">>, <<"0347B805A8E5804B5676A9885FB3B9B6C1627099C449C3C67C0E8E6AF79E9AA6">>}]},
 {pkg_hash_ext,[
- {<<"accept">>, <<"11B18C220BCC2EAB63B5470C038EF10EB6783BCB1FCDB11AA4137DEFA5AC1BB8">>},
  {<<"amoc">>, <<"B8DD4F77BB94716ABC64E863158EEF8E1375CECB2F69E57DC4A293B0949D4985">>},
- {<<"base16">>, <<"06EA2D48343282E712160BA89F692B471DB8B36ABE8394F3445FF9032251D772">>},
  {<<"bbmustache">>, <<"688B33A4D5CC2D51F575ADF0B3683FC40A38314A2F150906EDCFC77F5B577B3B">>},
+ {<<"bear">>, <<"157B67901ADF84FF0DA6EAE035CA1292A0AC18AA55148154D8C582B2C68959DB">>},
  {<<"cowboy">>, <<"8A7ABE6D183372CEB21CAA2709BEC928AB2B72E18A3911AA1771639BEF82651E">>},
  {<<"cowlib">>, <<"E1E1284DC3FC030A64B1AD0D8382AE7E99DA46C3246B815318A4B848873800A4">>},
- {<<"escalus">>, <<"3CA9D58F39A3FBD618A1E7B5D57AE97B76016330BB2374C430AA9278669243CC">>},
- {<<"exml">>, <<"D8E7894E2544402B4986EEB2443C15B51B14F686266F091DBF2777D1D99A2FA2">>},
- {<<"fast_pbkdf2">>, <<"BC3B5A3CAB47AD114FF8BB815FEDE62A6187ACD14D8B37412F2AF8236A089CEF">>},
- {<<"fast_scram">>, <<"771D034341599CFC6A6C5E56CF924B68D2C7478088CAF17419E3147B66914667">>},
- {<<"fast_tls">>, <<"131542913937025E48CD80AA81F00359686D5501B75621E72026A87B5229505B">>},
+ {<<"docsh">>, <<"4E7DB461BB07540D2BC3D366B8513F0197712D0495BB85744F367D3815076134">>},
+ {<<"escalus">>, <<"370F55B3104DAD8FC2756BA7EB86BCA98684DFF712155E624EA6F00B829C58C3">>},
+ {<<"exml">>, <<"08CC97527C708D57A03F467049AC260B5951BD67906AA154BE56B5D8BDD3238C">>},
+ {<<"fast_pbkdf2">>, <<"35EEC22629AAA739915843C7B7DE0D84657D1ECE972D8BBC86368747E9C14012">>},
+ {<<"fast_scram">>, <<"FE0650A309FDF97C75E1EA812CCFB40EB464ECAFD3783E83AA17C7F572EDAB0B">>},
  {<<"fusco">>, <<"6343551BD1E824F2A6CA85E1158C5B37C320FD449FBFEC7450A73F192AAF9022">>},
+ {<<"getopt">>, <<"53E1AB83B9CEB65C9672D3E7A35B8092E9BDC9B3EE80721471A161C10C59959C">>},
  {<<"gun">>, <<"52FC7FC246BFC3B00E01AEA1C2854C70A366348574AB50C57DFE796D24A0101D">>},
- {<<"jesse">>, <<"0EDED3F18623FDA2F25989804A06CF518B4ACF2E9365B18C8E8C013D7E3C906F">>},
- {<<"meck">>, <<"81344F561357DC40A8344AFA53767C32669153355B626EA9FCBC8DA6B3045826">>},
- {<<"p1_utils">>, <<"D0379E8C1156B98BD64F8129C1DE022FCCA4F2FDB7486CE73BF0ED2C3376B04C">>},
- {<<"prometheus">>, <<"719862351AABF4DF7079B05DC085D2BBCBE3AC0AC3009E956671B1D5AB88247D">>},
- {<<"prometheus_cowboy">>, <<"BA286BECA9302618418892D37BCD5DC669A6CC001F4EB6D6AF85FF81F3F4F34C">>},
- {<<"prometheus_httpd">>, <<"0BBE831452CFDF9588538EB2F570B26F30C348ADAE5E95A7D87F35A5910BCF92">>},
- {<<"quantile_estimator">>, <<"282A8A323CA2A845C9E6F787D166348F776C1D4A41EDE63046D72D422E3DA946">>},
+ {<<"jesse">>, <<"860EF4621DDBFB72792668929BE127E45E8B07CF19EEA264B0A9D48D36CCA41B">>},
+ {<<"jsx">>, <<"0C5CC8FDC11B53CC25CF65AC6705AD39E54ECC56D1C22E4ADB8F5A53FB9427F3">>},
+ {<<"meck">>, <<"680A9BCFE52764350BEB9FB0335FB75FEE8E7329821416CEE0A19FEC35433882">>},
+ {<<"parse_trans">>, <<"F99E368830BEA44552224E37E04943A54874F08B8590485DE8D13832B63A2DC3">>},
+ {<<"providers">>, <<"E45745ADE9C476A9A469EA0840E418AB19360DC44F01A233304E118A44486BA0">>},
  {<<"quickrand">>, <<"B8ACBF89A224BC217C3070CA8BEBC6EB236DBE7F9767993B274084EA044D35F0">>},
  {<<"ranch">>, <<"244EE3FA2A6175270D8E1FC59024FD9DBC76294A321057DE8F803B1479E76916">>},
- {<<"telemetry">>, <<"7015FC8919DBE63764F4B4B87A95B7C0996BD539E0D499BE6EC9D7F3875B79E6">>},
+ {<<"rfc3339">>, <<"182314DE35C9F4180B22EB5F22916D8D7A799C1109A060C752970273A9332AD6">>},
+ {<<"telemetry">>, <<"DAD9CE9D8EFFC621708F99EAC538EF1CBE05D6A874DD741DE2E689C47FEAFED5">>},
  {<<"uuid">>, <<"4E4C5CA3461DC47C5E157ED42AA3981A053B7A186792AF972A27B14A9489324E">>},
- {<<"worker_pool">>, <<"64E560DE08CA5E7DB8BD4CDCC7B744B0659696194E3BC9E56239BA4A0F7E24F9">>}]}
+ {<<"worker_pool">>, <<"59946FBCE1D331CDEB153EDD36A823DC1AAB4C2482662582B983C9C90EBC3461">>}]}
 ].

src/helpers/amoc_xmpp_handlers.erl

@@ -165,5 +165,5 @@ measure_sent_messages() ->
 
 -spec ttd(exml_stream:element(), escalus_connection:metadata()) -> integer().
 ttd(#xmlel{attrs = Attrs}, #{recv_timestamp := RecvTimestamp}) ->
-    {_, SentBin} = lists:keyfind(<<"timestamp">>, 1, Attrs),
+    SentBin = maps:get(<<"timestamp">>, Attrs),
     RecvTimestamp - binary_to_integer(SentBin).

src/helpers/amoc_xmpp_inbox.erl

@@ -26,7 +26,7 @@ init() ->
 lookup(Client) ->
     Req = escalus_stanza:iq(<<"set">>,
                             [#xmlel{name = <<"inbox">>,
-                                    attrs = [{<<"xmlns">>, ns(inbox)}],
+                                    attrs = #{<<"xmlns">> => ns(inbox)},
                                     children = [rsm_max()]}]),
     Pred = fun(Stanza) -> escalus_pred:is_iq_result(Req, Stanza) end,
     Metric = inbox_lookup_response_time,
@@ -37,7 +37,7 @@ lookup(Client) ->
 rsm_max() ->
     Max = cfg(max_items_per_inbox_lookup),
     #xmlel{name = <<"set">>,
-           attrs = [{<<"xmlns">>, ns(rsm)}],
+           attrs = #{<<"xmlns">> => ns(rsm)},
            children = [#xmlel{name = <<"max">>,
                               children = [#xmlcdata{content = integer_to_binary(Max)}]}
                       ]}.

src/helpers/amoc_xmpp_mam.erl

@@ -41,13 +41,13 @@ lookup(Client, Opts) ->
 mam_request(Opts) ->
     Max = cfg(max_items_per_lookup),
     SetChild = #xmlel{name = <<"set">>,
-                      attrs = [{<<"xmlns">>, <<"http://jabber.org/protocol/rsm">>}],
+                      attrs = #{<<"xmlns">> => <<"http://jabber.org/protocol/rsm">>},
                       children = [#xmlel{name = <<"max">>,
                                          children = [#xmlcdata{content = integer_to_binary(Max)}]}
                                  | after_elements(Opts)]},
     Req = escalus_stanza:iq(<<"set">>,
                             [#xmlel{name = <<"query">>,
-                                    attrs = [{<<"xmlns">>,  <<"urn:xmpp:mam:2">>}],
+                                    attrs = #{<<"xmlns">> => <<"urn:xmpp:mam:2">>},
                                     children = [SetChild]}]),
     case Opts of
         #{jid := Jid} -> escalus_stanza:to(Req, Jid);

src/helpers/amoc_xmpp_muc.erl

@@ -51,7 +51,7 @@ stanza_create_room(RoomName, RoomJid, MemberJids) ->
 
 user_element(Jid, Aff) ->
     #xmlel{name = <<"user">>,
-           attrs = [{<<"affiliation">>, Aff}],
+           attrs = #{<<"affiliation">> => Aff},
            children = [#xmlcdata{content = Jid}]}.
 
 kv_el(K, V) ->

src/scenarios/gdpr_removal.erl

@@ -490,10 +490,10 @@ send_presence_with_caps(Client) ->
 
 caps() ->
     #xmlel{name = <<"c">>,
-        attrs = [{<<"xmlns">>, <<"http://jabber.org/protocol/caps">>},
-            {<<"hash">>, <<"sha-1">>},
-            {<<"node">>, <<"http://www.chatopus.com">>},
-            {<<"ver">>, ?CAPS_HASH}]}.
+        attrs = #{<<"xmlns">> => <<"http://jabber.org/protocol/caps">>,
+                  <<"hash">> => <<"sha-1">>,
+                  <<"node">> => <<"http://www.chatopus.com">>,
+                  <<"ver">> => ?CAPS_HASH}}.
 
 %%------------------------------------------------------------------------------------------------
 %% Room creation
@@ -516,7 +516,7 @@ add_users_to_room(Client, Jids) ->
     Id = iq_id(affiliation, Client),
     RoomJid = erlang:get(my_room),
     AffList = [#xmlel{name = <<"user">>,
-        attrs = [{<<"affiliation">>, <<"member">>}],
+        attrs = #{<<"affiliation">> => <<"member">>},
         children = [#xmlcdata{content = Jid}]} || Jid <- Jids],
     AffChangeStanza = escalus_stanza:iq_set(?NS_MUC_LIGHT_AFFILIATIONS, AffList),
     AffChangeStanzaWithId = escalus_stanza:set_id(AffChangeStanza, Id),
@@ -534,8 +534,8 @@ send_message_to_room(Client, RoomJid) ->
     PayloadSize = amoc_config:get(publication_size),
     MessageBody = item_content(PayloadSize),
     Message = #xmlel{name = <<"message">>,
-        attrs = [{<<"to">>, RoomJid},
-            {<<"type">>, <<"groupchat">>}],
+        attrs = #{<<"to">> => RoomJid,
+                  <<"type">> => <<"groupchat">>},
         children = [MessageBody]},
     escalus:send(Client, Message).
 
@@ -559,8 +559,8 @@ item_content(PayloadSize) ->
     Payload = #xmlcdata{content = <<<<"A">> || _ <- lists:seq(1, PayloadSize)>>},
     #xmlel{
         name = <<"entry">>,
-        attrs = [{<<"timestamp">>, integer_to_binary(os:system_time(microsecond))},
-            {<<"jid">>, erlang:get(jid)}],
+        attrs = #{<<"timestamp">> => integer_to_binary(os:system_time(microsecond)),
+                  <<"jid">> => erlang:get(jid)},
         children = [Payload]}.
 
 %%------------------------------------------------------------------------------------------------
@@ -596,7 +596,7 @@ process_muc_light_message(Stanza, RecvTimeStamp) ->
     case exml_query:subelement(Stanza, <<"x">>) of
         undefined ->
             handle_normal_muc_light_message(Stanza, RecvTimeStamp);
-        #xmlel{name = <<"x">>, attrs = [{<<"xmlns">>, ?NS_MUC_LIGHT_AFFILIATIONS}], children = _} ->
+        #xmlel{name = <<"x">>, attrs = #{<<"xmlns">> := ?NS_MUC_LIGHT_AFFILIATIONS}, children = _} ->
             handle_muc_light_affiliation_message(Stanza);
         _ -> ?LOG_ERROR("Unknown message.")
     end.
@@ -743,15 +743,15 @@ handle_disco_query(Client, DiscoRequest) ->
 feature_elems() ->
     NodeNs = ?PEP_NODE_NS,
     [#xmlel{name = <<"identity">>,
-        attrs = [{<<"category">>, <<"client">>},
-            {<<"name">>, <<"Psi">>},
-            {<<"type">>, <<"pc">>}]},
+        attrs = #{<<"category">> => <<"client">>,
+                  <<"name">> => <<"Psi">>,
+                  <<"type">> => <<"pc">>}},
         #xmlel{name = <<"feature">>,
-            attrs = [{<<"var">>, <<"http://jabber.org/protocol/disco#info">>}]},
+            attrs = #{<<"var">> => <<"http://jabber.org/protocol/disco#info">>}},
         #xmlel{name = <<"feature">>,
-            attrs = [{<<"var">>, NodeNs}]},
+            attrs = #{<<"var">> => NodeNs}},
         #xmlel{name = <<"feature">>,
-            attrs = [{<<"var">>, <<NodeNs/bitstring, "+notify">>}]}].
+            attrs = #{<<"var">> => <<NodeNs/bitstring, "+notify">>}}].
 
 %%------------------------------------------------------------------------------------------------
 %% Stanza helpers

src/scenarios/mongoose_mam.erl

@@ -310,18 +310,18 @@ mam_lookup_after_date_xml(Timestamp) ->
     QueryFields =
       [
        field_xml(
-         [{<<"var">>, <<"FORM_TYPE">>},
-          {<<"type">>, <<"hidden">>}],
+         #{<<"var">> => <<"FORM_TYPE">>,
+           <<"type">> => <<"hidden">>},
          [MamVsnValueEl]),
        field_xml(
-         [{<<"var">>, <<"start">>}],
+         #{<<"var">> => <<"start">>},
          [TimeValueEl])
       ],
     #xmlel{name = <<"x">>,
-           attrs = [
-                    {<<"xmlns">>, <<"jabber:x:data">>},
-                    {<<"type">>, <<"submit">>}
-                   ],
+           attrs = #{
+                        <<"xmlns">> => <<"jabber:x:data">>,
+                        <<"type">> => <<"submit">>
+                    },
            children = QueryFields
           }.
 

src/scenarios/mongoose_muc_light.erl

@@ -166,7 +166,7 @@ stanza_create_room(RoomId, MemberJids) ->
 
 user_element(Jid, Aff) ->
     #xmlel{name = <<"user">>,
-           attrs = [{<<"affiliation">>, Aff}],
+           attrs = #{<<"affiliation">> => Aff},
            children = [#xmlcdata{content = Jid}]}.
 
 kv_el(K, V) ->

src/scenarios/mongoose_pubsub_docker.erl

@@ -111,7 +111,7 @@ publish(Client, ItemId, Node) ->
 
 item_content() ->
     #xmlel{name = <<"entry">>,
-           attrs = [{<<"xmlns">>, <<"http://www.w3.org/2005/Atom">>}]}.
+           attrs = #{<<"xmlns">> => <<"http://www.w3.org/2005/Atom">>}}.
 
 %% item_ids() ->
 %%     [integer_to_binary(I) || I <- lists:seq(1, ?MESSAGES_PER_PUBLISHER)].