From 19f0f0bbf07a50ed803b14848c3d6672593e648b Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Mon, 10 Oct 2022 20:46:06 +0200 Subject: [PATCH] fixed but with sequence points --- src/currency_core/currency_format_utils.cpp | 4 ++-- tests/core_tests/chaingen_main.cpp | 8 +++++++- tests/core_tests/multiassets_test.cpp | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/currency_core/currency_format_utils.cpp b/src/currency_core/currency_format_utils.cpp index 4726c405..3c630e5d 100644 --- a/src/currency_core/currency_format_utils.cpp +++ b/src/currency_core/currency_format_utils.cpp @@ -1580,7 +1580,6 @@ namespace currency ftp.tx_outs_attr = tx_outs_attr; ftp.shuffle = shuffle; ftp.flags = flags; - ftp.tx_version; finalized_tx ft = AUTO_VAL_INIT(ft); ft.tx = tx; @@ -1832,7 +1831,8 @@ namespace currency //fill inputs NLSAG and Zarcanum for (const tx_source_entry& src_entr : sources) { - inputs_mapping[current_index] = current_index++; + inputs_mapping[current_index] = current_index; + current_index++; in_contexts.push_back(input_generation_context_data()); if(src_entr.is_multisig()) {//multisig input diff --git a/tests/core_tests/chaingen_main.cpp b/tests/core_tests/chaingen_main.cpp index 64c68ac1..3c98be09 100644 --- a/tests/core_tests/chaingen_main.cpp +++ b/tests/core_tests/chaingen_main.cpp @@ -1060,7 +1060,13 @@ int main(int argc, char* argv[]) GENERATE_AND_PLAY(isolate_auditable_and_proof); GENERATE_AND_PLAY(zarcanum_basic_test); - GENERATE_AND_PLAY(multiassets_basic_test); + + stop_on_first_fail = true; + for (uint64_t i = 0; i != 30; i++) + { + multiassets_basic_test::ts_starter = i; + GENERATE_AND_PLAY(multiassets_basic_test); + } diff --git a/tests/core_tests/multiassets_test.cpp b/tests/core_tests/multiassets_test.cpp index 333c714c..f4de2b3a 100644 --- a/tests/core_tests/multiassets_test.cpp +++ b/tests/core_tests/multiassets_test.cpp @@ -22,8 +22,8 @@ multiassets_basic_test::multiassets_basic_test() { // TODO: remove the following line - //LOG_PRINT_MAGENTA("STARTER TS: " << ts_starter, LOG_LEVEL_0); - //random_state_test_restorer::reset_random(ts_starter); + LOG_PRINT_MAGENTA("STARTER TS: " << ts_starter, LOG_LEVEL_0); + random_state_test_restorer::reset_random(ts_starter); REGISTER_CALLBACK_METHOD(multiassets_basic_test, configure_core); REGISTER_CALLBACK_METHOD(multiassets_basic_test, c1);