rebase fixes

bluzelle · Apr 18, 2019 · 13aa6c4 · 13aa6c4
1 parent 09edbd8
commit 13aa6c4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/mocks/CMakeLists.txt b/mocks/CMakeLists.txt
@@ -7,4 +7,4 @@ add_library(smart_mocks STATIC
 
 add_dependencies(smart_mocks boost proto googletest)
 
-target_include_directories(smart_mocks PRIVATE ${PROTO_INCLUDE_DIR})
+target_include_directories(smart_mocks PRIVATE ${PROTO_INCLUDE_DIR} ${JSONCPP_INCLUDE_DIRS} ${GTEST_INCLUDE_DIR})
diff --git a/node/test/session_test.cpp b/node/test/session_test.cpp
@@ -87,7 +87,7 @@ class session_test2 : public Test
 
     session_test2()
     {
-        session = std::make_shared<bzn::session>(this->mock_io, 0, TEST_ENDPOINT, this->mock_chaos, [&](auto, auto){this->handler_called++;}, TEST_TIMEOUT, std::list<bzn::session_shutdown_handler>{[](){}}, nullptr, this->monitor, this->options);
+        session = std::make_shared<bzn::session>(this->mock_io, 0, TEST_ENDPOINT, this->mock_chaos, [&](auto, auto){this->handler_called++;}, TEST_TIMEOUT, std::list<bzn::session_shutdown_handler>{[](){}}, this->mock_crypto, this->monitor, this->options);
     }
 
     void yield()