mirror of
https://github.com/monero-project/monero.git
synced 2024-10-01 11:49:47 -04:00
More missed readline dependencies thru scoped_message_writer
This commit is contained in:
parent
e35162b366
commit
987eb662bf
@ -59,7 +59,6 @@ using namespace epee;
|
||||
#include "rapidjson/stringbuffer.h"
|
||||
#include "common/json_util.h"
|
||||
#include "common/base58.h"
|
||||
#include "common/scoped_message_writer.h"
|
||||
#include "ringct/rctSigs.h"
|
||||
|
||||
extern "C"
|
||||
@ -374,8 +373,7 @@ std::unique_ptr<tools::wallet2> generate_from_json(const std::string& json_file,
|
||||
}
|
||||
else
|
||||
{
|
||||
tools::fail_msg_writer() << tools::wallet2::tr("Address must be specified in order to create watch-only wallet");
|
||||
return false;
|
||||
THROW_WALLET_EXCEPTION(tools::error::wallet_internal_error, tools::wallet2::tr("Address must be specified in order to create watch-only wallet"));
|
||||
}
|
||||
wallet->generate(field_filename, field_password, address, viewkey);
|
||||
}
|
||||
|
@ -38,7 +38,6 @@ using namespace epee;
|
||||
#include "wallet/wallet_args.h"
|
||||
#include "common/command_line.h"
|
||||
#include "common/i18n.h"
|
||||
#include "common/scoped_message_writer.h"
|
||||
#include "cryptonote_basic/cryptonote_format_utils.h"
|
||||
#include "cryptonote_basic/account.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>]",
|
||||
desc_params,
|
||||
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",
|
||||
true
|
||||
);
|
||||
|
Loading…
Reference in New Issue
Block a user