From 30d08919b05c317020e255df548632900e504212 Mon Sep 17 00:00:00 2001 From: Paul Shapiro Date: Fri, 24 Aug 2018 16:33:19 -0400 Subject: [PATCH] fixed nettype in call to seed and keys from mnemonic and removed defaults from those args to prevent similar --- src/monero_wallet_utils.hpp | 4 ++-- src/serial_bridge_index.cpp | 3 ++- test/test_all.cpp | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/monero_wallet_utils.hpp b/src/monero_wallet_utils.hpp index 57d051d..5be5248 100644 --- a/src/monero_wallet_utils.hpp +++ b/src/monero_wallet_utils.hpp @@ -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 diff --git a/src/serial_bridge_index.cpp b/src/serial_bridge_index.cpp index 9eed875..0218c73 100644 --- a/src/serial_bridge_index.cpp +++ b/src/serial_bridge_index.cpp @@ -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("mnemonic_string"), - retVals + retVals, + nettype_from_string(json_root.get("nettype_string")) ); bool did_error = retVals.did_error; if (!r) { diff --git a/test/test_all.cpp b/test/test_all.cpp index bf1268c..e7d55e5 100644 --- a/test/test_all.cpp +++ b/test/test_all.cpp @@ -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;