Tweak map-valued decode

Use the same [MsgName | Avps] representation as for the list decode, but
with Avps a map instead of a AVP name/values list. As a result, don't
set the message/AVP name on an additional key in the map, which felt a
bit odd. Messages are [MsgName :: atom() | map()], Grouped AVPs are just
map().

Fix at least one problem in the traffic suite along the way: with
decode_format false, the own decode in to_map/2 didn't know whether or
not to decode strings, resulting on some failures.

1 files changed, 6 insertions, 7 deletions

diff --git a/lib/diameter/src/base/diameter_gen.erl b/lib/diameter/src/base/diameter_gen.erl
index 78d8bd2fa3..597ec143a8 100644
--- a/lib/diameter/src/base/diameter_gen.erl
+++ b/lib/diameter/src/base/diameter_gen.erl
@@ -186,7 +186,7 @@ decode_avps(Name, Recs, #{module := Mod, decode_format := Fmt} = Opts) ->
     %% AM counts the number of top-level AVPs, which missing/4 then
     %% uses when adding 5005 errors.
     Arities = Mod:avp_arity(Name),
-    {reformat(Rec, Arities, Mod, Fmt),
+    {reformat(Name, Rec, Arities, Mod, Fmt),
      Avps,
      Failed ++ missing(Arities, Opts, Mod, AM)}.
 
@@ -752,8 +752,8 @@ newrec(_, _, false = No) ->
 newrec(Mod, Name, record) ->
     newrec(Mod, Name);
 
-newrec(_, Name, _) ->
-    #{':name' => Name}.
+newrec(_, _, _) ->
+    #{}.
 
 %% newrec/2
 
@@ -762,15 +762,14 @@ newrec(Mod, Name) ->
 
 %% reformat/4
 
-reformat(Map, Arities, _Mod, list) ->
+reformat(_, Map, Arities, _Mod, list) ->
     [{F,V} || {F,_} <- Arities, #{F := V} <- [Map]];
 
-reformat(Map, Arities, Mod, record_from_map) ->
-    #{':name' := Name} = Map,
+reformat(Name, Map, Arities, Mod, record_from_map) ->
     RecName = Mod:name2rec(Name),
     list_to_tuple([RecName | [maps:get(F, Map, def(A)) || {F,A} <- Arities]]);
 
-reformat(Rec, _, _, _) ->
+reformat(_, Rec, _, _, _) ->
     Rec.
 
 %% def/1