diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-03-14 13:37:00 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-03-14 13:37:00 +0200 |
| commit | 0f2d6d40b4a0a1d92824cf01f4986b5398bc9395 (patch) | |
| tree | 1cceb23990b98e171b9598c2a1795bd4b1413f45 /src | |
| parent | 2e074e2ae76f4f2539089d15ee4ecc76c1c76433 (diff) | |
| parent | 1ff35fda7cbde7b96ed31fd319c1d5646f8820e9 (diff) | |
| download | monzero-core-0f2d6d40b4a0a1d92824cf01f4986b5398bc9395.tar.gz monzero-core-0f2d6d40b4a0a1d92824cf01f4986b5398bc9395.tar.xz monzero-core-0f2d6d40b4a0a1d92824cf01f4986b5398bc9395.zip | |
Merge pull request #3360
1ff35fda Wallet API: make nettype non-defaulted to disambiguate from deprecated versions (and make libwallet_api_tests compilable) (stoffu)
Diffstat (limited to 'src')
| -rw-r--r-- | src/wallet/api/wallet2_api.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/wallet/api/wallet2_api.h b/src/wallet/api/wallet2_api.h index 8f01e2055..87c1cccfa 100644 --- a/src/wallet/api/wallet2_api.h +++ b/src/wallet/api/wallet2_api.h @@ -777,7 +777,7 @@ struct WalletManager * \param nettype Network type * \return Wallet instance (Wallet::status() needs to be called to check if created successfully) */ - virtual Wallet * createWallet(const std::string &path, const std::string &password, const std::string &language, NetworkType nettype = MAINNET) = 0; + virtual Wallet * createWallet(const std::string &path, const std::string &password, const std::string &language, NetworkType nettype) = 0; Wallet * createWallet(const std::string &path, const std::string &password, const std::string &language, bool testnet = false) // deprecated { return createWallet(path, password, language, testnet ? TESTNET : MAINNET); @@ -790,7 +790,7 @@ struct WalletManager * \param nettype Network type * \return Wallet instance (Wallet::status() needs to be called to check if opened successfully) */ - virtual Wallet * openWallet(const std::string &path, const std::string &password, NetworkType nettype = MAINNET) = 0; + virtual Wallet * openWallet(const std::string &path, const std::string &password, NetworkType nettype) = 0; Wallet * openWallet(const std::string &path, const std::string &password, bool testnet = false) // deprecated { return openWallet(path, password, testnet ? TESTNET : MAINNET); @@ -822,7 +822,7 @@ struct WalletManager * \param restoreHeight restore from start height * \return Wallet instance (Wallet::status() needs to be called to check if recovered successfully) */ - virtual Wallet * recoveryWallet(const std::string &path, const std::string &mnemonic, NetworkType nettype = MAINNET, uint64_t restoreHeight = 0) = 0; + virtual Wallet * recoveryWallet(const std::string &path, const std::string &mnemonic, NetworkType nettype, uint64_t restoreHeight = 0) = 0; Wallet * recoveryWallet(const std::string &path, const std::string &mnemonic, bool testnet = false, uint64_t restoreHeight = 0) // deprecated { return recoveryWallet(path, mnemonic, testnet ? TESTNET : MAINNET, restoreHeight); |