Browse Source

Remove unused C++ code not covered by unit tests

pull/1/head
practicalswift 5 years ago
parent
commit
b51aaf1c42
  1. 5
      src/chainparamsbase.cpp
  2. 6
      src/chainparamsbase.h
  3. 8
      src/key.cpp
  4. 3
      src/key.h
  5. 6
      src/netaddress.cpp
  6. 1
      src/netaddress.h
  7. 6
      src/script/interpreter.cpp
  8. 9
      src/wallet/db.cpp
  9. 1
      src/wallet/db.h

5
src/chainparamsbase.cpp

@ -103,8 +103,3 @@ std::string ChainNameFromCommandLine() @@ -103,8 +103,3 @@ std::string ChainNameFromCommandLine()
return CBaseChainParams::TESTNET;
return CBaseChainParams::MAIN;
}
bool AreBaseParamsConfigured()
{
return pCurrentBaseParams != NULL;
}

6
src/chainparamsbase.h

@ -53,10 +53,4 @@ void SelectBaseParams(const std::string& chain); @@ -53,10 +53,4 @@ void SelectBaseParams(const std::string& chain);
*/
std::string ChainNameFromCommandLine();
/**
* Return true if SelectBaseParamsFromCommandLine() has been called to select
* a network.
*/
bool AreBaseParamsConfigured();
#endif // BITCOIN_CHAINPARAMSBASE_H

8
src/key.cpp

@ -131,14 +131,6 @@ void CKey::MakeNewKey(bool fCompressedIn) { @@ -131,14 +131,6 @@ void CKey::MakeNewKey(bool fCompressedIn) {
fCompressed = fCompressedIn;
}
bool CKey::SetPrivKey(const CPrivKey &privkey, bool fCompressedIn) {
if (!ec_privkey_import_der(secp256k1_context_sign, (unsigned char*)begin(), &privkey[0], privkey.size()))
return false;
fCompressed = fCompressedIn;
fValid = true;
return true;
}
CPrivKey CKey::GetPrivKey() const {
assert(fValid);
CPrivKey privkey;

3
src/key.h

@ -94,9 +94,6 @@ public: @@ -94,9 +94,6 @@ public:
//! Check whether the public key corresponding to this private key is (to be) compressed.
bool IsCompressed() const { return fCompressed; }
//! Initialize from a CPrivKey (serialized OpenSSL private key data).
bool SetPrivKey(const CPrivKey& vchPrivKey, bool fCompressed);
//! Generate a new private key using a cryptographic PRNG.
void MakeNewKey(bool fCompressed);

6
src/netaddress.cpp

@ -179,12 +179,6 @@ bool CNetAddr::IsLocal() const @@ -179,12 +179,6 @@ bool CNetAddr::IsLocal() const
return false;
}
bool CNetAddr::IsMulticast() const
{
return (IsIPv4() && (GetByte(3) & 0xF0) == 0xE0)
|| (GetByte(15) == 0xFF);
}
bool CNetAddr::IsValid() const
{
// Cleanup 3-byte shifted addresses caused by garbage in size field

1
src/netaddress.h

@ -65,7 +65,6 @@ class CNetAddr @@ -65,7 +65,6 @@ class CNetAddr
bool IsLocal() const;
bool IsRoutable() const;
bool IsValid() const;
bool IsMulticast() const;
enum Network GetNetwork() const;
std::string ToString() const;
std::string ToStringIP() const;

6
src/script/interpreter.cpp

@ -247,10 +247,10 @@ bool EvalScript(std::vector<std::vector<unsigned char> >& stack, const CScript& @@ -247,10 +247,10 @@ bool EvalScript(std::vector<std::vector<unsigned char> >& stack, const CScript&
{
static const CScriptNum bnZero(0);
static const CScriptNum bnOne(1);
static const CScriptNum bnFalse(0);
static const CScriptNum bnTrue(1);
// static const CScriptNum bnFalse(0);
// static const CScriptNum bnTrue(1);
static const valtype vchFalse(0);
static const valtype vchZero(0);
// static const valtype vchZero(0);
static const valtype vchTrue(1, 1);
CScript::const_iterator pc = script.begin();

9
src/wallet/db.cpp

@ -466,15 +466,6 @@ void CDBEnv::CloseDb(const std::string& strFile) @@ -466,15 +466,6 @@ void CDBEnv::CloseDb(const std::string& strFile)
}
}
bool CDBEnv::RemoveDb(const std::string& strFile)
{
this->CloseDb(strFile);
LOCK(cs_db);
int rc = dbenv->dbremove(NULL, strFile.c_str(), NULL, DB_AUTO_COMMIT);
return (rc == 0);
}
bool CDB::Rewrite(CWalletDBWrapper& dbw, const char* pszSkip)
{
if (dbw.IsDummy()) {

1
src/wallet/db.h

@ -72,7 +72,6 @@ public: @@ -72,7 +72,6 @@ public:
void CheckpointLSN(const std::string& strFile);
void CloseDb(const std::string& strFile);
bool RemoveDb(const std::string& strFile);
DbTxn* TxnBegin(int flags = DB_TXN_WRITE_NOSYNC)
{

Loading…
Cancel
Save