Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

various tests fixes for gcc

Browse source
This commit is contained in:
sowle 2019-05-01 21:25:56 +02:00
parent 2143dc6779
commit 303cb9b4ea
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/CMakeLists.txt
View file

@ -28,7 +28,7 @@ add_executable(net_load_tests_srv net_load_tests/srv.cpp)
add_dependencies(coretests version)
target_link_libraries(coretests currency_core common crypto wallet rpc zlibstatic ethash ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES})
target_link_libraries(coretests rpc currency_core common crypto wallet zlibstatic ethash ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES})
target_link_libraries(functional_tests rpc wallet currency_core crypto common zlibstatic ethash upnpc-static ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES})
target_link_libraries(hash-tests crypto ethash)
target_link_libraries(hash-target-tests crypto currency_core ethash ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES})

4
tests/core_tests/escrow_wallet_common.h
View file

@ -59,7 +59,7 @@ void remove_all_entries_from_variant_container_by_type(container_t& container)
inline bool refresh_wallet_and_check_1_contract_state(const char* wallet_name, std::shared_ptr<tools::wallet2> wallet, uint32_t expected_contract_state, size_t block_to_be_fetched = SIZE_MAX)
{
bool stub_bool = false, r = false;
bool stub_bool = false, r;
size_t blocks_fetched = 0;
LOG_PRINT_CYAN("Refreshing " << wallet_name << "'s wallet...", LOG_LEVEL_0);
wallet->refresh(blocks_fetched);
@ -78,7 +78,7 @@ inline bool refresh_wallet_and_check_1_contract_state(const char* wallet_name, s
inline bool refresh_wallet_and_check_contract_state(const char* wallet_name, std::shared_ptr<tools::wallet2> wallet, uint32_t expected_contract_state, crypto::hash contract_id, size_t block_to_be_fetched = SIZE_MAX)
{
bool stub_bool = false, r = false;
bool stub_bool = false, r;
size_t blocks_fetched = 0;
LOG_PRINT_CYAN("Refreshing " << wallet_name << "'s wallet...", LOG_LEVEL_0);
wallet->refresh(blocks_fetched);

2
tests/performance_tests/multi_tx_test_base.h
View file

@ -33,7 +33,7 @@ public:
return false;
txout_to_key tx_out = boost::get<txout_to_key>(m_miner_txs[i].vout[0].target);
output_entries.push_back(std::make_pair(i, tx_out.key));
output_entries.push_back(make_serializable_pair<txout_v, crypto::public_key>(i, tx_out.key));
m_public_keys[i] = tx_out.key;
m_public_key_ptrs[i] = &m_public_keys[i];
}