4rkal/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-14 04:16:32 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #455

Browse Source 
6df4e67 Fix a possibly-unused warning, and rationalize types (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2015-10-30 09:57:35 +02:00
commit 62b0984e65
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/simplewallet/simplewallet.cpp
View File

@ -1104,12 +1104,12 @@ bool simple_wallet::refresh(const std::vector<std::string>& args)
message_writer() << tr("Starting refresh..."); message_writer() << tr("Starting refresh...");
size_t fetched_blocks = 0; uint64_t fetched_blocks = 0;
size_t start_height = 0; uint64_t start_height = 0;
if(!args.empty()){ if(!args.empty()){
try try
{ {
start_height = boost::lexical_cast<int>( args[0] ); start_height = boost::lexical_cast<uint64_t>( args[0] );
} }
catch(const boost::bad_lexical_cast &) catch(const boost::bad_lexical_cast &)
{ {

10
src/wallet/wallet2.cpp
View File

@ -349,7 +349,7 @@ void wallet2::get_short_chain_history(std::list<crypto::hash>& ids) const
ids.push_back(m_blockchain[0]); ids.push_back(m_blockchain[0]);
} }
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------
void wallet2::pull_blocks(uint64_t start_height, size_t& blocks_added) void wallet2::pull_blocks(uint64_t start_height, uint64_t& blocks_added)
{ {
blocks_added = 0; blocks_added = 0;
cryptonote::COMMAND_RPC_GET_BLOCKS_FAST::request req = AUTO_VAL_INIT(req); cryptonote::COMMAND_RPC_GET_BLOCKS_FAST::request req = AUTO_VAL_INIT(req);
@ -400,17 +400,17 @@ void wallet2::refresh()
refresh(0, blocks_fetched); refresh(0, blocks_fetched);
} }
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------
void wallet2::refresh(uint64_t start_height, size_t & blocks_fetched) void wallet2::refresh(uint64_t start_height, uint64_t & blocks_fetched)
{ {
bool received_money = false; bool received_money = false;
refresh(start_height, blocks_fetched, received_money); refresh(start_height, blocks_fetched, received_money);
} }
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------
void wallet2::refresh(uint64_t start_height, size_t & blocks_fetched, bool& received_money) void wallet2::refresh(uint64_t start_height, uint64_t & blocks_fetched, bool& received_money)
{ {
received_money = false; received_money = false;
blocks_fetched = 0; blocks_fetched = 0;
size_t added_blocks = 0; uint64_t added_blocks = 0;
size_t try_count = 0; size_t try_count = 0;
crypto::hash last_tx_hash_id = m_transfers.size() ? get_transaction_hash(m_transfers.back().m_tx) : null_hash; crypto::hash last_tx_hash_id = m_transfers.size() ? get_transaction_hash(m_transfers.back().m_tx) : null_hash;
@ -444,7 +444,7 @@ void wallet2::refresh(uint64_t start_height, size_t & blocks_fetched, bool& rece
LOG_PRINT_L1("Refresh done, blocks received: " << blocks_fetched << ", balance: " << print_money(balance()) << ", unlocked: " << print_money(unlocked_balance())); LOG_PRINT_L1("Refresh done, blocks received: " << blocks_fetched << ", balance: " << print_money(balance()) << ", unlocked: " << print_money(unlocked_balance()));
} }
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------
bool wallet2::refresh(size_t & blocks_fetched, bool& received_money, bool& ok) bool wallet2::refresh(uint64_t & blocks_fetched, bool& received_money, bool& ok)
{ {
try try
{ {

8
src/wallet/wallet2.h
View File

@ -213,9 +213,9 @@ namespace tools
*/ */
bool is_deprecated() const; bool is_deprecated() const;
void refresh(); void refresh();
void refresh(uint64_t start_height, size_t & blocks_fetched); void refresh(uint64_t start_height, uint64_t & blocks_fetched);
void refresh(uint64_t start_height, size_t & blocks_fetched, bool& received_money); void refresh(uint64_t start_height, uint64_t & blocks_fetched, bool& received_money);
bool refresh(size_t & blocks_fetched, bool& received_money, bool& ok); bool refresh(uint64_t & blocks_fetched, bool& received_money, bool& ok);
bool testnet() const { return m_testnet; } bool testnet() const { return m_testnet; }
bool restricted() const { return m_restricted; } bool restricted() const { return m_restricted; }
@ -318,7 +318,7 @@ namespace tools
bool is_tx_spendtime_unlocked(uint64_t unlock_time) const; bool is_tx_spendtime_unlocked(uint64_t unlock_time) const;
bool is_transfer_unlocked(const transfer_details& td) const; bool is_transfer_unlocked(const transfer_details& td) const;
bool clear(); bool clear();
void pull_blocks(uint64_t start_height, size_t& blocks_added); void pull_blocks(uint64_t start_height, uint64_t& blocks_added);
uint64_t select_transfers(uint64_t needed_money, bool add_dust, uint64_t dust, std::list<transfer_container::iterator>& selected_transfers); uint64_t select_transfers(uint64_t needed_money, bool add_dust, uint64_t dust, std::list<transfer_container::iterator>& selected_transfers);
bool prepare_file_names(const std::string& file_path); bool prepare_file_names(const std::string& file_path);
void process_unconfirmed(const cryptonote::transaction& tx); void process_unconfirmed(const cryptonote::transaction& tx);