Merge pull request #3365

55a65f32 Wallet API: corrected testnet/mainnet ordering (stoffu)
This commit is contained in:
Riccardo Spagni 2018-03-08 18:44:18 +02:00
commit 3a12f2588a
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD

View file

@ -541,7 +541,7 @@ struct Wallet
static bool addressValid(const std::string &str, NetworkType nettype); static bool addressValid(const std::string &str, NetworkType nettype);
static bool addressValid(const std::string &str, bool testnet) // deprecated static bool addressValid(const std::string &str, bool testnet) // deprecated
{ {
return addressValid(str, testnet ? MAINNET : TESTNET); return addressValid(str, testnet ? TESTNET : MAINNET);
} }
static bool keyValid(const std::string &secret_key_string, const std::string &address_string, bool isViewKey, NetworkType nettype, std::string &error); static bool keyValid(const std::string &secret_key_string, const std::string &address_string, bool isViewKey, NetworkType nettype, std::string &error);
static bool keyValid(const std::string &secret_key_string, const std::string &address_string, bool isViewKey, bool testnet, std::string &error) // deprecated static bool keyValid(const std::string &secret_key_string, const std::string &address_string, bool isViewKey, bool testnet, std::string &error) // deprecated