monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-17 16:27:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2814

Browse source 
987eb662 More missed readline dependencies thru scoped_message_writer (Howard Chu)
This commit is contained in:
Riccardo Spagni 2017-11-15 00:47:28 +02:00
commit 0ddf3b6c75
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/wallet/wallet2.cpp
View file

@ -59,7 +59,6 @@ using namespace epee;
#include "rapidjson/stringbuffer.h" #include "rapidjson/stringbuffer.h"
#include "common/json_util.h" #include "common/json_util.h"
#include "common/base58.h" #include "common/base58.h"
#include "common/scoped_message_writer.h"
#include "ringct/rctSigs.h" #include "ringct/rctSigs.h"
extern "C" extern "C"
@ -374,8 +373,7 @@ std::unique_ptr<tools::wallet2> generate_from_json(const std::string& json_file,
} }
else else
{ {
tools::fail_msg_writer() << tools::wallet2::tr("Address must be specified in order to create watch-only wallet"); THROW_WALLET_EXCEPTION(tools::error::wallet_internal_error, tools::wallet2::tr("Address must be specified in order to create watch-only wallet"));
return false;
} }
wallet->generate(field_filename, field_password, address, viewkey); wallet->generate(field_filename, field_password, address, viewkey);
} }

3
src/wallet/wallet_rpc_server.cpp
View file

@ -38,7 +38,6 @@ using namespace epee;
#include "wallet/wallet_args.h" #include "wallet/wallet_args.h"
#include "common/command_line.h" #include "common/command_line.h"
#include "common/i18n.h" #include "common/i18n.h"
#include "common/scoped_message_writer.h"
#include "cryptonote_basic/cryptonote_format_utils.h" #include "cryptonote_basic/cryptonote_format_utils.h"
#include "cryptonote_basic/account.h" #include "cryptonote_basic/account.h"
#include "wallet_rpc_server_commands_defs.h" #include "wallet_rpc_server_commands_defs.h"
@ -1982,7 +1981,7 @@ int main(int argc, char** argv) {
"monero-wallet-rpc [--wallet-file=<file>|--generate-from-json=<file>|--wallet-dir=<directory>] [--rpc-bind-port=<port>]", "monero-wallet-rpc [--wallet-file=<file>|--generate-from-json=<file>|--wallet-dir=<directory>] [--rpc-bind-port=<port>]",
desc_params, desc_params,
po::positional_options_description(), po::positional_options_description(),
[](const std::string &s, bool emphasis){ tools::scoped_message_writer(emphasis ? epee::console_color_white : epee::console_color_default, true) << s; }, [](const std::string &s, bool emphasis){ epee::set_console_color(emphasis ? epee::console_color_white : epee::console_color_default, true); std::cout << s << std::endl; if (emphasis) epee::reset_console_color(); },
"monero-wallet-rpc.log", "monero-wallet-rpc.log",
true true
); );