monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-25 04:59:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1665

Browse source 
34719071 simplewallet: cleanup (moneromooo-monero)
a9a9b64b simplewallet: fix build (unqualified type not in current scope) (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-02-04 17:21:11 +02:00
commit bcb7b0a9af
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/simplewallet/simplewallet.cpp
View file

@ -388,7 +388,7 @@ bool simple_wallet::change_password(const std::vector<std::string> &args)
m_wallet->rewrite(m_wallet_file, pwd_container->password()); m_wallet->rewrite(m_wallet_file, pwd_container->password());
m_wallet->store(); m_wallet->store();
} }
catch (const wallet_logic_error& e) catch (const tools::error::wallet_logic_error& e)
{ {
fail_msg_writer() << tr("Error with wallet rewrite: ") << e.what(); fail_msg_writer() << tr("Error with wallet rewrite: ") << e.what();
return false; return false;
@ -923,10 +923,6 @@ void simple_wallet::print_seed(std::string seed)
std::cout << seed << std::endl; std::cout << seed << std::endl;
} }
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------
static bool is_local_daemon(const std::string &address)
{
}
//----------------------------------------------------------------------------------------------------
bool simple_wallet::init(const boost::program_options::variables_map& vm) bool simple_wallet::init(const boost::program_options::variables_map& vm)
{ {
if (!handle_command_line(vm)) if (!handle_command_line(vm))
@ -4344,7 +4340,6 @@ int main(int argc, char* argv[])
const bool r = w.init(*vm); const bool r = w.init(*vm);
CHECK_AND_ASSERT_MES(r, 1, sw::tr("Failed to initialize wallet")); CHECK_AND_ASSERT_MES(r, 1, sw::tr("Failed to initialize wallet"));
try{ throw 1; } catch(...){}
std::vector<std::string> command = command_line::get_arg(*vm, arg_command); std::vector<std::string> command = command_line::get_arg(*vm, arg_command);
if (!command.empty()) if (!command.empty())
{ {