From e86eb71604e73ad35b8b1f59d73af22e353a156e Mon Sep 17 00:00:00 2001 From: Patrick Strateman Date: Mon, 1 Aug 2016 17:14:40 -0700 Subject: Move CWallet::setKeyPool to private section of CWallet --- src/init.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/init.cpp') diff --git a/src/init.cpp b/src/init.cpp index 8d4a2cafb..a15fe2e13 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1439,9 +1439,12 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) 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); + 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)) -- cgit v1.2.3 From 8680d3aa800aa4fab8c321b92cc7f3fa97a8a0a3 Mon Sep 17 00:00:00 2001 From: Patrick Strateman Date: Fri, 19 Aug 2016 15:50:48 -0700 Subject: Move wallet initialization logic from AppInit2 to CWallet::InitLoadWallet --- src/init.cpp | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'src/init.cpp') diff --git a/src/init.cpp b/src/init.cpp index a15fe2e13..1547afe6c 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))); } -- cgit v1.2.3