Merge pull request #14 from JoyStream/development

dev to master - v0.1.2

Author: mnaamani

conan_package/base.py

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

sources/include/protocol_session/detail/Buying.cpp

@@ -350,7 +350,7 @@ namespace detail {
 
                         // Check if seller has timed out in servicing the current request,
                         // if so remove connection
-                        if(s.servicingPieceHasTimedOut(std::chrono::seconds(5))) // <== hard coded for now, logic will be factored out later! see PR on this
+                        if(s.servicingPieceHasTimedOut(std::chrono::seconds(20))) // <== hard coded for now, logic will be factored out later! see PR on this
                             removeConnection(id, DisconnectCause::seller_servicing_piece_has_timed_out);
                     }
                 }

sources/test/SessionTest.cpp

@@ -527,7 +527,7 @@ void SessionTest::takeSingleSellerToExchange(SellerPeer & peer) {
     PeerToStartDownloadInformationMap<ID> map = downloadInformationMap(v);
 
     // Start download
-    session->startDownloading(contractTx, map);
+    session->startDownloading(contractTx, map, nextPiecePicker);
 
     // make sure contract was announced to only relevant peers
     peer.contractAnnounced();
@@ -549,3 +549,12 @@ void SessionTest::assertSellerInvited(const SellerPeer & peer) {
     EXPECT_EQ(m2.index(), peer.sellerTermsIndex);
 
 }
+
+
+int SessionTest::nextPiecePicker(const std::vector<detail::Piece<ID>>* pieces) {
+  for(uint32_t i = 0;i < pieces->size();i++)
+    if(pieces->at(i).state() == PieceState::unassigned)
+      return i;
+
+  throw exception::NoPieceAvailableException();
+}

sources/test/SessionTest.hpp

@@ -159,7 +159,7 @@ class SessionTest : public ::testing::Test {
             return joiningContract;
         }
 
-        void contractAnnounced() {            
+        void contractAnnounced() {
             auto slot = spy->sendReadyCallbackSlot;
             EXPECT_TRUE((int)slot.size() > 0);
             ready = std::get<0>(slot.front());
@@ -233,6 +233,8 @@ class SessionTest : public ::testing::Test {
     bool hasPendingFullPieceRequest(const std::vector<SellerPeer> &);
     void takeSingleSellerToExchange(SellerPeer &);
     void assertSellerInvited(const SellerPeer &);
+
+    static int nextPiecePicker(const std::vector<detail::Piece<ID>>* pieces);
 };
 
 #endif // TEST_HPP

sources/test/test_main.cpp

@@ -485,7 +485,7 @@ TEST_F(SessionTest, buying)
     PeerToStartDownloadInformationMap<ID> map = downloadInformationMap(v);
 
     // Start download
-    session->startDownloading(contractTx, map);
+    session->startDownloading(contractTx, map, SessionTest::nextPiecePicker);
 
     // make sure contract was announced to only relevant peers
     first.contractAnnounced();