From 96d63dca845e18f86488db9d8dfb33eb76ad0467 Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Tue, 4 Aug 2015 23:46:29 +0200
Subject: Simplify time manipulation

By doing away with more wrapping that the parent commit started to
remove.
---
 lib/diameter/test/diameter_traffic_SUITE.erl | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'lib/diameter/test/diameter_traffic_SUITE.erl')

diff --git a/lib/diameter/test/diameter_traffic_SUITE.erl b/lib/diameter/test/diameter_traffic_SUITE.erl
index 17faf30a9b..4669fb6720 100644
--- a/lib/diameter/test/diameter_traffic_SUITE.erl
+++ b/lib/diameter/test/diameter_traffic_SUITE.erl
@@ -874,7 +874,7 @@ call(Config, Req, Opts) ->
     diameter:call(CN,
                   dict(Req, Dict0),
                   msg(Req, ReqEncoding, Dict0),
-                  [{extra, [{Name, Group}, diameter_lib:now()]} | Opts]).
+                  [{extra, [{Name, Group}, now()]} | Opts]).
 
 origin({A,C}) ->
     2*codec(A) + container(C);
@@ -1200,10 +1200,8 @@ app(Req, _, Dict0) ->
 %% handle_error/6
 
 handle_error(timeout = Reason, _Req, [$C|_], _Peer, _, Time) ->
-    Now = diameter_lib:now(),
-    {Reason, {diameter_lib:timestamp(Time),
-              diameter_lib:timestamp(Now),
-              diameter_lib:micro_diff(Now, Time)}};
+    Now = now(),
+    {Reason, {Time, Now, timer:now_diff(Now, Time)}};
 
 handle_error(Reason, _Req, [$C|_], _Peer, _, _Time) ->
     {error, Reason}.
-- 
cgit v1.2.3