Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

fixed but with sequence points

Browse source
This commit is contained in:
cryptozoidberg 2022-10-10 20:46:06 +02:00
parent 033ec29d60
commit 19f0f0bbf0
No known key found for this signature in database
GPG key ID: 22DEB97A54C6FDEC
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/currency_core/currency_format_utils.cpp
View file

@ -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

8
tests/core_tests/chaingen_main.cpp
View file

@ -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);
}

4
tests/core_tests/multiassets_test.cpp
View file

@ -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);