github-wownero/wownero-cpp
1
0
Fork 0
mirror of https://github.com/wownero/wownero-cpp.git synced 2026-10-18 23:58:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

remove syncAux() end height

Browse Source
This commit is contained in:
woodser
2019-07-19 17:34:56 -04:00
parent 5c36ebab5d
commit a8e8f2e919
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wallet/MoneroWallet.cpp
+6 -9
View File
@@ -1031,22 +1031,22 @@ namespace monero {
MoneroSyncResult MoneroWallet::sync() {
cout << "sync()" << endl;
return syncAux(boost::none, boost::none, boost::none);
return syncAux(boost::none, boost::none);
}
MoneroSyncResult MoneroWallet::sync(MoneroSyncListener& listener) {
cout << "sync(startHeight)" << endl;
return syncAux(boost::none, boost::none, listener);
return syncAux(boost::none, listener);
}
MoneroSyncResult MoneroWallet::sync(uint64_t startHeight) {
cout << "sync(startHeight)" << endl;
return syncAux(startHeight, boost::none, boost::none);
return syncAux(startHeight, boost::none);
}
MoneroSyncResult MoneroWallet::sync(uint64_t startHeight, MoneroSyncListener& listener) {
cout << "sync(startHeight, listener)" << endl;
return syncAux(startHeight, boost::none, listener);
return syncAux(startHeight, listener);
}
void MoneroWallet::setAutoSync(bool autoSync) {
@@ -2331,19 +2331,16 @@ namespace monero {
do {
if (getIsDaemonSynced()) {
if (rescan) wallet2->rescan_blockchain(false);
syncAux(boost::none, boost::none, boost::none);
syncAux(boost::none, boost::none);
if (!isSynced) isSynced = true;
wallet2->find_and_save_rings(false);
}
} while (!rescan && (rescan = rescanOnSync.exchange(false))); // repeat if not rescanned and rescan was requested
}
MoneroSyncResult MoneroWallet::syncAux(boost::optional<uint64_t> startHeight, boost::optional<uint64_t> endHeight, boost::optional<MoneroSyncListener&> listener) {
MoneroSyncResult MoneroWallet::syncAux(boost::optional<uint64_t> startHeight, boost::optional<MoneroSyncListener&> listener) {
cout << "syncAux()" << endl;
// validate inputs
if (endHeight != boost::none) throw runtime_error("Monero core wallet2 does not support syncing to an end height"); // TODO: remove end height altogether
// determine sync start height
uint64_t syncStartHeight = startHeight == boost::none ? max(getHeight(), getRestoreHeight()) : *startHeight;
if (syncStartHeight < getRestoreHeight()) setRestoreHeight(syncStartHeight); // TODO monero core: start height processed > requested start height unless restore height manually set
src/wallet/MoneroWallet.h
+1 -1
View File
@@ -1178,6 +1178,6 @@ namespace monero {
std::atomic<bool> autoSyncThreadDone; // whether or not auto sync loop is done (cannot be re-started)
void autoSyncThreadFunc(); // function to run auto sync loop thread
void autoSyncAux(); // internal synchronized sync function
MoneroSyncResult syncAux(boost::optional<uint64_t> startHeight, boost::optional<uint64_t> endHeight, boost::optional<MoneroSyncListener&> listener);
MoneroSyncResult syncAux(boost::optional<uint64_t> startHeight, boost::optional<MoneroSyncListener&> listener);
};
}