diff --git a/src/simplewallet/simplewallet.h b/src/simplewallet/simplewallet.h index 1073db08..6091dfd8 100644 --- a/src/simplewallet/simplewallet.h +++ b/src/simplewallet/simplewallet.h @@ -105,7 +105,7 @@ namespace currency uint64_t get_daemon_blockchain_height(std::string& err); bool try_connect_to_daemon(); std::string get_tocken_info_string(const crypto::public_key& asset_id, uint64_t& decimal_point); - bool simple_wallet::print_wti(const tools::wallet_public::wallet_transfer_info& wti); + bool print_wti(const tools::wallet_public::wallet_transfer_info& wti); //----------------- i_wallet2_callback --------------------- virtual void on_new_block(uint64_t height, const currency::block& block) override; diff --git a/tests/performance_tests/check_ring_signature.h b/tests/performance_tests/check_ring_signature.h index d53b70bf..f27d31a5 100644 --- a/tests/performance_tests/check_ring_signature.h +++ b/tests/performance_tests/check_ring_signature.h @@ -36,7 +36,7 @@ public: std::vector destinations; destinations.push_back(tx_destination_entry(this->m_source_amount, m_alice.get_keys().account_address)); - if (!construct_tx(this->m_miners[this->real_source_idx].get_keys(), this->m_sources, destinations, m_tx, 0)) + if (!construct_tx(this->m_miners[this->real_source_idx].get_keys(), this->m_sources, destinations, std::vector(), m_tx, 0, 0)) return false; get_transaction_prefix_hash(m_tx, m_tx_prefix_hash); @@ -47,7 +47,7 @@ public: bool test() { const currency::txin_to_key& txin = boost::get(m_tx.vin[0]); - return crypto::check_ring_signature(m_tx_prefix_hash, txin.k_image, this->m_public_key_ptrs, ring_size, boost::get(m_tx.signatures[0]).s.data()); + return crypto::check_ring_signature(m_tx_prefix_hash, txin.k_image, this->m_public_key_ptrs, ring_size, boost::get(m_tx.signatures[0]).s.data()); } private: diff --git a/tests/performance_tests/multi_tx_test_base.h b/tests/performance_tests/multi_tx_test_base.h index dc0f5c55..e78ec708 100644 --- a/tests/performance_tests/multi_tx_test_base.h +++ b/tests/performance_tests/multi_tx_test_base.h @@ -29,11 +29,12 @@ public: { m_miners[i].generate(); - if (!construct_miner_tx(0, 0, 0, 2, 0, m_miners[i].get_keys().m_account_address, m_miner_txs[i], TRANSACTION_VERSION_PRE_HF4)) + uint64_t block_reward_without_fee = 0; + if (!construct_miner_tx(0, 0, 0, 2, 0, m_miners[i].get_public_address(), m_miners[i].get_public_address(), m_miner_txs[i], block_reward_without_fee, TRANSACTION_VERSION_PRE_HF4)) return false; txout_to_key tx_out = boost::get(boost::get(m_miner_txs[i].vout[0]).target); - output_entries.push_back(make_serializable_pair(i, tx_out.key)); + output_entries.emplace_back(i, tx_out.key); m_public_keys[i] = tx_out.key; m_public_key_ptrs[i] = &m_public_keys[i]; }