diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-11-02 21:37:28 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-11-02 21:37:43 +0100 |
| commit | 6a1343f73bd0f6744cfcfda1e3e1c8998f67e2d7 (patch) | |
| tree | 7cff5fd559ebebf2f2952a70b326b78014f4e72d /src/init.cpp | |
| parent | c05db8348838422ec6bbfeef30faee36562af13d (diff) | |
| parent | cab1da745b2a36407bb9493343cc74213854419d (diff) | |
| download | bitcoin-6a1343f73bd0f6744cfcfda1e3e1c8998f67e2d7.tar.xz | |
Merge #8977: [Wallet] Refactor wallet/init interaction (Reaccept wtx, flush thread)
cab1da7 [Wallet] Refactor wallet/init interaction (Reaccept wtx, flush thread) (Jonas Schnelli)
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/init.cpp b/src/init.cpp index 29a242a790..008bb6fae5 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1496,13 +1496,6 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) uiInterface.NotifyBlockTip.disconnect(BlockNotifyGenesisWait); } -#ifdef ENABLE_WALLET - // Add wallet transactions that aren't already in a block to mempool - // Do this here as mempool requires genesis block to be loaded - if (pwalletMain) - pwalletMain->ReacceptWalletTransactions(); -#endif - // ********************************************************* Step 11: start node //// debug print @@ -1540,10 +1533,8 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) uiInterface.InitMessage(_("Done loading")); #ifdef ENABLE_WALLET - if (pwalletMain) { - // Run a thread to flush wallet periodically - threadGroup.create_thread(boost::bind(&ThreadFlushWalletDB, boost::ref(pwalletMain->strWalletFile))); - } + if (pwalletMain) + pwalletMain->postInitProcess(threadGroup); #endif return !fRequestShutdown; |