cmake/compiler.cmake

@@ -16,5 +16,7 @@ MACRO( SETUP_COMPILER target_name )
             ${GENERATED_FILES_DIRECTORY_ROOT}
             # form hive project
             ${HAF_DIRECTORY}/hive/libraries/fc/include
+            ${HAF_DIRECTORY}/hive/libraries/appbase/include
+            ${HAF_DIRECTORY}/hive/libraries/utilities/include
     )
 ENDMACRO()
\ No newline at end of file

hive @ 955e8ca0

-Subproject commit ec69be399299c1588885c5addd1d3815306631a6
+Subproject commit 955e8ca0f67aa109749dd2a85e4b9f16cf2bb53c

scripts/ci-helpers/prepare_data_image_job.yml

 include:
   - project: 'hive/hive'
-    ref: cf0b147bca3705e9692b2327bf1b93a6c7a021d1 #develop
+    ref: 96cb1adfdf87c2d0411efb2a984b23df23d693f9 #develop
     file: '/scripts/ci-helpers/prepare_data_image_job.yml' 
 
 .prepare_haf_data_5m_image:

src/transaction_controllers/CMakeLists.txt

 SET( target_name "transaction_controllers")
 
-ADD_STATIC_LIB( ${target_name} )
-
-TARGET_INCLUDE_DIRECTORIES( ${target_name} PRIVATE  ${HAF_DIRECTORY}/hive/libraries/fc/include )
\ No newline at end of file
+ADD_STATIC_LIB( ${target_name} )
\ No newline at end of file

src/transaction_controllers/transaction_controllers.cpp

 #include "include/transactions_controller/transaction_controllers.hpp"
 
+#include <appbase/application.hpp>
+
 #include <fc/exception/exception.hpp>
 
 #include <atomic>
@@ -94,7 +96,7 @@ private:
           using namespace std::chrono_literals;
           std::this_thread::sleep_for(500ms);
         }
-      } while(retry < MAX_RETRY_COUNT)
+      } while(retry < MAX_RETRY_COUNT && !appbase::app().is_interrupt_request() )
       ;
 
       elog("Transaction controller: `${d}' permanently lost connection to database: `${url}'. Exiting.", ("d", _owner->_description)("url", _owner->_dbUrl));

tests/unit/sql_serializer/CMakeLists.txt

@@ -7,6 +7,7 @@ TARGET_INCLUDE_DIRECTORIES(
         "${CMAKE_BINARY_DIR}/hive/libraries/protocol/include"
         "${CMAKE_SOURCE_DIR}/hive/libraries/chain/include"
         "${CMAKE_SOURCE_DIR}/hive/libraries/utilities/include"
+        "${CMAKE_SOURCE_DIR}/hive/libraries/appbase/include"
         "${CMAKE_SOURCE_DIR}/src/sql_serializer/include"
 )