Skip to content

Commit

Permalink
Remove Keepass code due to Valgrind warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
jonspock committed Apr 23, 2017
1 parent f8f1904 commit f00ce24
Show file tree
Hide file tree
Showing 13 changed files with 10 additions and 716 deletions.
2 changes: 0 additions & 2 deletions src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ BITCOIN_CORE_H = \
kernel.h \
swifttx.h \
key.h \
keepass.h \
keystore.h \
leveldbwrapper.h \
limitedmap.h \
Expand Down Expand Up @@ -229,7 +228,6 @@ libbitcoin_wallet_a_SOURCES = \
wallet.cpp \
wallet_ismine.cpp \
walletdb.cpp \
keepass.cpp \
$(BITCOIN_CORE_H)

# crypto primitives library
Expand Down
2 changes: 1 addition & 1 deletion src/alert.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ void CUnsignedAlert::SetNull()
std::string CUnsignedAlert::ToString() const
{
std::string strSetCancel;
BOOST_FOREACH (int n, setCancel)
for (auto& n: setCancel)
strSetCancel += strprintf("%d ", n);
std::string strSetSubVer;
BOOST_FOREACH (std::string str, setSubVer)
Expand Down
2 changes: 1 addition & 1 deletion src/coins.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ double CCoinsViewCache::GetPriority(const CTransaction& tx, int nHeight) const
if (tx.IsCoinBase() || tx.IsCoinStake())
return 0.0;
double dResult = 0.0;
BOOST_FOREACH (const CTxIn& txin, tx.vin) {
for (const CTxIn& txin: tx.vin) {
const CCoins* coins = AccessCoins(txin.prevout.hash);
assert(coins);
if (!coins->IsAvailable(txin.prevout.n)) continue;
Expand Down
11 changes: 1 addition & 10 deletions src/init.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
#include "utilmoneystr.h"
#ifdef ENABLE_WALLET
#include "db.h"
#include "keepass.h"
#include "wallet.h"
#include "walletdb.h"
#endif
Expand Down Expand Up @@ -343,11 +342,6 @@ std::string HelpMessage(HelpMessageMode mode)
strUsage += "\n" + _("Wallet options:") + "\n";
strUsage += " -createwalletbackups=<n> " + _("Number of automatic wallet backups (default: 10)") + "\n";
strUsage += " -disablewallet " + _("Do not load the wallet and disable wallet RPC calls") + "\n";
strUsage += " -keepass " + strprintf(_("Use KeePass 2 integration using KeePassHttp plugin (default: %u)"), 0) + "\n";
strUsage += " -keepassport=<port> " + strprintf(_("Connect to KeePassHttp on port <port> (default: %u)"), 19455) + "\n";
strUsage += " -keepasskey=<key> " + _("KeePassHttp key for AES encrypted communication with KeePass") + "\n";
strUsage += " -keepassid=<name> " + _("KeePassHttp id for the established association") + "\n";
strUsage += " -keepassname=<name> " + _("Name to construct url for KeePass entry that stores the wallet passphrase") + "\n";
strUsage += " -keypool=<n> " + strprintf(_("Set key pool size to <n> (default: %u)"), 100) + "\n";
if (GetBoolArg("-help-debug", false))
strUsage += " -mintxfee=<amt> " + strprintf(_("Fees (in PIV/Kb) smaller than this are considered zero fee for transaction creation (default: %s)"), FormatMoney(CWallet::minTxFee.GetFeePerK())) + "\n";
Expand Down Expand Up @@ -382,7 +376,7 @@ std::string HelpMessage(HelpMessageMode mode)
strUsage += " " + _("If <category> is not supplied, output all debugging information.") + "\n";
strUsage += " " + _("<category> can be:\n");
strUsage += " addrman, alert, bench, coindb, db, lock, rand, rpc, selectcoins, mempool, net,\n"; // Don't translate these and qt below
strUsage += " pivx (or specifically: obfuscation, swifttx, masternode, keepass, mnpayments, mnbudget)"; // Don't translate these and qt below
strUsage += " pivx (or specifically: obfuscation, swifttx, masternode, mnpayments, mnbudget)"; // Don't translate these and qt below
if (mode == HMM_BITCOIN_QT)
strUsage += ", qt";
strUsage += ".\n";
Expand Down Expand Up @@ -1008,9 +1002,6 @@ bool AppInit2(boost::thread_group& threadGroup)
return InitError(_("wallet.dat corrupt, salvage failed"));
}

// Initialize KeePass Integration
keePassInt.init();

} // (!fDisableWallet)
#endif // ENABLE_WALLET
// ********************************************************* Step 6: network initialization
Expand Down
Loading

0 comments on commit f00ce24

Please sign in to comment.