From 52de76edd5890dfa4fed651637e7bb3ffe2c4d10 Mon Sep 17 00:00:00 2001
From: cryptozoidberg <crypto.zoidberg@gmail.com>
Date: Wed, 6 Jul 2022 13:22:05 +0200
Subject: [PATCH] hidden amounts in wallet: fixed types

---
 src/wallet/wallet2.cpp                 | 2 +-
 tests/core_tests/chain_switch_1.cpp    | 4 ++--
 tests/core_tests/ring_signature_1.cpp  | 2 +-
 tests/core_tests/transaction_tests.cpp | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index bcaeee42..d929e583 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -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))
   {
diff --git a/tests/core_tests/chain_switch_1.cpp b/tests/core_tests/chain_switch_1.cpp
index c0f3d001..a579515f 100644
--- a/tests/core_tests/chain_switch_1.cpp
+++ b/tests/core_tests/chain_switch_1.cpp
@@ -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);
diff --git a/tests/core_tests/ring_signature_1.cpp b/tests/core_tests/ring_signature_1.cpp
index a77b7342..12ea6f9e 100644
--- a/tests/core_tests/ring_signature_1.cpp
+++ b/tests/core_tests/ring_signature_1.cpp
@@ -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);
diff --git a/tests/core_tests/transaction_tests.cpp b/tests/core_tests/transaction_tests.cpp
index 29adf651..5fc89e29 100644
--- a/tests/core_tests/transaction_tests.cpp
+++ b/tests/core_tests/transaction_tests.cpp
@@ -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);