Merge pull request hyperledger-iroha#100 from hyperledger/feature/han…

…dling-events+callbacks Feature/handling events+callbacks
romo · Dec 25, 2016 · 035f305 · 035f305
2 parents 75a8c2d + 9437e0f
commit 035f305
Show file tree

Hide file tree

Showing 256 changed files with 451 additions and 17,217 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,4 +16,6 @@ build/*
 .idea/*
 *xcworkspace*
 .vscode/*
-*cmake-build-debug*
+*cmake-build-debug*
+cmake-build-debu/*
+config/sumeragi.json
diff --git a/.gitmodules b/.gitmodules
@@ -20,4 +20,6 @@
 [submodule "core/vendor/Cappuccino/lib/json"]
   path = core/vendor/Cappuccino/lib/json
   url = https://github.com/nlohmann/json.git
-
+[submodule "core/vendor/thread_pool_cpp"]
+    path = core/vendor/thread_pool_cpp
+    url = https://github.com/Warchant/thread-pool-cpp.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,6 +14,10 @@ add_subdirectory(peer)
 
 add_subdirectory(tools)
 
+# at some point we want to include pool as following: #include <worker.hpp>
+# which resides in that folder
+include_directories("${PROJECT_SOURCE_DIR}/core/vendor/thread_pool_cpp/thread_pool")
+
 if(NOT without-test)
   enable_testing()
   include(test/gtest.cmake)

diff --git a/circle.yml b/circle.yml
@@ -20,6 +20,9 @@ machine:
 
 checkout:
   post:
+    - git submodule init
+    - git submodule update
+
     - cd $IROHA_HOME
     - cd $IROHA_HOME/core/vendor/leveldb; make -j 4
     - cd $IROHA_HOME/core/vendor/ed25519; make -j 4
@@ -45,4 +48,4 @@ test:
   pre:
     - mkdir build; cd build; cmake ..; make
   override:
-    - ./test.sh
+    - ./test.sh
diff --git a/cmake-build-debug/CMakeCache.txt b/cmake-build-debug/CMakeCache.txt
diff --git a/cmake-build-debug/CMakeFiles/3.6.2/CMakeDetermineCompilerABI_C.bin b/cmake-build-debug/CMakeFiles/3.6.2/CMakeDetermineCompilerABI_C.bin
diff --git a/cmake-build-debug/CMakeFiles/3.6.2/CMakeDetermineCompilerABI_CXX.bin b/cmake-build-debug/CMakeFiles/3.6.2/CMakeDetermineCompilerABI_CXX.bin