lthn/blockchain
2
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

coretests: init_spent_output_indices fix, warnings fix

Browse source
This commit is contained in:
sowle 2022-10-26 20:50:21 +02:00
parent d738a34275
commit f5a0a85fa4
No known key found for this signature in database
GPG key ID: C07A24B2D89D49FC
4 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/crypto/clsag.cpp
View file

@ -9,6 +9,8 @@
//#include "misc_log_ex.h"
#include "../currency_core/crypto_config.h"
DISABLE_GCC_AND_CLANG_WARNING(unused-function)
namespace crypto
{
#define DBG_VAL_PRINT(x) (void(0)) // std::cout << #x ": " << x << std::endl

6
tests/core_tests/chaingen.cpp
View file

@ -594,6 +594,7 @@ bool test_generator::build_outputs_indext_for_chain(const blockchain_vector& blo
return true;
}
//------------------------------------------------------------------
/* not used, consider removing
bool test_generator::get_output_details_by_global_index(const test_generator::blockchain_vector& blck_chain,
const test_generator::outputs_index& indexes,
uint64_t amount,
@ -629,6 +630,7 @@ bool test_generator::get_output_details_by_global_index(const test_generator::bl
output_key = boost::get<currency::txout_to_key>(boost::get<tx_out_bare>(tx->vout[tx_out_index]).target).key;
return true;
}
*/
//------------------------------------------------------------------
bool test_generator::build_stake_modifier(stake_modifier_type& sm, const test_generator::blockchain_vector& blck_chain)
@ -1068,9 +1070,7 @@ bool init_spent_output_indices(map_output_idx_t& outs, map_output_t& outs_mine,
};
for(auto& tx_pair : mtx)
{
CHECK_AND_ASSERT_MES(add_key_images_from_tx(*tx_pair.second), false, "insertion of spent key image failed for tx " << get_transaction_hash(*tx_pair.second));
}
add_key_images_from_tx(*tx_pair.second); // some key images may be added more than once (because invalid txs can't be detected here), ignore that
for (auto& b : blockchain)
{

4
tests/core_tests/chaingen.h
View file

@ -444,7 +444,7 @@ public:
const crypto::scalar_t& blinding_masks_sum,
currency::block& b);
bool get_output_details_by_global_index(const test_generator::blockchain_vector& blck_chain,
/*bool get_output_details_by_global_index(const test_generator::blockchain_vector& blck_chain,
const test_generator::outputs_index& indexes,
uint64_t amount,
uint64_t global_index,
@ -452,7 +452,7 @@ public:
const currency::transaction* tx,
uint64_t& tx_out_index,
crypto::public_key& tx_pub_key,
crypto::public_key& output_key);
crypto::public_key& output_key);*/

3
tests/core_tests/zarcanum_test.h
View file

@ -24,5 +24,6 @@ struct zarcanum_pos_block_math : public wallet_test
{
zarcanum_pos_block_math();
bool generate(std::vector<test_event_entry>& events) const;
bool zarcanum_pos_block_math::c1(currency::core& c, size_t ev_index, const std::vector<test_event_entry>& events);
bool c1(currency::core& c, size_t ev_index, const std::vector<test_event_entry>& events);
};
};