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

hidden amounts in wallet: fixed types

Browse source
This commit is contained in:
cryptozoidberg 2022-07-06 13:22:05 +02:00
parent 572f3c01c6
commit 52de76edd5
No known key found for this signature in database
GPG key ID: 22DEB97A54C6FDEC
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/wallet/wallet2.cpp
View file

@ -354,7 +354,7 @@ const currency::txout_htlc& out_get_htlc(const currency::tx_out_v& out_t)
return boost::get<currency::txout_htlc>(boost::get<currency::tx_out_bare>(out_t).target);
}
bool wallet2::out_get_mixin_attr(const currency::tx_out_v& out_t)
uint8_t wallet2::out_get_mixin_attr(const currency::tx_out_v& out_t)
{
if (out_t.type() == typeid(currency::tx_out_bare))
{

4
tests/core_tests/chain_switch_1.cpp
View file

@ -160,7 +160,7 @@ bool gen_chain_switch_1::check_split_not_switched(currency::core& c, size_t ev_i
CHECK_TEST_CONDITION(r);
CHECK_EQ(1, tx_pool.size());
std::vector<size_t> tx_outs;
std::vector<wallet_out_info> tx_outs;
uint64_t transfered;
crypto::key_derivation derivation = AUTO_VAL_INIT(derivation);
lookup_acc_outs(m_recipient_account_4.get_keys(), tx_pool.front(), get_tx_pub_key_from_extra(tx_pool.front()), tx_outs, transfered, derivation);
@ -223,7 +223,7 @@ bool gen_chain_switch_1::check_split_switched(currency::core& c, size_t ev_index
CHECK_EQ(1, tx_pool.size());
CHECK_TEST_CONDITION(!(tx_pool.front() == m_tx_pool.front()));
std::vector<size_t> tx_outs;
std::vector<wallet_out_info> tx_outs;
uint64_t transfered;
crypto::key_derivation derivation = AUTO_VAL_INIT(derivation);
lookup_acc_outs(m_recipient_account_2.get_keys(), tx_pool.front(), tx_outs, transfered, derivation);

2
tests/core_tests/ring_signature_1.cpp
View file

@ -310,7 +310,7 @@ bool gen_ring_signature_big::check_balances_2(currency::core& c, size_t ev_index
CHECK_EQ(balance, get_balance(an_account, chain, mtx));
}
std::vector<size_t> tx_outs;
std::vector<wallet_out_info> tx_outs;
uint64_t transfered;
crypto::key_derivation derivation = AUTO_VAL_INIT(derivation);
lookup_acc_outs(m_alice_account.get_keys(), boost::get<transaction>(events[events.size() - 3]), get_tx_pub_key_from_extra(boost::get<transaction>(events[events.size() - 3])), tx_outs, transfered, derivation);

2
tests/core_tests/transaction_tests.cpp
View file

@ -113,7 +113,7 @@ bool test_transaction_generation_and_ring_signature()
r = crypto::check_ring_signature(pref_hash, boost::get<txin_to_key>(tx_rc1.vin[0]).k_image, output_keys, &boost::get<currency::NLSAG_sig>(tx_rc1.signatures[0]).s[0]);
CHECK_AND_ASSERT_MES(r, false, "failed to check ring signature");
std::vector<size_t> outs;
std::vector<wallet_out_info> outs;
uint64_t money = 0;
crypto::key_derivation derivation = AUTO_VAL_INIT(derivation);
r = lookup_acc_outs(rv_acc.get_keys(), tx_rc1, get_tx_pub_key_from_extra(tx_rc1), outs, money, derivation);