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

fixed multisig_and_checkpoints

Browse source
This commit is contained in:
cryptozoidberg 2023-05-19 19:21:02 +02:00
parent fdf6f3722a
commit 11939bc4b6
No known key found for this signature in database
GPG key ID: 22DEB97A54C6FDEC
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tests/core_tests/chaingen.cpp
View file

@ -164,10 +164,18 @@ void test_generator::add_block_info(const block_info& bi)
m_blocks_info[block_hash] = bi;
std::stringstream ss_tx_hashes;
auto it = bi.m_transactions.begin();
for (auto& h : bi.b.tx_hashes)
{
ss_tx_hashes << " [tx]: " << h << ENDL;
if (it != bi.m_transactions.end())
{
ss_tx_hashes << obj_to_json_str(*it) << ENDL;
it++;
}
}
LOG_PRINT_MAGENTA("ADDED_BLOCK[" << block_hash << "][" << (is_pos_block(bi.b)? "PoS":"PoW") <<"][" << get_block_height(bi.b) << "][cumul_diff:" << bi.cumul_difficulty << "]" << ENDL << ss_tx_hashes.str(), LOG_LEVEL_0);
}

2
tests/core_tests/multisig_wallet_tests.cpp
View file

@ -1843,7 +1843,7 @@ bool multisig_and_checkpoints_bad_txs::generate(std::vector<test_event_entry>& e
r = fill_tx_sources_and_destinations(events, blk_0r, miner_acc.get_keys(), to_addrs, amount, TESTS_DEFAULT_FEE, 0, sources, destinations, true, true, 1);
CHECK_AND_ASSERT_MES(r, false, "fill_tx_sources_and_destinations failed");
transaction tx_1 = AUTO_VAL_INIT(tx_1);
r = construct_tx(miner_acc.get_keys(), sources, destinations, empty_attachment, tx_1, 0, CURRENCY_TO_KEY_OUT_RELAXED, true);
r = construct_tx(miner_acc.get_keys(), sources, destinations, empty_attachment, tx_1, TRANSACTION_VERSION_PRE_HF4, CURRENCY_TO_KEY_OUT_RELAXED, true);
CHECK_AND_ASSERT_MES(r, false, "construct_tx");
events.push_back(event_visitor_settings(event_visitor_settings::set_txs_kept_by_block, true)); // tx_1 goes with the block blk_1