diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-02-05 13:42:41 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-02-05 13:42:41 +0200 |
| commit | 3473af00ad871a52ede2baee14de83eebc7a5760 (patch) | |
| tree | 277d90aa5ba6b43c42d536b45541ab7a5684a889 /src/wallet/api/wallet.h | |
| parent | Merge pull request #1669 (diff) | |
| parent | update wallet api tests (diff) | |
| download | monero-3473af00ad871a52ede2baee14de83eebc7a5760.tar.xz | |
Merge pull request #1655
b14d109b update wallet api tests (Jaquee)
0cc50bdd GUI: Improved refresh performance (Jaquee)
805625b5 wallet api: Remove initAsync() and don't start refresh automatically on init (Jaquee)
031b060a wallet2::init() - disconnect before init if connected Makes it possible for GUI to reinit with new daemon without closing and reopening wallet. (Jaquee)
Diffstat (limited to 'src/wallet/api/wallet.h')
| -rw-r--r-- | src/wallet/api/wallet.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/wallet/api/wallet.h b/src/wallet/api/wallet.h index 7daf63e43..3994afaa3 100644 --- a/src/wallet/api/wallet.h +++ b/src/wallet/api/wallet.h @@ -78,8 +78,7 @@ public: bool store(const std::string &path); std::string filename() const; std::string keysFilename() const; - bool init(const std::string &daemon_address, uint64_t upper_transaction_size_limit); - void initAsync(const std::string &daemon_address, uint64_t upper_transaction_size_limit); + bool init(const std::string &daemon_address, uint64_t upper_transaction_size_limit = 0); bool connectToDaemon(); ConnectionStatus connected() const; void setTrustedDaemon(bool arg); @@ -135,7 +134,6 @@ private: bool isNewWallet() const; bool doInit(const std::string &daemon_address, uint64_t upper_transaction_size_limit); - private: friend class PendingTransactionImpl; friend class UnsignedTransactionImpl; |