Merge pull request #1624 from AntelopeIO/trx_gen_cleaup_deps

Cleanup unnecessary dependency on chain_plugin by trx_generator.
AntelopeIO · Sep 13, 2023 · 540e371 · 540e371
2 parents fe55f6d + fc64e0f
commit 540e371
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/tests/trx_generator/CMakeLists.txt b/tests/trx_generator/CMakeLists.txt
@@ -2,9 +2,9 @@ add_executable(trx_generator main.cpp trx_generator.cpp trx_provider.cpp)
 
 target_include_directories(trx_generator PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
 
-target_link_libraries(trx_generator PRIVATE eosio_chain fc chain_plugin ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS})
+target_link_libraries(trx_generator PRIVATE eosio_chain fc Boost::program_options ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS})
 
 add_executable(trx_generator_tests trx_generator_tests.cpp trx_provider.cpp trx_generator.cpp)
-target_link_libraries(trx_generator_tests PRIVATE eosio_chain fc chain_plugin ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS})
+target_link_libraries(trx_generator_tests PRIVATE eosio_chain fc Boost::program_options ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS})
 target_include_directories(trx_generator_tests PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
 add_test(trx_generator_tests trx_generator_tests)
diff --git a/tests/trx_generator/main.cpp b/tests/trx_generator/main.cpp
@@ -1,7 +1,7 @@
-#include <eosio/chain_plugin/chain_plugin.hpp>
 #include <trx_provider.hpp>
 #include <trx_generator.hpp>
 #include <boost/algorithm/string.hpp>
+#include <boost/program_options.hpp>
 #include <fc/bitutil.hpp>
 #include <fc/io/raw.hpp>
 #include <iostream>

diff --git a/tests/trx_generator/trx_generator.cpp b/tests/trx_generator/trx_generator.cpp
@@ -1,9 +1,9 @@
 #include <trx_generator.hpp>
-#include <eosio/chain_plugin/chain_plugin.hpp>
 #include <iostream>
 #include <fc/log/logger.hpp>
 #include <boost/algorithm/string.hpp>
 #include <eosio/chain/chain_id_type.hpp>
+#include <boost/program_options.hpp>
 #include <eosio/chain/name.hpp>
 #include <fc/bitutil.hpp>
 #include <fc/io/raw.hpp>
@@ -235,7 +235,7 @@ namespace eosio::testing {
       stop_generation();
 
       ilog("Create Initial Transaction with action data.");
-      _abi = abi_serializer(fc::json::from_file(_usr_trx_config._abi_data_file_path).as<abi_def>(), abi_serializer::create_yield_function( abi_serializer_max_time ));
+      _abi = chain::abi_serializer(fc::json::from_file(_usr_trx_config._abi_data_file_path).as<chain::abi_def>(), chain::abi_serializer::create_yield_function( abi_serializer_max_time ));
       fc::variant unpacked_actions_data_json = json_from_file_or_string(_usr_trx_config._actions_data_json_file_or_str);
       fc::variant unpacked_actions_auths_data_json = json_from_file_or_string(_usr_trx_config._actions_auths_json_file_or_str);
       ilog("Loaded actions data: ${data}", ("data", fc::json::to_pretty_string(unpacked_actions_data_json)));

diff --git a/tests/trx_generator/trx_generator.hpp b/tests/trx_generator/trx_generator.hpp
@@ -2,7 +2,6 @@
 #include <trx_provider.hpp>
 #include <string>
 #include <vector>
-#include <boost/program_options.hpp>
 #include <eosio/chain/transaction.hpp>
 #include <eosio/chain/asset.hpp>
 #include <eosio/chain/abi_serializer.hpp>