Remove unreachable or otherwise redundant code
This commit is contained in:
parent
177433ad22
commit
4265bf351a
6 changed files with 2 additions and 16 deletions
|
@ -299,7 +299,6 @@ static void MutateTxAddOutPubKey(CMutableTransaction& tx, const std::string& str
|
|||
if (!pubkey.IsFullyValid())
|
||||
throw std::runtime_error("invalid TX output pubkey");
|
||||
CScript scriptPubKey = GetScriptForRawPubKey(pubkey);
|
||||
CBitcoinAddress addr(scriptPubKey);
|
||||
|
||||
// Extract and validate FLAGS
|
||||
bool bSegWit = false;
|
||||
|
|
|
@ -33,8 +33,6 @@ static const CRPCCommand vRPCCommands[] =
|
|||
|
||||
void RPCNestedTests::rpcNestedTests()
|
||||
{
|
||||
UniValue jsonRPCError;
|
||||
|
||||
// do some test setup
|
||||
// could be moved to a more generic place when we add more tests on QT level
|
||||
const CChainParams& chainparams = Params();
|
||||
|
|
|
@ -274,7 +274,6 @@ bool CCryptoKeyStore::GetPubKey(const CKeyID &address, CPubKey& vchPubKeyOut) co
|
|||
// Check for watch-only pubkeys
|
||||
return CBasicKeyStore::GetPubKey(address, vchPubKeyOut);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CCryptoKeyStore::EncryptKeys(CKeyingMaterial& vMasterKeyIn)
|
||||
|
|
|
@ -1064,7 +1064,6 @@ public:
|
|||
bool operator()(const CNoDestination &dest) const { return false; }
|
||||
|
||||
bool operator()(const CKeyID &keyID) {
|
||||
CPubKey pubkey;
|
||||
if (pwallet) {
|
||||
CScript basescript = GetScriptForDestination(keyID);
|
||||
isminetype typ;
|
||||
|
|
|
@ -205,7 +205,6 @@ bool CWallet::AddCryptedKey(const CPubKey &vchPubKey,
|
|||
vchCryptedSecret,
|
||||
mapKeyMetadata[vchPubKey.GetID()]);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CWallet::LoadKeyMetadata(const CTxDestination& keyID, const CKeyMetadata &meta)
|
||||
|
@ -2708,8 +2707,6 @@ bool CWallet::CreateTransaction(const std::vector<CRecipient>& vecSend, CWalletT
|
|||
|
||||
unsigned int nBytes = GetVirtualTransactionSize(txNew);
|
||||
|
||||
CTransaction txNewConst(txNew);
|
||||
|
||||
// Remove scriptSigs to eliminate the fee calculation dummy signatures
|
||||
for (auto& vin : txNew.vin) {
|
||||
vin.scriptSig = CScript();
|
||||
|
|
|
@ -76,8 +76,6 @@ bool CWalletDB::WriteCryptedKey(const CPubKey& vchPubKey,
|
|||
const std::vector<unsigned char>& vchCryptedSecret,
|
||||
const CKeyMetadata &keyMeta)
|
||||
{
|
||||
const bool fEraseUnencryptedKey = true;
|
||||
|
||||
if (!WriteIC(std::make_pair(std::string("keymeta"), vchPubKey), keyMeta)) {
|
||||
return false;
|
||||
}
|
||||
|
@ -85,12 +83,8 @@ bool CWalletDB::WriteCryptedKey(const CPubKey& vchPubKey,
|
|||
if (!WriteIC(std::make_pair(std::string("ckey"), vchPubKey), vchCryptedSecret, false)) {
|
||||
return false;
|
||||
}
|
||||
if (fEraseUnencryptedKey)
|
||||
{
|
||||
EraseIC(std::make_pair(std::string("key"), vchPubKey));
|
||||
EraseIC(std::make_pair(std::string("wkey"), vchPubKey));
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue