From fff0f0536b2815f9ea9e91d45ec46c4527ab52e5 Mon Sep 17 00:00:00 2001 From: Lin Huang Date: Sat, 14 Nov 2020 20:59:23 -0500 Subject: [PATCH 1/4] disable building rodeos and eosio.tester --- libraries/CMakeLists.txt | 2 -- libraries/chain/backing_store/db_context.cpp | 2 ++ .../chain/include/eosio/chain/backing_store/db_combined.hpp | 6 +++++- programs/CMakeLists.txt | 2 -- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt index 88ff0993d8e..59495bae32b 100644 --- a/libraries/CMakeLists.txt +++ b/libraries/CMakeLists.txt @@ -52,8 +52,6 @@ set_property(GLOBAL PROPERTY CTEST_CUSTOM_TESTS_IGNORE yubico_otp wrap_data wrap info import_rsa import_authkey generate_hmac generate_ec\ attest pbkdf2 parsing ${_CTEST_CUSTOM_TESTS_IGNORE}") -add_subdirectory( rodeos ) - find_package(OpenSSL REQUIRED) option(AMQP-CPP_LINUX_TCP CACHE ON) add_subdirectory( amqp-cpp EXCLUDE_FROM_ALL ) diff --git a/libraries/chain/backing_store/db_context.cpp b/libraries/chain/backing_store/db_context.cpp index f5a0c603525..401a369ccf2 100644 --- a/libraries/chain/backing_store/db_context.cpp +++ b/libraries/chain/backing_store/db_context.cpp @@ -4,6 +4,8 @@ namespace eosio { namespace chain { namespace backing_store { +bool process_all () { return true; }; + std::string db_context::table_event(name code, name scope, name table) { return STORAGE_EVENT_ID("${code}:${scope}:${table}", ("code", code) diff --git a/libraries/chain/include/eosio/chain/backing_store/db_combined.hpp b/libraries/chain/include/eosio/chain/backing_store/db_combined.hpp index 2bad39caefb..cdd2eb552f3 100644 --- a/libraries/chain/include/eosio/chain/backing_store/db_combined.hpp +++ b/libraries/chain/include/eosio/chain/backing_store/db_combined.hpp @@ -207,7 +207,11 @@ class rocksdb_whole_db_table_collector { all_secondary_indices_; }; -auto process_all = []() { return true; }; +// This used to be "auto process_all = []() { return true; };" +// g++10 correctly reports a link error of multiple definitions +// as db_combined.hpp is included by mutiple source files. +// The definition is in db_context.cpp. +bool process_all(); enum class key_context { complete, standalone }; template> diff --git a/programs/CMakeLists.txt b/programs/CMakeLists.txt index 3caa9cac797..5eb775072b7 100644 --- a/programs/CMakeLists.txt +++ b/programs/CMakeLists.txt @@ -4,5 +4,3 @@ add_subdirectory( keosd ) add_subdirectory( eosio-launcher ) add_subdirectory( eosio-blocklog ) add_subdirectory( nodeos-sectl ) -add_subdirectory( rodeos ) -add_subdirectory( eosio-tester ) From 8e65f23dd9c1d7fa2ad3fe8fa936f20d85c241e7 Mon Sep 17 00:00:00 2001 From: Lin Huang Date: Sat, 14 Nov 2020 22:18:27 -0500 Subject: [PATCH 2/4] disable rodeos_test --- tests/CMakeLists.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 5eb3b426314..229514244ba 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -55,7 +55,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/eosio_blocklog_prune_test.py ${CMAKE_ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cli_test.py ${CMAKE_CURRENT_BINARY_DIR}/cli_test.py COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/plugin_http_api_test.py ${CMAKE_CURRENT_BINARY_DIR}/plugin_http_api_test.py COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resource_monitor_plugin_test.py ${CMAKE_CURRENT_BINARY_DIR}/resource_monitor_plugin_test.py COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/rodeos_test.py ${CMAKE_CURRENT_BINARY_DIR}/rodeos_test.py COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test_filter.wasm ${CMAKE_CURRENT_BINARY_DIR}/test_filter.wasm COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/trace_plugin_test.py ${CMAKE_CURRENT_BINARY_DIR}/trace_plugin_test.py COPYONLY) @@ -112,8 +111,6 @@ add_test(NAME light_validation_sync_test COMMAND tests/light_validation_sync_tes set_property(TEST light_validation_sync_test PROPERTY LABELS nonparallelizable_tests) add_test(NAME eosio_blocklog_prune_test COMMAND tests/eosio_blocklog_prune_test.py -v --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) set_property(TEST eosio_blocklog_prune_test PROPERTY LABELS nonparallelizable_tests) -add_test(NAME rodeos_test COMMAND tests/rodeos_test.py -v --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) -set_property(TEST rodeos_test PROPERTY LABELS nonparallelizable_tests) # Long running tests add_test(NAME nodeos_sanity_lr_test COMMAND tests/nodeos_run_test.py -v --sanity-test --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) From 246dfaafd1875678be032865a4d16627a363da5b Mon Sep 17 00:00:00 2001 From: Lin Huang Date: Sun, 15 Nov 2020 20:17:41 -0500 Subject: [PATCH 3/4] Fix snapshot_tests and test_state_history failures --- libraries/chain/backing_store/db_context.cpp | 2 -- .../chain/include/eosio/chain/backing_store/db_combined.hpp | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/libraries/chain/backing_store/db_context.cpp b/libraries/chain/backing_store/db_context.cpp index 401a369ccf2..f5a0c603525 100644 --- a/libraries/chain/backing_store/db_context.cpp +++ b/libraries/chain/backing_store/db_context.cpp @@ -4,8 +4,6 @@ namespace eosio { namespace chain { namespace backing_store { -bool process_all () { return true; }; - std::string db_context::table_event(name code, name scope, name table) { return STORAGE_EVENT_ID("${code}:${scope}:${table}", ("code", code) diff --git a/libraries/chain/include/eosio/chain/backing_store/db_combined.hpp b/libraries/chain/include/eosio/chain/backing_store/db_combined.hpp index cdd2eb552f3..65e6fd601f4 100644 --- a/libraries/chain/include/eosio/chain/backing_store/db_combined.hpp +++ b/libraries/chain/include/eosio/chain/backing_store/db_combined.hpp @@ -208,10 +208,9 @@ class rocksdb_whole_db_table_collector { }; // This used to be "auto process_all = []() { return true; };" -// g++10 correctly reports a link error of multiple definitions +// g++10 correctly reports a link error of multiple definitions // as db_combined.hpp is included by mutiple source files. -// The definition is in db_context.cpp. -bool process_all(); +constexpr auto process_all = []() { return true; }; enum class key_context { complete, standalone }; template> From 616717fae43f07825790fd2ef8b3c1c6bd566011 Mon Sep 17 00:00:00 2001 From: Lin Huang Date: Mon, 16 Nov 2020 10:56:10 -0500 Subject: [PATCH 4/4] remove boost::wrapexcept --- libraries/chain/backing_store/tests/benchmark_kv.cpp | 2 +- .../chain/include/eosio/chain/backing_store/db_combined.hpp | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/libraries/chain/backing_store/tests/benchmark_kv.cpp b/libraries/chain/backing_store/tests/benchmark_kv.cpp index fa53f5317e4..12e240e72c3 100644 --- a/libraries/chain/backing_store/tests/benchmark_kv.cpp +++ b/libraries/chain/backing_store/tests/benchmark_kv.cpp @@ -571,7 +571,7 @@ int main(int argc, char* argv[]) { return 1; } } - } catch (boost::wrapexcept& ex) { + } catch (boost::program_options::required_option& ex) { // This exception is thrown whenever required options are not supplied. // Need to catch it or we will get a crash. if (vmap.count("help") == 0) { diff --git a/libraries/chain/include/eosio/chain/backing_store/db_combined.hpp b/libraries/chain/include/eosio/chain/backing_store/db_combined.hpp index 65e6fd601f4..707a8020257 100644 --- a/libraries/chain/include/eosio/chain/backing_store/db_combined.hpp +++ b/libraries/chain/include/eosio/chain/backing_store/db_combined.hpp @@ -207,9 +207,6 @@ class rocksdb_whole_db_table_collector { all_secondary_indices_; }; -// This used to be "auto process_all = []() { return true; };" -// g++10 correctly reports a link error of multiple definitions -// as db_combined.hpp is included by mutiple source files. constexpr auto process_all = []() { return true; }; enum class key_context { complete, standalone };