rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-29 10:43:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5409

Browse source 
ac874e2d tests: fix test_options initialization error (Dusan Klinec)
This commit is contained in:
Riccardo Spagni 2019-04-16 22:34:30 +02:00
commit 45a4145f87
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/core_tests/bulletproofs.h
View file

@ -97,7 +97,7 @@ template<>
struct get_test_options<gen_bp_tx_validation_base> { struct get_test_options<gen_bp_tx_validation_base> {
const std::pair<uint8_t, uint64_t> hard_forks[4] = {std::make_pair(1, 0), std::make_pair(2, 1), std::make_pair(10, 73), std::make_pair(0, 0)}; const std::pair<uint8_t, uint64_t> hard_forks[4] = {std::make_pair(1, 0), std::make_pair(2, 1), std::make_pair(10, 73), std::make_pair(0, 0)};
const cryptonote::test_options test_options = { const cryptonote::test_options test_options = {
hard_forks hard_forks, 0
}; };
}; };

4
tests/core_tests/chaingen.h
View file

@ -763,7 +763,7 @@ template<typename t_test_class>
struct get_test_options { struct get_test_options {
const std::pair<uint8_t, uint64_t> hard_forks[2]; const std::pair<uint8_t, uint64_t> hard_forks[2];
const cryptonote::test_options test_options = { const cryptonote::test_options test_options = {
hard_forks hard_forks, 0
}; };
get_test_options():hard_forks{std::make_pair((uint8_t)1, (uint64_t)0), std::make_pair((uint8_t)0, (uint64_t)0)}{} get_test_options():hard_forks{std::make_pair((uint8_t)1, (uint64_t)0), std::make_pair((uint8_t)0, (uint64_t)0)}{}
}; };
@ -791,7 +791,7 @@ inline bool do_replay_events_get_core(std::vector<test_event_entry>& events, cry
// Hardforks can be specified in events. // Hardforks can be specified in events.
v_hardforks_t hardforks; v_hardforks_t hardforks;
cryptonote::test_options test_options_tmp{}; cryptonote::test_options test_options_tmp{nullptr, 0};
const cryptonote::test_options * test_options_ = &gto.test_options; const cryptonote::test_options * test_options_ = &gto.test_options;
if (extract_hard_forks(events, hardforks)){ if (extract_hard_forks(events, hardforks)){
hardforks.push_back(std::make_pair((uint8_t)0, (uint64_t)0)); // terminator hardforks.push_back(std::make_pair((uint8_t)0, (uint64_t)0)); // terminator

2
tests/core_tests/multisig.h
View file

@ -84,7 +84,7 @@ template<>
struct get_test_options<gen_multisig_tx_validation_base> { struct get_test_options<gen_multisig_tx_validation_base> {
const std::pair<uint8_t, uint64_t> hard_forks[3] = {std::make_pair(1, 0), std::make_pair(4, 1), std::make_pair(0, 0)}; const std::pair<uint8_t, uint64_t> hard_forks[3] = {std::make_pair(1, 0), std::make_pair(4, 1), std::make_pair(0, 0)};
const cryptonote::test_options test_options = { const cryptonote::test_options test_options = {
hard_forks hard_forks, 0
}; };
}; };

2
tests/core_tests/rct.h
View file

@ -83,7 +83,7 @@ template<>
struct get_test_options<gen_rct_tx_validation_base> { struct get_test_options<gen_rct_tx_validation_base> {
const std::pair<uint8_t, uint64_t> hard_forks[4] = {std::make_pair(1, 0), std::make_pair(2, 1), std::make_pair(4, 65), std::make_pair(0, 0)}; const std::pair<uint8_t, uint64_t> hard_forks[4] = {std::make_pair(1, 0), std::make_pair(2, 1), std::make_pair(4, 65), std::make_pair(0, 0)};
const cryptonote::test_options test_options = { const cryptonote::test_options test_options = {
hard_forks hard_forks, 0
}; };
}; };

2
tests/trezor/trezor_tests.cpp
View file

@ -304,7 +304,7 @@ static bool init_core_replay_events(std::vector<test_event_entry>& events, crypt
// Hardforks can be specified in events. // Hardforks can be specified in events.
v_hardforks_t hardforks; v_hardforks_t hardforks;
cryptonote::test_options test_options_tmp{}; cryptonote::test_options test_options_tmp{nullptr, 0};
const cryptonote::test_options * test_options_ = &gto.test_options; const cryptonote::test_options * test_options_ = &gto.test_options;
if (extract_hard_forks(events, hardforks)){ if (extract_hard_forks(events, hardforks)){
hardforks.push_back(std::make_pair((uint8_t)0, (uint64_t)0)); // terminator hardforks.push_back(std::make_pair((uint8_t)0, (uint64_t)0)); // terminator