diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-08-24 10:32:59 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-08-24 10:33:16 +0200 |
commit | f9167003d947fa994cdd14406da79a1758acb7b3 (patch) | |
tree | ed03842a9672d119ec97c1a0f0a931f49e3f7319 /src/init.cpp | |
parent | 9358893518a19f38eab9186c768ad81c7a2f9cec (diff) | |
parent | 8680d3aa800aa4fab8c321b92cc7f3fa97a8a0a3 (diff) | |
download | bitcoin-f9167003d947fa994cdd14406da79a1758acb7b3.tar.xz |
Merge #8445: Move CWallet::setKeyPool to private section of CWallet.
8680d3a Move wallet initialization logic from AppInit2 to CWallet::InitLoadWallet (Patrick Strateman)
e86eb71 Move CWallet::setKeyPool to private section of CWallet (Patrick Strateman)
Diffstat (limited to 'src/init.cpp')
-rw-r--r-- | src/init.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/init.cpp b/src/init.cpp index ce5f4b3a88..13c68e512a 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1494,12 +1494,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 - LogPrintf("setKeyPool.size() = %u\n", pwalletMain ? pwalletMain->setKeyPool.size() : 0); - LogPrintf("mapWallet.size() = %u\n", pwalletMain ? pwalletMain->mapWallet.size() : 0); - LogPrintf("mapAddressBook.size() = %u\n", pwalletMain ? pwalletMain->mapAddressBook.size() : 0); -#endif - if (GetBoolArg("-listenonion", DEFAULT_LISTEN_ONION)) StartTorControl(threadGroup, scheduler); @@ -1512,9 +1506,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))); } |