Merge pull request #15 from JoyStream/development

dev to master - v0.3.0

Author: mnaamani

conan_package/base.py

@@ -3,14 +3,14 @@
 
 class ProtocolStateMachineBase(ConanFile):
     name = "ProtocolStateMachine"
-    version = "0.2.0"
+    version = "0.3.0"
     license = "(c) JoyStream Inc. 2016-2017"
     url = "https://github.com/JoyStream/protocol_statemachine-cpp.git"
     repo_ssh_url = "git@github.com:JoyStream/protocol_statemachine-cpp.git"
     repo_https_url = "https://github.com/JoyStream/protocol_statemachine-cpp.git"
     settings = "os", "compiler", "build_type", "arch"
     generators = "cmake"
-    requires = "ProtocolWire/0.1.2@joystream/stable", "PaymentChannel/0.1.2@joystream/stable",
+    requires = "ProtocolWire/0.1.2@joystream/stable", "PaymentChannel/0.2.0@joystream/stable", "Common/0.2.0@joystream/stable"
     build_policy = "missing"
 
     def source(self):

conan_package/release_include_source.py conan_package/dev_include_source.pyconan_package/release_include_source.py renamed to conan_package/dev_include_source.py

@@ -11,6 +11,8 @@ class ProtocolStateMachineRelease(ProtocolStateMachineBase):
 
     exports_sources = "../sources*"
 
+    build_policy="always"
+
     def source(self):
         os.mkdir("repo")
         shutil.move("sources", "repo/")

sources/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
 
 project(ProtocoStateMachine CXX)
 
-add_definitions(-DMAJOR_PROTOCOL_VERSION=2)
+add_definitions(-DMAJOR_PROTOCOL_VERSION=3)
 add_definitions(-DMINOR_PROTOCOL_VERSION=0)
 
 option(build_tests "build tests" OFF)

sources/include/protocol_statemachine/CBStateMachine.hpp

@@ -140,7 +140,8 @@ namespace protocol_statemachine {
                        const ReceivedFullPiece &,
                        const MessageOverflow &,
                        const MessageOverflow &,
-                       int);
+                       int,
+                       Coin::Network network);
 
         void processEvent(const sc::event_base &);
 

sources/src/CBStateMachine.cpp

@@ -31,7 +31,8 @@ namespace protocol_statemachine {
                                    const ReceivedFullPiece & receivedFullPiece,
                                    const MessageOverflow & remoteMessageOverflow,
                                    const MessageOverflow & localMessageOverflow,
-                                   int MAX_PIECE_INDEX)
+                                   int MAX_PIECE_INDEX,
+                                   Coin::Network network)
         : _currentlyProcessingCallbacks(false)
         , _peerAnnouncedMode(_queuedCallbacks, peerAnnouncedMode)
         , _invitedToOutdatedContract(_queuedCallbacks, invitedToOutdatedContract)
@@ -57,7 +58,9 @@ namespace protocol_statemachine {
         , _remoteMessageOverflow(_queuedCallbacks, remoteMessageOverflow)
         , _localMessageOverflow(_queuedCallbacks, localMessageOverflow)
         , _MAX_PIECE_INDEX(MAX_PIECE_INDEX)
-        , _lastRequestedPiece(0) {
+        , _lastRequestedPiece(0)
+        , _payor(network)
+        , _payee(network) {
     }
 
     void CBStateMachine::processEvent(const sc::event_base & e) {

sources/test/BuyingNavigator.cpp

@@ -21,7 +21,8 @@ bool BuyingNavigator::Fixture::validatePayment(const Coin::Signature & payment,
                                            joiningContract.message().finalPkHash(),
                                            contractPrepared.contractKeyPair().pk(),
                                            contractPrepared.finalPkHash(),
-                                           Coin::Signature());
+                                           Coin::Signature(),
+                                           Coin::Network::mainnet);
 
     return payee.registerPayment(payment);
 }

sources/test/CBStateMachineCallbackSpy.cpp

@@ -131,7 +131,8 @@ protocol_statemachine::CBStateMachine * CBStateMachineCallbackSpy::createMonitor
     [this](){
         _localMessageOverflow = true;
     },
-    MAX_PIECE_INDEX);
+    MAX_PIECE_INDEX,
+    Coin::Network::mainnet);
 
     // Initiate machine
     machine->initiate();

sources/test/SellingNavigator.cpp

@@ -18,7 +18,8 @@ event::Recv<protocol_wire::Payment> SellingNavigator::Fixture::goodPayment(const
                                            Coin::KeyPair(payorContractSk),
                                            contractReady.message().finalPkHash(),
                                            joinedContract.contractKeys().pk(),
-                                           joinedContract.finalPkHash());
+                                           joinedContract.finalPkHash(),
+                                           Coin::Network::mainnet);
 
     Coin::Signature payment = payor.generatePayorSettlementSignature();