From f1815da10699656cf52854842aaf75b2e115df6a Mon Sep 17 00:00:00 2001 From: sowle Date: Wed, 12 Apr 2023 04:55:17 +0200 Subject: [PATCH] coretests: hardfork 3 set to be default for tests + defaults initialization --- src/currency_core/currency_config.h | 6 +++--- tests/core_tests/chaingen.cpp | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/currency_core/currency_config.h b/src/currency_core/currency_config.h index e4fea06a..8e70a2be 100644 --- a/src/currency_core/currency_config.h +++ b/src/currency_core/currency_config.h @@ -254,9 +254,9 @@ #else /////// Zarcanum Testnet Pre-Alpha ////////////////////////////// #define ZANO_HARDFORK_01_AFTER_HEIGHT 1 -#define ZANO_HARDFORK_02_AFTER_HEIGHT 2 -#define ZANO_HARDFORK_03_AFTER_HEIGHT 3 -#define ZANO_HARDFORK_04_AFTER_HEIGHT 4 +#define ZANO_HARDFORK_02_AFTER_HEIGHT 1 +#define ZANO_HARDFORK_03_AFTER_HEIGHT 1 +#define ZANO_HARDFORK_04_AFTER_HEIGHT CURRENCY_MAX_BLOCK_NUMBER #endif diff --git a/tests/core_tests/chaingen.cpp b/tests/core_tests/chaingen.cpp index 7cc89593..91a64249 100644 --- a/tests/core_tests/chaingen.cpp +++ b/tests/core_tests/chaingen.cpp @@ -2286,6 +2286,8 @@ test_chain_unit_enchanced::test_chain_unit_enchanced() REGISTER_CALLBACK_METHOD(test_chain_unit_enchanced, check_offers_count); REGISTER_CALLBACK_METHOD(test_chain_unit_enchanced, check_hardfork_active); REGISTER_CALLBACK_METHOD(test_chain_unit_enchanced, check_hardfork_inactive); + + m_hardforks = get_default_core_runtime_config().hard_forks; // set default hardforks for tests (will be overriden by test if necessary) } bool test_chain_unit_enchanced::configure_core(currency::core& c, size_t ev_index, const std::vector& events)