Merge pull request #5409

ac874e2d tests: fix test_options initialization error (Dusan Klinec)

5 files changed, 6 insertions, 6 deletions

diff --git a/tests/core_tests/bulletproofs.h b/tests/core_tests/bulletproofs.h
index efc751df7..f9768a316 100644
--- a/tests/core_tests/bulletproofs.h
+++ b/tests/core_tests/bulletproofs.h
@@ -97,7 +97,7 @@ template<>
 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 cryptonote::test_options test_options = {
-    hard_forks
+    hard_forks, 0
   };
 };
 
diff --git a/tests/core_tests/chaingen.h b/tests/core_tests/chaingen.h
index 2ecbdc436..797d1207b 100644
--- a/tests/core_tests/chaingen.h
+++ b/tests/core_tests/chaingen.h
@@ -763,7 +763,7 @@ template<typename t_test_class>
 struct get_test_options {
   const std::pair<uint8_t, uint64_t> hard_forks[2];
   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)}{}
 };
@@ -791,7 +791,7 @@ inline bool do_replay_events_get_core(std::vector<test_event_entry>& events, cry
 
   // Hardforks can be specified in events.
   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;
   if (extract_hard_forks(events, hardforks)){
     hardforks.push_back(std::make_pair((uint8_t)0, (uint64_t)0));  // terminator
diff --git a/tests/core_tests/multisig.h b/tests/core_tests/multisig.h
index 1e8226d26..10fe6ffe8 100644
--- a/tests/core_tests/multisig.h
+++ b/tests/core_tests/multisig.h
@@ -84,7 +84,7 @@ 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 cryptonote::test_options test_options = {
-    hard_forks
+    hard_forks, 0
   };
 };
 
diff --git a/tests/core_tests/rct.h b/tests/core_tests/rct.h
index 72460d98e..00a2bd88c 100644
--- a/tests/core_tests/rct.h
+++ b/tests/core_tests/rct.h
@@ -83,7 +83,7 @@ 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 cryptonote::test_options test_options = {
-    hard_forks
+    hard_forks, 0
   };
 };
 
diff --git a/tests/trezor/trezor_tests.cpp b/tests/trezor/trezor_tests.cpp
index 31c2471ec..a867a4047 100644
--- a/tests/trezor/trezor_tests.cpp
+++ b/tests/trezor/trezor_tests.cpp
@@ -304,7 +304,7 @@ static bool init_core_replay_events(std::vector<test_event_entry>& events, crypt
 
   // Hardforks can be specified in events.
   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;
   if (extract_hard_forks(events, hardforks)){
     hardforks.push_back(std::make_pair((uint8_t)0, (uint64_t)0));  // terminator