diff options
| author | Jonas Schnelli <dev@jonasschnelli.ch> | 2016-10-20 09:22:13 +0200 |
|---|---|---|
| committer | Jonas Schnelli <dev@jonasschnelli.ch> | 2016-10-20 09:22:13 +0200 |
| commit | cab1da745b2a36407bb9493343cc74213854419d (patch) | |
| tree | 5f250b614ebfc21e8ede93c8eb80aed658945424 /src/init.cpp | |
| parent | c5875773561c249a079714f3b091a2577707eadf (diff) | |
[Wallet] Refactor wallet/init interaction (Reaccept wtx, flush thread)
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 d3efc9f978..9665d0e06d 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1493,13 +1493,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 @@ -1537,10 +1530,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; |