diff options
| author | Jaquee <jaquee.monero@gmail.com> | 2017-01-30 11:59:19 +0100 |
|---|---|---|
| committer | Jaquee <jaquee.monero@gmail.com> | 2017-02-04 23:25:03 +0100 |
| commit | 805625b5412e0c37bf7008e4f1a9b75b40a6fd06 (patch) | |
| tree | 079d19f8f64001709be21854095e8440a5a8030d /src/wallet/api | |
| parent | wallet2::init() - disconnect before init if connected (diff) | |
| download | monero-805625b5412e0c37bf7008e4f1a9b75b40a6fd06.tar.xz | |
wallet api: Remove initAsync() and don't start refresh automatically on init
Diffstat (limited to 'src/wallet/api')
| -rw-r--r-- | src/wallet/api/wallet.cpp | 15 | ||||
| -rw-r--r-- | src/wallet/api/wallet.h | 4 |
2 files changed, 2 insertions, 17 deletions
diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp index 9e40d2e02..deab4fe1f 100644 --- a/src/wallet/api/wallet.cpp +++ b/src/wallet/api/wallet.cpp @@ -515,7 +515,6 @@ bool WalletImpl::recover(const std::string &path, const std::string &seed) try { m_wallet->set_seed_language(old_language); m_wallet->generate(path, "", recovery_key, true, false); - // TODO: wallet->init(daemon_address); } catch (const std::exception &e) { m_status = Status_Critical; @@ -646,19 +645,7 @@ string WalletImpl::keysFilename() const bool WalletImpl::init(const std::string &daemon_address, uint64_t upper_transaction_size_limit) { clearStatus(); - if (!doInit(daemon_address, upper_transaction_size_limit)) - return false; - bool result = this->refresh(); - // enabling background refresh thread - startRefresh(); - return result; -} - -void WalletImpl::initAsync(const string &daemon_address, uint64_t upper_transaction_size_limit) -{ - clearStatus(); - doInit(daemon_address, upper_transaction_size_limit); - startRefresh(); + return doInit(daemon_address, upper_transaction_size_limit); } void WalletImpl::setRefreshFromBlockHeight(uint64_t refresh_from_block_height) 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; |