refactor and optimize init.cpp/CWallet interaction #5990

1191 | -    } // (!fDisableWallet)
1192 | +        pwalletMain = new CWallet();
1193 | +        
1194 | +        std::string warningString, errorString;
1195 | +        
1196 | +        if(!pwalletMain->LoadWallet(warningString, errorString))

---

 973 | +
 974 | +void CWallet::LogGeneralInfos()
 975 | +{
 976 | +    LogPrintf("Using BerkeleyDB version %s\n", DbEnv::version(0, 0, 0));
 977 | +}
 978 | +void CWallet::LogInfos() const

---

1200 | +            InitWarning(warningString);
1201 | +        if (!errorString.empty())
1202 | +            return InitError(errorString);
1203 | +    }
1204 |  #else // ENABLE_WALLET
1205 |      LogPrintf("No wallet compiled in!\n");

---

 910 | @@ -908,6 +911,100 @@ CAmount CWallet::GetChange(const CTransaction& tx) const
 911 |      return nChange;
 912 |  }
 913 |  
 914 | +bool CWallet::IsDisabled()

---

 134 | +    if (GetBoolArg("-zapwallettxes", false)) {
 135 | +        if (SoftSetBoolArg("-rescan", true))
 136 | +            LogPrintf("%s: parameter interaction: -zapwallettxes=<mode> -> setting -rescan=1\n", __func__);
 137 | +    }
 138 | +
 139 | +    if (mapArgs.count("-mintxfee"))

---

 708 | +
 709 |      //! Verify the wallet database and perform salvage if required
 710 |      static bool Verify(const std::string& walletFile, std::string& warningString, std::string& errorString);
 711 |      
 712 | +    static void StartWalletTasks(boost::thread_group& threadGroup);
 713 | +    

---

  84 | +void SanityCheck(std::string& errorString)
  85 | +{
  86 | +    std::string strWalletFile = GetWalletFile();
  87 | +    // Wallet file must be a plain filename without a directory
  88 | +    if (strWalletFile != boost::filesystem::basename(strWalletFile) + boost::filesystem::extension(strWalletFile))
  89 | +    errorString += strprintf(_("Wallet %s resides outside data directory"), strWalletFile);

---

  19 | +
  20 | +namespace CLegacyWalletModule {
  21 | +
  22 | +std::string GetWalletFile()
  23 | +{
  24 | +    return GetArg("-wallet", DEFAULT_WALLET_FILE);

---

 874 | -            return InitError(warningString);
 875 | -
 876 | -    } // (!fDisableWallet)
 877 | -#endif // ENABLE_WALLET
 878 | +    // ********************************************************* Step 5: verify integrity of connected devices
 879 | +    warningString.clear();

---

 882 | +    GetMainSignals().VerifyIntegrity(warningString, errorString, stopInit);
 883 | +    if (stopInit)
 884 | +        return false;
 885 | +    
 886 | +    if (!warningString.empty())
 887 | +    InitWarning(warningString);

---

 884 | +        return false;
 885 | +    
 886 | +    if (!warningString.empty())
 887 | +    InitWarning(warningString);
 888 | +    if (!errorString.empty())
 889 | +    return InitError(errorString);

---

1287 | -        pwalletMain->SetBroadcastTransactions(GetBoolArg("-walletbroadcast", true));
1288 | -    } // (!fDisableWallet)
1289 | -#else // ENABLE_WALLET
1290 | -    LogPrintf("No wallet support compiled in!\n");
1291 | -#endif // !ENABLE_WALLET
1292 | +    // ********************************************************* Step 8: load wallets/modules

---

  30 | @@ -31,6 +31,7 @@
  31 |  #include "util.h"
  32 |  
  33 |  #ifdef ENABLE_WALLET
  34 | +#include "wallet/legacywallet.h"
  35 |  #include "wallet/wallet.h"

---

  12 | @@ -13,6 +13,7 @@
  13 |  #include "base58.h"
  14 |  #include "init.h"
  15 |  #include "main.h" // For strMessageMagic
  16 | +#include "wallet/legacywallet.h"
  17 |  #include "wallet/wallet.h"

---

   0 | @@ -0,0 +1,233 @@
   1 | +// Copyright (c) 2009-2010 Satoshi Nakamoto
   2 | +// Copyright (c) 2009-2014 The Bitcoin Core developers

---

 130 | +            LogPrintf("%s: parameter interaction: -salvagewallet=1 -> setting -rescan=1\n", __func__);
 131 | +    }
 132 | +
 133 | +    // -zapwallettx implies a rescan
 134 | +    if (GetBoolArg("-zapwallettxes", false)) {
 135 | +        if (SoftSetBoolArg("-rescan", true))

---

   0 | @@ -0,0 +1,20 @@
   1 | +// Copyright (c) 2009-2010 Satoshi Nakamoto
   2 | +// Copyright (c) 2009-2015 The Bitcoin Core developers
   3 | +// Distributed under the MIT software license, see the accompanying
   4 | +// file COPYING or http://www.opensource.org/licenses/mit-license.php.
   5 | +
   6 | +#ifndef BITCOIN_LEGACYWALLET_H

---

  12 | +
  13 | +namespace CLegacyWalletModule {
  14 | +    void RegisterSignals();
  15 | +    void UnregisterSignals();
  16 | +    
  17 | +    std::string GetWalletFile();

---