Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-29 08:06:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1976

Browse Source 
a7d78dda wallet2: fix --generate-from-json in RPC mode (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-04-24 10:48:56 +02:00
commit ae1d816768
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/wallet/wallet2.cpp
View File

@ -213,8 +213,10 @@ boost::optional<tools::password_container> get_password(const boost::program_opt
return tools::wallet2::password_prompt(verify); return tools::wallet2::password_prompt(verify);
} }
std::unique_ptr<tools::wallet2> generate_from_json(const std::string& json_file, bool testnet, bool restricted) std::unique_ptr<tools::wallet2> generate_from_json(const std::string& json_file, const boost::program_options::variables_map& vm, const options& opts)
{ {
const bool testnet = command_line::get_arg(vm, opts.testnet);
/* GET_FIELD_FROM_JSON_RETURN_ON_ERROR Is a generic macro that can return /* GET_FIELD_FROM_JSON_RETURN_ON_ERROR Is a generic macro that can return
false. Gcc will coerce this into unique_ptr(nullptr), but clang correctly false. Gcc will coerce this into unique_ptr(nullptr), but clang correctly
fails. This large wrapper is for the use of that macro */ fails. This large wrapper is for the use of that macro */
@ -355,7 +357,7 @@ std::unique_ptr<tools::wallet2> generate_from_json(const std::string& json_file,
return false; return false;
} }
wallet.reset(new tools::wallet2(testnet, restricted)); wallet.reset(make_basic(vm, opts).release());
wallet->set_refresh_from_block_height(field_scan_from_height); wallet->set_refresh_from_block_height(field_scan_from_height);
try try
@ -467,7 +469,7 @@ boost::optional<password_container> wallet2::password_prompt(const bool new_pass
std::unique_ptr<wallet2> wallet2::make_from_json(const boost::program_options::variables_map& vm, const std::string& json_file) std::unique_ptr<wallet2> wallet2::make_from_json(const boost::program_options::variables_map& vm, const std::string& json_file)
{ {
const options opts{}; const options opts{};
return generate_from_json(json_file, command_line::get_arg(vm, opts.testnet), command_line::get_arg(vm, opts.restricted)); return generate_from_json(json_file, vm, opts);
} }
std::pair<std::unique_ptr<wallet2>, password_container> wallet2::make_from_file( std::pair<std::unique_ptr<wallet2>, password_container> wallet2::make_from_file(