commit ba56066683b6c8235cc25ae3686d3fbe93a7ef15
author Davide Pesavento <davidepesa@gmail.com> Wed Jun 26 22:45:44 2019 -0400
committer Davide Pesavento <davidepesa@gmail.com> Wed Jun 26 22:48:14 2019 -0400
tree d51e9a58d29b060169a69c76b681f3b7f531f2dd
parent 0353bae5f67dbce73198edda4453feb98a95483b

catchunks: adapt to recent RttEstimator API changes

Refs: #4887
Change-Id: Ie39a1c5f7ad8b225397f41bb0f3c4d7c2a9cdb2a

tests/chunks/pipeline-interests-aimd.t.cpp

diff --git a/tests/chunks/pipeline-interests-aimd.t.cpp b/tests/chunks/pipeline-interests-aimd.t.cpp
index c990654..0f18f70 100644
--- a/tests/chunks/pipeline-interests-aimd.t.cpp
+++ b/tests/chunks/pipeline-interests-aimd.t.cpp
@@ -78,8 +78,10 @@
     rttOptions.alpha = 0.125;
     rttOptions.beta = 0.25;
     rttOptions.k = 4;
-    rttOptions.minRto = RttEstimator::MillisecondsDouble(200);
-    rttOptions.maxRto = RttEstimator::MillisecondsDouble(4000);
+    rttOptions.initialRto = 1_s;
+    rttOptions.minRto = 200_ms;
+    rttOptions.maxRto = 4_s;
+    rttOptions.rtoBackoffMultiplier = 2;
     return rttOptions;
   }
 
@@ -87,7 +89,7 @@
   PipelineInterestsAdaptive::Options opt;
   RttEstimator rttEstimator;
   PipelineInterestsAdaptive* pipeline;
-  static constexpr double MARGIN = 0.01;
+  static constexpr double MARGIN = 0.001;
 };
 
 constexpr double PipelineInterestAimdFixture::MARGIN;

tests/chunks/pipeline-interests-cubic.t.cpp

diff --git a/tests/chunks/pipeline-interests-cubic.t.cpp b/tests/chunks/pipeline-interests-cubic.t.cpp
index fa3aac8..03e3f9d 100644
--- a/tests/chunks/pipeline-interests-cubic.t.cpp
+++ b/tests/chunks/pipeline-interests-cubic.t.cpp
@@ -80,8 +80,10 @@
     rttOptions.alpha = 0.125;
     rttOptions.beta = 0.25;
     rttOptions.k = 8;
-    rttOptions.minRto = RttEstimator::MillisecondsDouble(200);
-    rttOptions.maxRto = RttEstimator::MillisecondsDouble(4000);
+    rttOptions.initialRto = 1_s;
+    rttOptions.minRto = 200_ms;
+    rttOptions.maxRto = 4_s;
+    rttOptions.rtoBackoffMultiplier = 2;
     return rttOptions;
   }
 
@@ -89,7 +91,7 @@
   PipelineInterestsCubic::Options opt;
   RttEstimator rttEstimator;
   PipelineInterestsCubic* pipeline;
-  static constexpr double MARGIN = 0.01;
+  static constexpr double MARGIN = 0.001;
 };
 
 constexpr double PipelineInterestCubicFixture::MARGIN;