Merge pull request #18 from JoyStream/development

dev to master - v0.1.3

Author: mnaamani

conan_package/base.py

@@ -3,7 +3,7 @@
 
 class ProtocolSessionBase(ConanFile):
     name = "ProtocolSession"
-    version = "0.1.2"
+    version = "0.1.3"
     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

@@ -609,11 +609,13 @@ namespace detail {
 
             detail::Seller<ConnectionIdType> & s = itr->second;
 
-            // Seller can't be gone
-            assert(s.state() != SellerState::gone);
-
-            // Remove
-            removeSeller(s);
+            // It is possible to find a seller in the "gone" state that we have previoulsy removed.
+            // This happens when the connection times out and is later re-establish. The connection will have the
+            // same connection id (because it is the same peer)
+            if(s.state() != SellerState::gone) {
+              // Remove
+              removeSeller(s);
+            }
         }
 
         // Destroy connection - important todo before notifying client