Merge branch 'slim' of github.com:EOSIO/eos into slim

tests/CMakeLists.txt

@@ -19,8 +19,8 @@ include_directories("${CMAKE_SOURCE_DIR}/plugins/wallet_plugin/include")
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tests/config.hpp.in ${CMAKE_CURRENT_SOURCE_DIR}/tests/config.hpp ESCAPE_QUOTES)
 
 # Temporarily remove some tests to get chain_test to compile
-#file(GLOB UNIT_TESTS "chain_tests/*.cpp" "api_tests/*.cpp" "wasm_tests/*.cpp")
-file(GLOB UNIT_TESTS "api_tests/*.cpp")
+#file(GLOB UNIT_TESTS "tests/wallet_tests.cpp" "chain_tests/*.cpp" "api_tests/*.cpp" "wasm_tests/*.cpp")
+file(GLOB UNIT_TESTS "tests/wallet_tests.cpp" "api_tests/*.cpp")
 
 add_executable( chain_test ${UNIT_TESTS} ${WASM_UNIT_TESTS} common/main.cpp)
 target_link_libraries( chain_test eosio_testing eosio_chain chainbase eos_utilities chain_plugin wallet_plugin abi_generator fc ${PLATFORM_SPECIFIC_LIBS} )

unittests/CMakeLists.txt

@@ -15,16 +15,13 @@ set( CMAKE_CXX_STANDARD 14 )
 include_directories("${CMAKE_BINARY_DIR}/contracts")
 include_directories("${CMAKE_SOURCE_DIR}/contracts")
 include_directories("${CMAKE_SOURCE_DIR}/libraries/testing/include")
-include_directories("${CMAKE_SOURCE_DIR}/plugins/chain_plugin/include")
-include_directories("${CMAKE_SOURCE_DIR}/plugins/wallet_plugin/include")
-include_directories("${CMAKE_SOURCE_DIR}/libraries/appbase/include")
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.hpp.in ${CMAKE_CURRENT_SOURCE_DIR}/config.hpp ESCAPE_QUOTES)
 
 file(GLOB UNIT_TESTS "*.cpp")
 
 add_executable( unit_test ${UNIT_TESTS} ${WASM_UNIT_TESTS} )
-target_link_libraries( unit_test eosio_chain chainbase eosio_testing eos_utilities chain_plugin wallet_plugin abi_generator fc ${PLATFORM_SPECIFIC_LIBS} )
+target_link_libraries( unit_test eosio_chain chainbase eosio_testing eos_utilities abi_generator fc ${PLATFORM_SPECIFIC_LIBS} )
 
 target_include_directories( unit_test PUBLIC ${CMAKE_BINARY_DIR}/contracts ${CMAKE_CURRENT_BINARY_DIR}/tests/contracts )
 target_include_directories( unit_test PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/wasm_tests )

unittests/multisig_tests.cpp

@@ -2,7 +2,6 @@
 #include <eosio/testing/tester.hpp>
 #include <eosio/chain/abi_serializer.hpp>
 #include <eosio/chain/wast_to_wasm.hpp>
-#include <eosio/chain_plugin/chain_plugin.hpp>
 
 #include <eosio.msig/eosio.msig.wast.hpp>
 #include <eosio.msig/eosio.msig.abi.hpp>
@@ -17,7 +16,6 @@
 using namespace eosio::testing;
 using namespace eosio;
 using namespace eosio::chain;
-using namespace eosio::chain_apis;
 using namespace eosio::testing;
 using namespace fc;