commit 1402fa153d279f2a64673db5b96845b20af72d11
author Ernest McCracken <emccrckn@memphis.edu> Sun Jun 09 00:36:28 2019 -0700
committer Davide Pesavento <davidepesa@gmail.com> Tue Aug 13 13:15:50 2019 -0400
tree 195434246cf4eb05f4254f0ccaeb19f943236cfd
parent 6be9387a4fa0086e9c79c3be3155db038031ddce

fw: Use ndn-cxx's RttEstimator in AsfStrategy

Refs: #4887
Change-Id: Ice718be99f2b96f183bb35c5df84930be54a9f8e

tests/daemon/fw/asf-measurements.t.cpp

diff --git a/tests/daemon/fw/asf-measurements.t.cpp b/tests/daemon/fw/asf-measurements.t.cpp
index a6d8c02..1590e7c 100644
--- a/tests/daemon/fw/asf-measurements.t.cpp
+++ b/tests/daemon/fw/asf-measurements.t.cpp
@@ -50,7 +50,7 @@
   BOOST_CHECK_EQUAL(stats.getSrtt(), RttStats::RTT_NO_MEASUREMENT);
 
   // Receive Data back in 50ms
-  RttEstimator::Duration rtt(50_ms);
+  time::nanoseconds rtt(50_ms);
   stats.addRttMeasurement(rtt);
 
   BOOST_CHECK_EQUAL(stats.getRtt(), rtt);
@@ -63,7 +63,7 @@
   BOOST_CHECK_EQUAL(stats.getSrtt(), rtt);
 
   // Receive Data back with a higher RTT
-  RttEstimator::Duration higherRtt(100_ms);
+  time::nanoseconds higherRtt(100_ms);
   stats.addRttMeasurement(higherRtt);
 
   BOOST_CHECK_EQUAL(stats.getRtt(), higherRtt);
@@ -71,7 +71,7 @@
   BOOST_CHECK_LT(stats.getSrtt(), higherRtt);
 
   // Simulate timeout
-  RttStats::Rtt previousSrtt = stats.getSrtt();
+  auto previousSrtt = stats.getSrtt();
 
   stats.recordTimeout();
 
@@ -104,8 +104,8 @@
 
   pitEntry->insertOrUpdateOutRecord(*face, 0, *interest);
 
-  RttEstimator::Duration rtt(50);
-  this->advanceClocks(5_ms, rtt);
+  time::nanoseconds rtt(5_ms);
+  this->advanceClocks(5_ms);
 
   info.recordRtt(pitEntry, *face);
   info.cancelTimeoutEvent(interestName);