diff options
| author | Patrick Strateman <patrick.strateman@gmail.com> | 2016-08-19 15:50:48 -0700 |
|---|---|---|
| committer | Patrick Strateman <patrick.strateman@gmail.com> | 2016-08-20 14:03:47 -0700 |
| commit | 8680d3aa800aa4fab8c321b92cc7f3fa97a8a0a3 (patch) | |
| tree | 84cd028dd0f80ba73c8abb5d37317392a224ab8a /src/init.cpp | |
| parent | e86eb71604e73ad35b8b1f59d73af22e353a156e (diff) | |
Move wallet initialization logic from AppInit2 to CWallet::InitLoadWallet
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/init.cpp b/src/init.cpp index a15fe2e13b..1547afe6cf 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1438,15 +1438,6 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) //// debug print LogPrintf("mapBlockIndex.size() = %u\n", mapBlockIndex.size()); LogPrintf("nBestHeight = %d\n", chainActive.Height()); -#ifdef ENABLE_WALLET - if (pwalletMain) { - LOCK(pwalletMain->cs_wallet); - LogPrintf("setKeyPool.size() = %u\n", pwalletMain->GetKeyPoolSize()); - LogPrintf("mapWallet.size() = %u\n", pwalletMain->mapWallet.size()); - LogPrintf("mapAddressBook.size() = %u\n", pwalletMain->mapAddressBook.size()); - } -#endif - if (GetBoolArg("-listenonion", DEFAULT_LISTEN_ONION)) StartTorControl(threadGroup, scheduler); @@ -1459,9 +1450,6 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) #ifdef ENABLE_WALLET if (pwalletMain) { - // Add wallet transactions that aren't already in a block to mapTransactions - pwalletMain->ReacceptWalletTransactions(); - // Run a thread to flush wallet periodically threadGroup.create_thread(boost::bind(&ThreadFlushWalletDB, boost::ref(pwalletMain->strWalletFile))); } |