diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp index 80a00654df..9353f7772e 100644 --- a/src/chainparamsbase.cpp +++ b/src/chainparamsbase.cpp @@ -144,8 +144,3 @@ std::string GetDevNetName() std::string devNetName = GetArg("-devnet", ""); return "devnet" + (devNetName.empty() ? "" : "-" + devNetName); } - -bool AreBaseParamsConfigured() -{ - return pCurrentBaseParams != NULL; -} diff --git a/src/chainparamsbase.h b/src/chainparamsbase.h index 412f3551aa..780a35a255 100644 --- a/src/chainparamsbase.h +++ b/src/chainparamsbase.h @@ -56,10 +56,4 @@ std::string ChainNameFromCommandLine(); std::string GetDevNetName(); -/** - * Return true if SelectBaseParamsFromCommandLine() has been called to select - * a network. - */ -bool AreBaseParamsConfigured(); - #endif // BITCOIN_CHAINPARAMSBASE_H diff --git a/src/key.cpp b/src/key.cpp index b3ea98fb92..5f4cda26da 100644 --- a/src/key.cpp +++ b/src/key.cpp @@ -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; diff --git a/src/key.h b/src/key.h index b218f2cb72..cf9f99aafb 100644 --- a/src/key.h +++ b/src/key.h @@ -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); diff --git a/src/netaddress.cpp b/src/netaddress.cpp index c974298921..c9456ff582 100644 --- a/src/netaddress.cpp +++ b/src/netaddress.cpp @@ -182,12 +182,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 diff --git a/src/netaddress.h b/src/netaddress.h index 85b7b94b3e..0c6166d769 100644 --- a/src/netaddress.h +++ b/src/netaddress.h @@ -67,7 +67,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(bool fUseGetnameinfo = true) const; diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp index bc7e58acdd..6633336fdd 100644 --- a/src/script/interpreter.cpp +++ b/src/script/interpreter.cpp @@ -231,10 +231,10 @@ bool EvalScript(std::vector >& 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(); diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp index 98d6df3dc4..fea26f3484 100644 --- a/src/wallet/db.cpp +++ b/src/wallet/db.cpp @@ -465,15 +465,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()) { diff --git a/src/wallet/db.h b/src/wallet/db.h index c1fac5cada..e4d8a5154d 100644 --- a/src/wallet/db.h +++ b/src/wallet/db.h @@ -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) {