oxen-io
/
oxen-core
mirror of https://github.com/oxen-io/oxen-core.git
2
1
Fork 0
Code Issues Projects Releases Wiki Activity

use vector for hard fork versions in test options

This commit is contained in:
Maxim Shishmarev 2018-10-10 13:02:22 +11:00
parent f6b8b11047
commit 1157d90345
8 changed files with 162 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cryptonote_core/blockchain.cpp
View File

@ -334,8 +334,10 @@ bool Blockchain::init(BlockchainDB* db, const network_type nettype, bool offline
}
if (m_nettype == FAKECHAIN)
{
for (size_t n = 0; test_options->hard_forks[n].first; ++n)
m_hardfork->add_fork(test_options->hard_forks[n].first, test_options->hard_forks[n].second, 0, n + 1);
for (auto n = 0u; n < test_options->hard_forks.size(); ++n) {
const auto& hf = test_options->hard_forks.at(n);
m_hardfork->add_fork(hf.first, hf.second, 0, n + 1);
}
}
else if (m_nettype == TESTNET)
{

2
src/cryptonote_core/cryptonote_core.h
View File

@ -58,7 +58,7 @@ DISABLE_VS_WARNINGS(4355)
namespace cryptonote
{
struct test_options {
const std::pair<uint8_t, uint64_t> *hard_forks;
const std::vector<std::pair<uint8_t, uint64_t>> hard_forks;
};
extern const command_line::arg_descriptor<std::string, false, true, 2> arg_data_dir;

3
tests/core_tests/chaingen.h
View File

@ -472,11 +472,10 @@ inline bool replay_events_through_core(cryptonote::core& cr, const std::vector<t
//--------------------------------------------------------------------------
template<typename t_test_class>
struct get_test_options {
const std::pair<uint8_t, uint64_t> hard_forks[2];
const std::vector<std::pair<uint8_t, uint64_t>> hard_forks = {{7, 0}};
const cryptonote::test_options test_options = {
hard_forks
};
get_test_options():hard_forks{std::make_pair((uint8_t)7, (uint64_t)0), std::make_pair((uint8_t)0, (uint64_t)0)}{}
};
//--------------------------------------------------------------------------

253
tests/core_tests/chaingen_main.cpp
View File

@ -41,6 +41,7 @@ namespace
const command_line::arg_descriptor<bool> arg_generate_test_data = {"generate_test_data", ""};
const command_line::arg_descriptor<bool> arg_play_test_data = {"play_test_data", ""};
const command_line::arg_descriptor<bool> arg_generate_and_play_test_data = {"generate_and_play_test_data", ""};
const command_line::arg_descriptor<bool> arg_service_nodes = {"service_nodes", ""};
const command_line::arg_descriptor<bool> arg_test_transactions = {"test_transactions", ""};
}
@ -60,6 +61,7 @@ int main(int argc, char* argv[])
command_line::add_arg(desc_options, arg_generate_test_data);
command_line::add_arg(desc_options, arg_play_test_data);
command_line::add_arg(desc_options, arg_generate_and_play_test_data);
command_line::add_arg(desc_options, arg_service_nodes);
command_line::add_arg(desc_options, arg_test_transactions);
po::variables_map vm;
@ -91,136 +93,143 @@ int main(int argc, char* argv[])
}
else if (command_line::get_arg(vm, arg_generate_and_play_test_data))
{
GENERATE_AND_PLAY(gen_service_nodes);
GENERATE_AND_PLAY(test_prefer_deregisters);
GENERATE_AND_PLAY(test_zero_fee_deregister);
GENERATE_AND_PLAY(test_deregister_safety_buffer);
GENERATE_AND_PLAY(test_deregisters_on_split);
GENERATE_AND_PLAY(gen_simple_chain_001);
GENERATE_AND_PLAY(gen_simple_chain_split_1);
GENERATE_AND_PLAY(one_block);
GENERATE_AND_PLAY(gen_chain_switch_1);
GENERATE_AND_PLAY(gen_ring_signature_1);
GENERATE_AND_PLAY(gen_ring_signature_2);
//GENERATE_AND_PLAY(gen_ring_signature_big); // Takes up to XXX hours (if CRYPTONOTE_MINED_MONEY_UNLOCK_WINDOW == 10)
// Block verification tests
GENERATE_AND_PLAY(gen_block_big_major_version);
GENERATE_AND_PLAY(gen_block_big_minor_version);
GENERATE_AND_PLAY(gen_block_ts_not_checked);
GENERATE_AND_PLAY(gen_block_ts_in_past);
GENERATE_AND_PLAY(gen_block_ts_in_future);
GENERATE_AND_PLAY(gen_block_invalid_prev_id);
GENERATE_AND_PLAY(gen_block_invalid_nonce);
GENERATE_AND_PLAY(gen_block_no_miner_tx);
GENERATE_AND_PLAY(gen_block_unlock_time_is_low);
GENERATE_AND_PLAY(gen_block_unlock_time_is_high);
GENERATE_AND_PLAY(gen_block_unlock_time_is_timestamp_in_past);
GENERATE_AND_PLAY(gen_block_unlock_time_is_timestamp_in_future);
GENERATE_AND_PLAY(gen_block_height_is_low);
GENERATE_AND_PLAY(gen_block_height_is_high);
GENERATE_AND_PLAY(gen_block_miner_tx_has_2_tx_gen_in);
GENERATE_AND_PLAY(gen_block_miner_tx_has_2_in);
GENERATE_AND_PLAY(gen_block_miner_tx_with_txin_to_key);
GENERATE_AND_PLAY(gen_block_miner_tx_out_is_big);
GENERATE_AND_PLAY(gen_block_miner_tx_has_no_out);
GENERATE_AND_PLAY(gen_block_miner_tx_has_out_to_alice);
GENERATE_AND_PLAY(gen_block_has_invalid_tx);
GENERATE_AND_PLAY(gen_block_is_too_big);
GENERATE_AND_PLAY(gen_block_invalid_binary_format); // Takes up to 3 hours, if CRYPTONOTE_MINED_MONEY_UNLOCK_WINDOW == 500, up to 30 minutes, if CRYPTONOTE_MINED_MONEY_UNLOCK_WINDOW == 10
if (command_line::get_arg(vm, arg_service_nodes))
{
GENERATE_AND_PLAY(gen_service_nodes);
GENERATE_AND_PLAY(test_prefer_deregisters);
GENERATE_AND_PLAY(test_zero_fee_deregister);
GENERATE_AND_PLAY(test_deregister_safety_buffer);
GENERATE_AND_PLAY(test_deregisters_on_split);
} else
{
GENERATE_AND_PLAY(gen_simple_chain_001);
GENERATE_AND_PLAY(gen_simple_chain_split_1);
GENERATE_AND_PLAY(one_block);
GENERATE_AND_PLAY(gen_chain_switch_1);
GENERATE_AND_PLAY(gen_ring_signature_1);
GENERATE_AND_PLAY(gen_ring_signature_2);
//GENERATE_AND_PLAY(gen_ring_signature_big); // Takes up to XXX hours (if CRYPTONOTE_MINED_MONEY_UNLOCK_WINDOW == 10)
// Transaction verification tests
GENERATE_AND_PLAY(gen_tx_big_version);
GENERATE_AND_PLAY(gen_tx_unlock_time);
GENERATE_AND_PLAY(gen_tx_input_is_not_txin_to_key);
GENERATE_AND_PLAY(gen_tx_no_inputs_no_outputs);
GENERATE_AND_PLAY(gen_tx_no_inputs_has_outputs);
GENERATE_AND_PLAY(gen_tx_has_inputs_no_outputs);
GENERATE_AND_PLAY(gen_tx_invalid_input_amount);
GENERATE_AND_PLAY(gen_tx_input_wo_key_offsets);
GENERATE_AND_PLAY(gen_tx_sender_key_offest_not_exist);
GENERATE_AND_PLAY(gen_tx_key_offest_points_to_foreign_key);
GENERATE_AND_PLAY(gen_tx_mixed_key_offest_not_exist);
GENERATE_AND_PLAY(gen_tx_key_image_not_derive_from_tx_key);
GENERATE_AND_PLAY(gen_tx_key_image_is_invalid);
GENERATE_AND_PLAY(gen_tx_check_input_unlock_time);
GENERATE_AND_PLAY(gen_tx_txout_to_key_has_invalid_key);
GENERATE_AND_PLAY(gen_tx_output_with_zero_amount);
GENERATE_AND_PLAY(gen_tx_output_is_not_txout_to_key);
GENERATE_AND_PLAY(gen_tx_signatures_are_invalid);
// Block verification tests
GENERATE_AND_PLAY(gen_block_big_major_version);
GENERATE_AND_PLAY(gen_block_big_minor_version);
GENERATE_AND_PLAY(gen_block_ts_not_checked);
GENERATE_AND_PLAY(gen_block_ts_in_past);
GENERATE_AND_PLAY(gen_block_ts_in_future);
GENERATE_AND_PLAY(gen_block_invalid_prev_id);
GENERATE_AND_PLAY(gen_block_invalid_nonce);
GENERATE_AND_PLAY(gen_block_no_miner_tx);
GENERATE_AND_PLAY(gen_block_unlock_time_is_low);
GENERATE_AND_PLAY(gen_block_unlock_time_is_high);
GENERATE_AND_PLAY(gen_block_unlock_time_is_timestamp_in_past);
GENERATE_AND_PLAY(gen_block_unlock_time_is_timestamp_in_future);
GENERATE_AND_PLAY(gen_block_height_is_low);
GENERATE_AND_PLAY(gen_block_height_is_high);
GENERATE_AND_PLAY(gen_block_miner_tx_has_2_tx_gen_in);
GENERATE_AND_PLAY(gen_block_miner_tx_has_2_in);
GENERATE_AND_PLAY(gen_block_miner_tx_with_txin_to_key);
GENERATE_AND_PLAY(gen_block_miner_tx_out_is_big);
GENERATE_AND_PLAY(gen_block_miner_tx_has_no_out);
GENERATE_AND_PLAY(gen_block_miner_tx_has_out_to_alice);
GENERATE_AND_PLAY(gen_block_has_invalid_tx);
GENERATE_AND_PLAY(gen_block_is_too_big);
GENERATE_AND_PLAY(gen_block_invalid_binary_format); // Takes up to 3 hours, if CRYPTONOTE_MINED_MONEY_UNLOCK_WINDOW == 500, up to 30 minutes, if CRYPTONOTE_MINED_MONEY_UNLOCK_WINDOW == 10
// Double spend
GENERATE_AND_PLAY(gen_double_spend_in_tx<false>);
GENERATE_AND_PLAY(gen_double_spend_in_tx<true>);
GENERATE_AND_PLAY(gen_double_spend_in_the_same_block<false>);
GENERATE_AND_PLAY(gen_double_spend_in_the_same_block<true>);
GENERATE_AND_PLAY(gen_double_spend_in_different_blocks<false>);
GENERATE_AND_PLAY(gen_double_spend_in_different_blocks<true>);
GENERATE_AND_PLAY(gen_double_spend_in_different_chains);
GENERATE_AND_PLAY(gen_double_spend_in_alt_chain_in_the_same_block<false>);
GENERATE_AND_PLAY(gen_double_spend_in_alt_chain_in_the_same_block<true>);
GENERATE_AND_PLAY(gen_double_spend_in_alt_chain_in_different_blocks<false>);
GENERATE_AND_PLAY(gen_double_spend_in_alt_chain_in_different_blocks<true>);
// Transaction verification tests
GENERATE_AND_PLAY(gen_tx_big_version);
GENERATE_AND_PLAY(gen_tx_unlock_time);
GENERATE_AND_PLAY(gen_tx_input_is_not_txin_to_key);
GENERATE_AND_PLAY(gen_tx_no_inputs_no_outputs);
GENERATE_AND_PLAY(gen_tx_no_inputs_has_outputs);
GENERATE_AND_PLAY(gen_tx_has_inputs_no_outputs);
GENERATE_AND_PLAY(gen_tx_invalid_input_amount);
GENERATE_AND_PLAY(gen_tx_input_wo_key_offsets);
GENERATE_AND_PLAY(gen_tx_sender_key_offest_not_exist);
GENERATE_AND_PLAY(gen_tx_key_offest_points_to_foreign_key);
GENERATE_AND_PLAY(gen_tx_mixed_key_offest_not_exist);
GENERATE_AND_PLAY(gen_tx_key_image_not_derive_from_tx_key);
GENERATE_AND_PLAY(gen_tx_key_image_is_invalid);
GENERATE_AND_PLAY(gen_tx_check_input_unlock_time);
GENERATE_AND_PLAY(gen_tx_txout_to_key_has_invalid_key);
GENERATE_AND_PLAY(gen_tx_output_with_zero_amount);
GENERATE_AND_PLAY(gen_tx_output_is_not_txout_to_key);
GENERATE_AND_PLAY(gen_tx_signatures_are_invalid);
GENERATE_AND_PLAY(gen_uint_overflow_1);
GENERATE_AND_PLAY(gen_uint_overflow_2);
// Double spend
GENERATE_AND_PLAY(gen_double_spend_in_tx<false>);
GENERATE_AND_PLAY(gen_double_spend_in_tx<true>);
GENERATE_AND_PLAY(gen_double_spend_in_the_same_block<false>);
GENERATE_AND_PLAY(gen_double_spend_in_the_same_block<true>);
GENERATE_AND_PLAY(gen_double_spend_in_different_blocks<false>);
GENERATE_AND_PLAY(gen_double_spend_in_different_blocks<true>);
GENERATE_AND_PLAY(gen_double_spend_in_different_chains);
GENERATE_AND_PLAY(gen_double_spend_in_alt_chain_in_the_same_block<false>);
GENERATE_AND_PLAY(gen_double_spend_in_alt_chain_in_the_same_block<true>);
GENERATE_AND_PLAY(gen_double_spend_in_alt_chain_in_different_blocks<false>);
GENERATE_AND_PLAY(gen_double_spend_in_alt_chain_in_different_blocks<true>);
GENERATE_AND_PLAY(gen_block_reward);
GENERATE_AND_PLAY(gen_uint_overflow_1);
GENERATE_AND_PLAY(gen_uint_overflow_2);
GENERATE_AND_PLAY(gen_v2_tx_mixable_0_mixin);
GENERATE_AND_PLAY(gen_v2_tx_mixable_low_mixin);
// GENERATE_AND_PLAY(gen_v2_tx_unmixable_only);
// GENERATE_AND_PLAY(gen_v2_tx_unmixable_one);
// GENERATE_AND_PLAY(gen_v2_tx_unmixable_two);
GENERATE_AND_PLAY(gen_v2_tx_dust);
GENERATE_AND_PLAY(gen_block_reward);
GENERATE_AND_PLAY(gen_rct_tx_valid_from_pre_rct);
GENERATE_AND_PLAY(gen_rct_tx_valid_from_rct);
GENERATE_AND_PLAY(gen_rct_tx_valid_from_mixed);
GENERATE_AND_PLAY(gen_rct_tx_pre_rct_bad_real_dest);
GENERATE_AND_PLAY(gen_rct_tx_pre_rct_bad_real_mask);
GENERATE_AND_PLAY(gen_rct_tx_pre_rct_bad_fake_dest);
GENERATE_AND_PLAY(gen_rct_tx_pre_rct_bad_fake_mask);
GENERATE_AND_PLAY(gen_rct_tx_rct_bad_real_dest);
GENERATE_AND_PLAY(gen_rct_tx_rct_bad_real_mask);
GENERATE_AND_PLAY(gen_rct_tx_rct_bad_fake_dest);
GENERATE_AND_PLAY(gen_rct_tx_rct_bad_fake_mask);
GENERATE_AND_PLAY(gen_rct_tx_rct_spend_with_zero_commit);
GENERATE_AND_PLAY(gen_rct_tx_pre_rct_zero_vin_amount);
GENERATE_AND_PLAY(gen_rct_tx_rct_non_zero_vin_amount);
GENERATE_AND_PLAY(gen_rct_tx_non_zero_vout_amount);
GENERATE_AND_PLAY(gen_rct_tx_pre_rct_duplicate_key_image);
GENERATE_AND_PLAY(gen_rct_tx_rct_duplicate_key_image);
GENERATE_AND_PLAY(gen_rct_tx_pre_rct_wrong_key_image);
GENERATE_AND_PLAY(gen_rct_tx_rct_wrong_key_image);
GENERATE_AND_PLAY(gen_rct_tx_pre_rct_wrong_fee);
GENERATE_AND_PLAY(gen_rct_tx_rct_wrong_fee);
GENERATE_AND_PLAY(gen_rct_tx_pre_rct_remove_vin);
GENERATE_AND_PLAY(gen_rct_tx_rct_remove_vin);
GENERATE_AND_PLAY(gen_rct_tx_pre_rct_add_vout);
GENERATE_AND_PLAY(gen_rct_tx_rct_add_vout);
GENERATE_AND_PLAY(gen_rct_tx_pre_rct_increase_vin_and_fee);
GENERATE_AND_PLAY(gen_rct_tx_pre_rct_altered_extra);
GENERATE_AND_PLAY(gen_rct_tx_rct_altered_extra);
GENERATE_AND_PLAY(gen_v2_tx_mixable_0_mixin);
GENERATE_AND_PLAY(gen_v2_tx_mixable_low_mixin);
// GENERATE_AND_PLAY(gen_v2_tx_unmixable_only);
// GENERATE_AND_PLAY(gen_v2_tx_unmixable_one);
// GENERATE_AND_PLAY(gen_v2_tx_unmixable_two);
GENERATE_AND_PLAY(gen_v2_tx_dust);
GENERATE_AND_PLAY(gen_multisig_tx_valid_22_1_2);
GENERATE_AND_PLAY(gen_multisig_tx_valid_22_1_2_many_inputs);
GENERATE_AND_PLAY(gen_multisig_tx_valid_22_2_1);
GENERATE_AND_PLAY(gen_multisig_tx_valid_33_1_23);
GENERATE_AND_PLAY(gen_multisig_tx_valid_33_3_21);
GENERATE_AND_PLAY(gen_multisig_tx_valid_23_1_2);
GENERATE_AND_PLAY(gen_multisig_tx_valid_23_1_3);
GENERATE_AND_PLAY(gen_multisig_tx_valid_23_2_1);
GENERATE_AND_PLAY(gen_multisig_tx_valid_23_2_3);
GENERATE_AND_PLAY(gen_multisig_tx_valid_45_1_234);
GENERATE_AND_PLAY(gen_multisig_tx_valid_45_4_135_many_inputs);
GENERATE_AND_PLAY(gen_multisig_tx_valid_89_3_1245789);
GENERATE_AND_PLAY(gen_multisig_tx_invalid_23_1__no_threshold);
GENERATE_AND_PLAY(gen_multisig_tx_invalid_45_5_23_no_threshold);
GENERATE_AND_PLAY(gen_multisig_tx_invalid_22_1__no_threshold);
GENERATE_AND_PLAY(gen_multisig_tx_invalid_33_1__no_threshold);
GENERATE_AND_PLAY(gen_multisig_tx_invalid_33_1_2_no_threshold);
GENERATE_AND_PLAY(gen_multisig_tx_invalid_33_1_3_no_threshold);
GENERATE_AND_PLAY(gen_rct_tx_valid_from_pre_rct);
GENERATE_AND_PLAY(gen_rct_tx_valid_from_rct);
GENERATE_AND_PLAY(gen_rct_tx_valid_from_mixed);
GENERATE_AND_PLAY(gen_rct_tx_pre_rct_bad_real_dest);
GENERATE_AND_PLAY(gen_rct_tx_pre_rct_bad_real_mask);
GENERATE_AND_PLAY(gen_rct_tx_pre_rct_bad_fake_dest);
GENERATE_AND_PLAY(gen_rct_tx_pre_rct_bad_fake_mask);
GENERATE_AND_PLAY(gen_rct_tx_rct_bad_real_dest);
GENERATE_AND_PLAY(gen_rct_tx_rct_bad_real_mask);
GENERATE_AND_PLAY(gen_rct_tx_rct_bad_fake_dest);
GENERATE_AND_PLAY(gen_rct_tx_rct_bad_fake_mask);
GENERATE_AND_PLAY(gen_rct_tx_rct_spend_with_zero_commit);
GENERATE_AND_PLAY(gen_rct_tx_pre_rct_zero_vin_amount);
GENERATE_AND_PLAY(gen_rct_tx_rct_non_zero_vin_amount);
GENERATE_AND_PLAY(gen_rct_tx_non_zero_vout_amount);
GENERATE_AND_PLAY(gen_rct_tx_pre_rct_duplicate_key_image);
GENERATE_AND_PLAY(gen_rct_tx_rct_duplicate_key_image);
GENERATE_AND_PLAY(gen_rct_tx_pre_rct_wrong_key_image);
GENERATE_AND_PLAY(gen_rct_tx_rct_wrong_key_image);
GENERATE_AND_PLAY(gen_rct_tx_pre_rct_wrong_fee);
GENERATE_AND_PLAY(gen_rct_tx_rct_wrong_fee);
GENERATE_AND_PLAY(gen_rct_tx_pre_rct_remove_vin);
GENERATE_AND_PLAY(gen_rct_tx_rct_remove_vin);
GENERATE_AND_PLAY(gen_rct_tx_pre_rct_add_vout);
GENERATE_AND_PLAY(gen_rct_tx_rct_add_vout);
GENERATE_AND_PLAY(gen_rct_tx_pre_rct_increase_vin_and_fee);
GENERATE_AND_PLAY(gen_rct_tx_pre_rct_altered_extra);
GENERATE_AND_PLAY(gen_rct_tx_rct_altered_extra);
GENERATE_AND_PLAY(gen_multisig_tx_valid_22_1_2);
GENERATE_AND_PLAY(gen_multisig_tx_valid_22_1_2_many_inputs);
GENERATE_AND_PLAY(gen_multisig_tx_valid_22_2_1);
GENERATE_AND_PLAY(gen_multisig_tx_valid_33_1_23);
GENERATE_AND_PLAY(gen_multisig_tx_valid_33_3_21);
GENERATE_AND_PLAY(gen_multisig_tx_valid_23_1_2);
GENERATE_AND_PLAY(gen_multisig_tx_valid_23_1_3);
GENERATE_AND_PLAY(gen_multisig_tx_valid_23_2_1);
GENERATE_AND_PLAY(gen_multisig_tx_valid_23_2_3);
GENERATE_AND_PLAY(gen_multisig_tx_valid_45_1_234);
GENERATE_AND_PLAY(gen_multisig_tx_valid_45_4_135_many_inputs);
GENERATE_AND_PLAY(gen_multisig_tx_valid_89_3_1245789);
GENERATE_AND_PLAY(gen_multisig_tx_invalid_23_1__no_threshold);
GENERATE_AND_PLAY(gen_multisig_tx_invalid_45_5_23_no_threshold);
GENERATE_AND_PLAY(gen_multisig_tx_invalid_22_1__no_threshold);
GENERATE_AND_PLAY(gen_multisig_tx_invalid_33_1__no_threshold);
GENERATE_AND_PLAY(gen_multisig_tx_invalid_33_1_2_no_threshold);
GENERATE_AND_PLAY(gen_multisig_tx_invalid_33_1_3_no_threshold);
}
el::Level level = (failed_tests.empty() ? el::Level::Info : el::Level::Error);
MLOG(level, "\nREPORT:");

2
tests/core_tests/multisig.h
View File

@ -82,7 +82,7 @@ private:
template<>
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::vector<std::pair<uint8_t, uint64_t>> hard_forks = {std::make_pair(1, 0), std::make_pair(4, 1)};
const cryptonote::test_options test_options = {
hard_forks
};

2
tests/core_tests/rct.h
View File

@ -81,7 +81,7 @@ private:
template<>
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::vector<std::pair<uint8_t, uint64_t>> hard_forks = {std::make_pair(1, 0), std::make_pair(2, 1), std::make_pair(4, 65)};
const cryptonote::test_options test_options = {
hard_forks
};

64
tests/core_tests/service_nodes.h
View File

@ -34,7 +34,19 @@
/************************************************************************/
/* */
/************************************************************************/
class gen_service_nodes : public test_chain_unit_base
class test_service_nodes_base : public test_chain_unit_base {};
template<>
struct get_test_options<test_service_nodes_base>
{
const std::vector<std::pair<uint8_t, uint64_t>> hard_forks = { std::make_pair(7, 0),
std::make_pair(8, 1),
std::make_pair(9, 2) };
const cryptonote::test_options test_options = { hard_forks };
};
class gen_service_nodes : public test_service_nodes_base
{
public:
gen_service_nodes();
@ -45,31 +57,18 @@ private:
cryptonote::keypair m_alice_service_node_keys;
};
template<>
struct get_test_options<gen_service_nodes> {
const std::pair<uint8_t, uint64_t> hard_forks[3] = {std::make_pair(7, 0), std::make_pair(8, 1), std::make_pair(9, 2)};
const cryptonote::test_options test_options = {
hard_forks
};
};
template<> struct get_test_options<gen_service_nodes>: public get_test_options<test_service_nodes_base> {};
class test_prefer_deregisters : public test_chain_unit_base
class test_prefer_deregisters : public test_service_nodes_base
{
public:
test_prefer_deregisters();
bool generate(std::vector<test_event_entry> &events);
bool check_prefer_deregisters(cryptonote::core& c, size_t ev_index, const std::vector<test_event_entry> &events);
};
template<> struct get_test_options<test_prefer_deregisters>: public get_test_options<test_service_nodes_base> {};
template<>
struct get_test_options<test_prefer_deregisters> {
const std::pair<uint8_t, uint64_t> hard_forks[3] = {std::make_pair(7, 0), std::make_pair(8, 1), std::make_pair(9, 2)};
const cryptonote::test_options test_options = {
hard_forks
};
};
class test_zero_fee_deregister : public test_chain_unit_base
class test_zero_fee_deregister : public test_service_nodes_base
{
size_t m_invalid_tx_index;
@ -94,15 +93,9 @@ public:
}
};
template<>
struct get_test_options<test_zero_fee_deregister> {
const std::pair<uint8_t, uint64_t> hard_forks[3] = {std::make_pair(7, 0), std::make_pair(8, 1), std::make_pair(9, 2)};
const cryptonote::test_options test_options = {
hard_forks
};
};
template<> struct get_test_options<test_zero_fee_deregister>: public get_test_options<test_service_nodes_base> {};
class test_deregister_safety_buffer : public test_chain_unit_base
class test_deregister_safety_buffer : public test_service_nodes_base
{
size_t m_invalid_tx_index;
@ -128,15 +121,9 @@ public:
}
};
template<>
struct get_test_options<test_deregister_safety_buffer> {
const std::pair<uint8_t, uint64_t> hard_forks[3] = {std::make_pair(7, 0), std::make_pair(8, 1), std::make_pair(9, 2)};
const cryptonote::test_options test_options = {
hard_forks
};
};
template<> struct get_test_options<test_deregister_safety_buffer>: public get_test_options<test_service_nodes_base> {};
class test_deregisters_on_split : public test_chain_unit_base
class test_deregisters_on_split : public test_service_nodes_base
{
size_t m_invalid_tx_index;
@ -164,11 +151,4 @@ public:
}
};
template<>
struct get_test_options<test_deregisters_on_split>
{
const std::pair<uint8_t, uint64_t> hard_forks[3] = { std::make_pair(7, 0),
std::make_pair(8, 1),
std::make_pair(9, 2) };
const cryptonote::test_options test_options = { hard_forks };
};
template<> struct get_test_options<test_deregisters_on_split>: public get_test_options<test_service_nodes_base> {};

2
tests/core_tests/v2_tests.h
View File

@ -79,7 +79,7 @@ private:
template<>
struct get_test_options<gen_v2_tx_validation_base> {
const std::pair<uint8_t, uint64_t> hard_forks[3] = {std::make_pair(1, 0), std::make_pair(2, 1), std::make_pair(0, 0)};
const std::vector<std::pair<uint8_t, uint64_t>> hard_forks = {std::make_pair(1, 0), std::make_pair(2, 1)};
const cryptonote::test_options test_options = {
hard_forks
};