From aaff2cb270d6cf13ff3cd074b3f8c212211ccb7f Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Thu, 11 Oct 2012 01:40:35 +0200
Subject: Use peer_ref() service_info in traffic suite

---
 lib/diameter/test/diameter_traffic_SUITE.erl | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

(limited to 'lib')

diff --git a/lib/diameter/test/diameter_traffic_SUITE.erl b/lib/diameter/test/diameter_traffic_SUITE.erl
index c391ba0317..5744ff0307 100644
--- a/lib/diameter/test/diameter_traffic_SUITE.erl
+++ b/lib/diameter/test/diameter_traffic_SUITE.erl
@@ -626,22 +626,13 @@ pick_peer(Peers, _, ?CLIENT, _State, send_detach, Id, {_,_}) ->
     find(Id, Peers).
 
 find(Id, Peers) ->
-    [P] = lists:flatmap(fun(C) -> peer(Id, C) end,
-                        diameter:service_info(?CLIENT, transport)),
-    case lists:keyfind(P, 1, Peers) of %% OTP-10470 will provide a better way.
-        {_,_} = TC ->
-            {ok, TC};
-        false = No ->
-            No
-    end.
+    [P] = [P || P <- Peers, id(Id, P)],
+    {ok, P}.
 
-peer(Id, [{ref, _},
-          {type, connect},
-          {options, Opts},
-          {watchdog, _},
-          {peer, {PeerRef, _}}
-          | _]) ->
-    [PeerRef || lists:member({id, Id}, Opts)].
+id(Id, {Pid, _Caps}) ->
+    [{ref, _}, {type, _}, {options, Opts} | _]
+        = diameter:service_info(?CLIENT, Pid),
+    lists:member({id, Id}, Opts).
 
 %% prepare_request/5-6
 
-- 
cgit v1.2.3