sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-28 05:23:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #10536: Remove unreachable or otherwise redundant code

Browse Source 
4265bf351 Remove unreachable or otherwise redundant code (practicalswift)

Tree-SHA512: bc9666ab5d20c936d78c50c0361405aca9edd116602aa9bcd71a79a904b647ac9eca0651d1a9d530189a6ac1c4e235bfc69ec1a68f7e36cc14d6848ac2206b7b
This commit is contained in:
Pieter Wuille 2017-06-20 16:07:53 -07:00
commit d636f3943d
No known key found for this signature in database
GPG Key ID: A636E97631F767E0
6 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/bitcoin-tx.cpp
View File

@ -299,7 +299,6 @@ static void MutateTxAddOutPubKey(CMutableTransaction& tx, const std::string& str
if (!pubkey.IsFullyValid()) if (!pubkey.IsFullyValid())
throw std::runtime_error("invalid TX output pubkey"); throw std::runtime_error("invalid TX output pubkey");
CScript scriptPubKey = GetScriptForRawPubKey(pubkey); CScript scriptPubKey = GetScriptForRawPubKey(pubkey);
CBitcoinAddress addr(scriptPubKey);
// Extract and validate FLAGS // Extract and validate FLAGS
bool bSegWit = false; bool bSegWit = false;

2
src/qt/test/rpcnestedtests.cpp
View File

@ -33,8 +33,6 @@ static const CRPCCommand vRPCCommands[] =
void RPCNestedTests::rpcNestedTests() void RPCNestedTests::rpcNestedTests()
{ {
UniValue jsonRPCError;
// do some test setup // do some test setup
// could be moved to a more generic place when we add more tests on QT level // could be moved to a more generic place when we add more tests on QT level
const CChainParams& chainparams = Params(); const CChainParams& chainparams = Params();

1
src/wallet/crypter.cpp
View File

@ -274,7 +274,6 @@ bool CCryptoKeyStore::GetPubKey(const CKeyID &address, CPubKey& vchPubKeyOut) co
// Check for watch-only pubkeys // Check for watch-only pubkeys
return CBasicKeyStore::GetPubKey(address, vchPubKeyOut); return CBasicKeyStore::GetPubKey(address, vchPubKeyOut);
} }
return false;
} }
bool CCryptoKeyStore::EncryptKeys(CKeyingMaterial& vMasterKeyIn) bool CCryptoKeyStore::EncryptKeys(CKeyingMaterial& vMasterKeyIn)

1
src/wallet/rpcwallet.cpp
View File

@ -1064,7 +1064,6 @@ public:
bool operator()(const CNoDestination &dest) const { return false; } bool operator()(const CNoDestination &dest) const { return false; }
bool operator()(const CKeyID &keyID) { bool operator()(const CKeyID &keyID) {
CPubKey pubkey;
if (pwallet) { if (pwallet) {
CScript basescript = GetScriptForDestination(keyID); CScript basescript = GetScriptForDestination(keyID);
isminetype typ; isminetype typ;

3
src/wallet/wallet.cpp
View File

@ -205,7 +205,6 @@ bool CWallet::AddCryptedKey(const CPubKey &vchPubKey,
vchCryptedSecret, vchCryptedSecret,
mapKeyMetadata[vchPubKey.GetID()]); mapKeyMetadata[vchPubKey.GetID()]);
} }
return false;
} }
bool CWallet::LoadKeyMetadata(const CTxDestination& keyID, const CKeyMetadata &meta) bool CWallet::LoadKeyMetadata(const CTxDestination& keyID, const CKeyMetadata &meta)
@ -2709,8 +2708,6 @@ bool CWallet::CreateTransaction(const std::vector<CRecipient>& vecSend, CWalletT
nBytes = GetVirtualTransactionSize(txNew); nBytes = GetVirtualTransactionSize(txNew);
CTransaction txNewConst(txNew);
// Remove scriptSigs to eliminate the fee calculation dummy signatures // Remove scriptSigs to eliminate the fee calculation dummy signatures
for (auto& vin : txNew.vin) { for (auto& vin : txNew.vin) {
vin.scriptSig = CScript(); vin.scriptSig = CScript();

10
src/wallet/walletdb.cpp
View File

@ -76,8 +76,6 @@ bool CWalletDB::WriteCryptedKey(const CPubKey& vchPubKey,
const std::vector<unsigned char>& vchCryptedSecret, const std::vector<unsigned char>& vchCryptedSecret,
const CKeyMetadata &keyMeta) const CKeyMetadata &keyMeta)
{ {
const bool fEraseUnencryptedKey = true;
if (!WriteIC(std::make_pair(std::string("keymeta"), vchPubKey), keyMeta)) { if (!WriteIC(std::make_pair(std::string("keymeta"), vchPubKey), keyMeta)) {
return false; return false;
} }
@ -85,12 +83,8 @@ bool CWalletDB::WriteCryptedKey(const CPubKey& vchPubKey,
if (!WriteIC(std::make_pair(std::string("ckey"), vchPubKey), vchCryptedSecret, false)) { if (!WriteIC(std::make_pair(std::string("ckey"), vchPubKey), vchCryptedSecret, false)) {
return false; return false;
} }
if (fEraseUnencryptedKey) EraseIC(std::make_pair(std::string("key"), vchPubKey));
{ EraseIC(std::make_pair(std::string("wkey"), vchPubKey));
EraseIC(std::make_pair(std::string("key"), vchPubKey));
EraseIC(std::make_pair(std::string("wkey"), vchPubKey));
}
return true; return true;
} }