monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-17 08:17:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

libwallet_api: fast-refresh in case of opening non-synced wallet

Browse source
This commit is contained in:
Ilya Kitaev 2016-09-30 22:42:15 +03:00
parent 0019e3106b
commit 10fe626e13
3 changed files with 30 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/wallet/api/wallet.cpp
View file

@ -175,7 +175,7 @@ WalletImpl::WalletImpl(bool testnet)
m_wallet->callback(m_wallet2Callback); m_wallet->callback(m_wallet2Callback);
m_refreshThreadDone = false; m_refreshThreadDone = false;
m_refreshEnabled = false; m_refreshEnabled = false;
m_newWallet = true;
m_refreshIntervalMillis = DEFAULT_REFRESH_INTERVAL_MILLIS; m_refreshIntervalMillis = DEFAULT_REFRESH_INTERVAL_MILLIS;
@ -196,7 +196,6 @@ WalletImpl::~WalletImpl()
bool WalletImpl::create(const std::string &path, const std::string &password, const std::string &language) bool WalletImpl::create(const std::string &path, const std::string &password, const std::string &language)
{ {
m_newWallet = true;
clearStatus(); clearStatus();
bool keys_file_exists; bool keys_file_exists;
@ -234,7 +233,6 @@ bool WalletImpl::create(const std::string &path, const std::string &password, co
bool WalletImpl::open(const std::string &path, const std::string &password) bool WalletImpl::open(const std::string &path, const std::string &password)
{ {
m_newWallet = false;
clearStatus(); clearStatus();
try { try {
// TODO: handle "deprecated" // TODO: handle "deprecated"
@ -746,7 +744,10 @@ void WalletImpl::pauseRefresh()
bool WalletImpl::isNewWallet() const bool WalletImpl::isNewWallet() const
{ {
return m_newWallet; // in case wallet created without daemon connection, closed and opened again,
// it's the same case as if it created from scratch, i.e. we need "fast sync"
// with the daemon (pull hashes instead of pull blocks)
return !(blockChainHeight() > 1);
} }
void WalletImpl::doInit(const string &daemon_address, uint64_t upper_transaction_size_limit) void WalletImpl::doInit(const string &daemon_address, uint64_t upper_transaction_size_limit)

2
src/wallet/api/wallet.h
View file

@ -128,8 +128,6 @@ private:
boost::mutex m_refreshMutex2; boost::mutex m_refreshMutex2;
boost::condition_variable m_refreshCV; boost::condition_variable m_refreshCV;
boost::thread m_refreshThread; boost::thread m_refreshThread;
bool m_newWallet;
}; };

26
tests/libwallet_api_tests/main.cpp
View file

@ -1030,7 +1030,7 @@ TEST_F(WalletManagerMainnetTest, CreateOpenAndRefreshWalletMainNetSync)
} }
TEST_F(WalletManagerMainnetTest, CreateOpenAndRefreshWalletMainNetAsync) TEST_F(WalletManagerMainnetTest, CreateAndRefreshWalletMainNetAsync)
{ {
Bitmonero::Wallet * wallet = wmgr->createWallet(WALLET_NAME_MAINNET, "", WALLET_LANG); Bitmonero::Wallet * wallet = wmgr->createWallet(WALLET_NAME_MAINNET, "", WALLET_LANG);
@ -1049,6 +1049,30 @@ TEST_F(WalletManagerMainnetTest, CreateOpenAndRefreshWalletMainNetAsync)
wmgr->closeWallet(wallet); wmgr->closeWallet(wallet);
} }
TEST_F(WalletManagerMainnetTest, OpenAndRefreshWalletMainNetAsync)
{
Bitmonero::Wallet * wallet = wmgr->createWallet(WALLET_NAME_MAINNET, "", WALLET_LANG);
wmgr->closeWallet(wallet);
wallet = wmgr->openWallet(WALLET_NAME_MAINNET, "");
MyWalletListener * wallet_listener = new MyWalletListener(wallet);
std::chrono::seconds wait_for = std::chrono::seconds(30);
std::unique_lock<std::mutex> lock (wallet_listener->mutex);
wallet->initAsync(MAINNET_DAEMON_ADDRESS, 0);
// wallet->init(MAINNET_DAEMON_ADDRESS, 0);
std::cerr << "TEST: waiting on refresh lock...\n";
wallet_listener->cv_refresh.wait_for(lock, wait_for);
std::cerr << "TEST: refresh lock acquired...\n";
ASSERT_TRUE(wallet_listener->refresh_triggered);
ASSERT_TRUE(wallet->connected());
ASSERT_TRUE(wallet->blockChainHeight() == wallet->daemonBlockChainHeight());
std::cerr << "TEST: closing wallet...\n";
wmgr->closeWallet(wallet);
}
int main(int argc, char** argv) int main(int argc, char** argv)