fixed nettype in call to seed and keys from mnemonic and removed defaults from those args to prevent similar

pull/29/head
Paul Shapiro 6 years ago
parent 8c17ae4766
commit 30d08919b0

@ -123,12 +123,12 @@ namespace monero_wallet_utils
bool new_wallet(
const string &mnemonic_language,
WalletDescriptionRetVals &retVals,
network_type nettype = MAINNET
network_type nettype
);
bool wallet_with(
const string &mnemonic_string,
WalletDescriptionRetVals &retVals,
network_type nettype = MAINNET
network_type nettype
);
//
struct WalletComponentsValidationResults: RetVals_base

@ -305,7 +305,8 @@ string serial_bridge::seed_and_keys_from_mnemonic(const string &args_string)
monero_wallet_utils::WalletDescriptionRetVals retVals;
bool r = monero_wallet_utils::wallet_with(
json_root.get<string>("mnemonic_string"),
retVals
retVals,
nettype_from_string(json_root.get<string>("nettype_string"))
);
bool did_error = retVals.did_error;
if (!r) {

@ -708,6 +708,7 @@ BOOST_AUTO_TEST_CASE(bridged__seed_and_keys_from_mnemonic)
//
boost::property_tree::ptree root;
root.put("mnemonic_string", "foxe selfish hum nexus juven dodeg pepp ember biscuti elap jazz vibrate biscui");
root.put("nettype_string", string_from_nettype(MAINNET));
//
auto ret_string = serial_bridge::seed_and_keys_from_mnemonic(args_string_from_root(root));
stringstream ret_stream;

Loading…
Cancel
Save