Merge pull request #37 from JoyStream/development

v0.3.2

Author: mnaamani

conan_package/base.py

@@ -3,7 +3,7 @@
 
 class ProtocolSessionBase(ConanFile):
     name = "ProtocolSession"
-    version = "0.3.1"
+    version = "0.3.2"
     license = "(c) JoyStream Inc. 2016-2017"
     url = "https://github.com/JoyStream/protocol_session-cpp.git"
     repo_ssh_url = "git@github.com:JoyStream/protocol_session-cpp.git"

sources/include/protocol_session/Status.hpp

@@ -31,7 +31,7 @@ namespace status {
                        const protocol_statemachine::AnnouncedModeAndTerms & announcedModeAndTermsFromPeer,
                        const paymentchannel::Payor & payor,
                        const paymentchannel::Payee & payee,
-                       const int32_t latency)
+                       const boost::optional<std::chrono::milliseconds> latency)
             : innerStateTypeIndex(innerStateTypeIndex)
             , announcedModeAndTermsFromPeer(announcedModeAndTermsFromPeer)
             , payor(payor)
@@ -56,8 +56,8 @@ namespace status {
         // Payee side of payment channel interaction
         paymentchannel::Payee payee;
 
-        // Number of ticks from underlying clock used to measure how long it took to send test payload
-        int32_t latency;
+        // Time it took to successfully deliver test payload
+        boost::optional<std::chrono::milliseconds> latency;
 
     };
 

sources/include/protocol_session/detail/Connection.cpp

@@ -155,12 +155,11 @@ namespace detail {
     }
 
     template <class ConnectionIdType>
-    int32_t Connection<ConnectionIdType>::timeToDeliverTestPayload() const {
-      if (!hasCompletedSpeedTest()) return -1;
+    boost::optional<std::chrono::milliseconds>
+    Connection<ConnectionIdType>::timeToDeliverTestPayload() const {
+      if (!hasCompletedSpeedTest()) return boost::none;
 
-      auto deliveryTime = (*_completedSpeedTestAt - *_startedSpeedTestAt);
-
-      return deliveryTime.count();
+      return std::chrono::duration_cast<std::chrono::milliseconds>(*_completedSpeedTestAt - *_startedSpeedTestAt);
     }
 
     template <class ConnectionIdType>

sources/include/protocol_session/detail/Connection.hpp

@@ -92,7 +92,7 @@ namespace detail {
         bool hasStartedSpeedTest() const;
         bool hasCompletedSpeedTest() const;
         bool speedTestCompletedInLessThan(std::chrono::seconds);
-        int32_t timeToDeliverTestPayload() const;
+        boost::optional<std::chrono::milliseconds> timeToDeliverTestPayload() const;
         void abandonSpeedTest();
 
     private:

sources/test/test_main.cpp

@@ -714,9 +714,11 @@ TEST_F(SessionTest, seller_slow_to_respond_to_test_payload)
 
   SellerPeer first(0, protocol_wire::SellerTerms(22, 134, 10, 88, 32),5634, session->network());
   SellerPeer second(1, protocol_wire::SellerTerms(22, 134, 10, 88, 32),5634, session->network());
+  SellerPeer third(2, protocol_wire::SellerTerms(22, 134, 10, 88, 32),5634, session->network());
 
   assert(buyerTerms.satisfiedBy(first.terms));
   assert(buyerTerms.satisfiedBy(second.terms));
+  assert(buyerTerms.satisfiedBy(third.terms));
 
   toBuyMode(buyerTerms, TorrentPieceInformation());
 
@@ -729,6 +731,9 @@ TEST_F(SessionTest, seller_slow_to_respond_to_test_payload)
   // seller responds in time
   timePassed+= std::chrono::seconds(5);
   respondToSpeedTestRequest(first, expectedPayloadSize);
+  auto pFirstConnectionStatus = session->connectionStatus(first.id);
+  auto latencyFirst = *pFirstConnectionStatus.machine.latency;
+  EXPECT_EQ(latencyFirst.count(), 5 * 1000);
 
   assertSellerInvited(first);
 
@@ -741,6 +746,15 @@ TEST_F(SessionTest, seller_slow_to_respond_to_test_payload)
   // The seller should have been removed for being slow
   assertConnectionRemoved(second.id, DisconnectCause::seller_failed_speed_test);
 
+  spy->reset();
+
+  // Peer doesn't respond to speed test payload
+  add(third);
+
+  auto pThirdConnectionStatus = session->connectionStatus(third.id);
+
+  EXPECT_EQ(pThirdConnectionStatus.machine.latency, boost::none);
+
   cleanup();
 }