Apply feedback from @ansd

Author: MarcialRosales

deps/amqp10_client/src/amqp10_client.erl

@@ -19,7 +19,7 @@
          end_session/1,
          attach_sender_link/3,
          attach_sender_link/4,
-         attach_sender_link/5,        
+         attach_sender_link/5,
          attach_sender_link_sync/3,
          attach_sender_link_sync/4,
          attach_sender_link_sync/5,
@@ -164,10 +164,10 @@ end_session(Pid) ->
 %% @doc Synchronously attach a link on 'Session'.
 %% This is a convenience function that awaits attached event
 %% for the link before returning.
-attach_sender_link_sync(Session, Name, Target) ->
-    attach_sender_link_sync(Session, Name, Target, mixed).
 -spec attach_sender_link_sync(pid(), binary(), binary()) ->
     {ok, link_ref()} | link_timeout.
+attach_sender_link_sync(Session, Name, Target) ->
+    attach_sender_link_sync(Session, Name, Target, mixed).
 
 %% @doc Synchronously attach a link on 'Session'.
 %% This is a convenience function that awaits attached event

deps/amqp10_client/src/amqp10_client_session.erl

@@ -73,7 +73,7 @@
 -type rcv_settle_mode() :: first | second.
 
 -type terminus_durability() :: none | configuration | unsettled_state.
--type terminus_capabilities() :: none | binary() | list().
+-type terminus_capabilities() :: binary() | [binary(),...].
 
 -type target_def() :: #{address => link_address(),
                         durable => terminus_durability(),
@@ -112,7 +112,6 @@
 -export_type([snd_settle_mode/0,
               rcv_settle_mode/0,
               terminus_durability/0,
-              terminus_capabilities/0,
               attach_args/0,
               attach_role/0,
               target_def/0,
@@ -779,18 +778,16 @@ filter_value_type({T, _} = V) when is_atom(T) ->
     %% looks like an already tagged type, just pass it through
     V.
 
-translate_terminus_capabilities(none) ->
-    undefined;
 translate_terminus_capabilities(Capabilities) when is_binary(Capabilities) ->
     {symbol, Capabilities};
 translate_terminus_capabilities(CapabilitiesList) when is_list(CapabilitiesList) ->
     {array, symbol, [filter_capability(V) || V <- CapabilitiesList]}.
 
 filter_capability(V) when is_binary(V) ->
     {symbol, V};
-filter_capability({T, _} = V) when is_atom(T) ->
-    %% looks like an already tagged type, just pass it through
-    V.
+filter_capability(_) ->
+    %% Any other type is ignored
+    {}.
 
 % https://people.apache.org/~rgodfrey/amqp-1.0/apache-filters.html
 translate_legacy_amqp_headers_binding(LegacyHeaders) ->

deps/amqp10_client/test/system_SUITE.erl

@@ -209,7 +209,6 @@ open_close_connection(Config) ->
         {amqp10_event, {connection, Connection2, opened}} -> ct:log("connection opened"), ok
     after 5000 -> exit(connection_timeout)
     end,
-    ct:log("Closing connection ..."),
     ok = amqp10_client:close_connection(Connection2),
     ct:log("Closed connection .").
 
@@ -277,7 +276,7 @@ open_connection_plain_sasl_failure(Config) ->
     ok = amqp10_client:close_connection(Connection).
 
 basic_roundtrip(Config) ->
-    application:start(sasl),
+    application:start(sasl),    
     Hostname = ?config(rmq_hostname, Config),
     Port = rabbit_ct_broker_helpers:get_node_config(Config, 0, tcp_port_amqp),
     OpenConf = #{address => Hostname, port => Port, sasl => ?config(sasl, Config)},
@@ -389,7 +388,6 @@ roundtrip(OpenConf, Args) ->
                    properties => #{}
                    },
     {ok, Sender} = amqp10_client:attach_link(Session, SenderAttachArgs),
-    %%await_link(Sender, credited, link_credit_timeout),
     await_link(Sender, attached, attached_timeout),
 
     Now = os:system_time(millisecond),
@@ -427,7 +425,8 @@ roundtrip(OpenConf, Args) ->
 
     % ct:pal(?LOW_IMPORTANCE, "roundtrip message Out: ~tp~nIn: ~tp~n", [OutMsg, Msg]),
     ActualProps = amqp10_msg:properties(OutMsg),
-    [ ?assertEqual(V, maps:get(K, ActualProps)) || K := V <- Props, K =/= creation_time],
+    % [ ?assertEqual(V, maps:get(K, ActualProps)) || K := V <- Props, K =/= creation_time],
+    [ ?assertEqual(V, maps:get(K, ActualProps)) || K := V <- Props],
 
     ?assertEqual(#{<<"a_key">> => <<"a_value">>}, amqp10_msg:application_properties(OutMsg)),
     ActualMessageAnnotations = amqp10_msg:message_annotations(OutMsg),
@@ -437,17 +436,14 @@ roundtrip(OpenConf, Args) ->
     ok.
 
 filtered_roundtrip(OpenConf) ->
-    filtered_roundtrip(OpenConf, []).
-
-filtered_roundtrip(OpenConf, Args) ->
-    Body = proplists:get_value(body, Args, <<"banana">>),
-    Destination = proplists:get_value(destination, Args, <<"test1">>),
+    filtered_roundtrip(OpenConf, <<"test1">>).
 
+filtered_roundtrip(OpenConf, Body) ->
     {ok, Connection} = amqp10_client:open_connection(OpenConf),
     {ok, Session} = amqp10_client:begin_session(Connection),
     {ok, Sender} = amqp10_client:attach_sender_link(Session,
                                                     <<"default-sender">>,
-                                                    Destination,
+                                                    <<"test1">>,
                                                     settled,
                                                     unsettled_state),
     await_link(Sender, credited, link_credit_timeout),