diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp index b05bc3c4a84..535087744b4 100644 --- a/src/chainparamsbase.cpp +++ b/src/chainparamsbase.cpp @@ -103,8 +103,3 @@ std::string ChainNameFromCommandLine() return CBaseChainParams::TESTNET; return CBaseChainParams::MAIN; } - -bool AreBaseParamsConfigured() -{ - return pCurrentBaseParams != NULL; -} diff --git a/src/chainparamsbase.h b/src/chainparamsbase.h index 59493afb9b6..84350cf65b2 100644 --- a/src/chainparamsbase.h +++ b/src/chainparamsbase.h @@ -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 diff --git a/src/key.cpp b/src/key.cpp index 89df280bb3d..c74d32d71ff 100644 --- a/src/key.cpp +++ b/src/key.cpp @@ -132,14 +132,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 c80dd3c8668..867307014c1 100644 --- a/src/key.h +++ b/src/key.h @@ -95,9 +95,6 @@ class CKey //! 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 4eabcbf4d2b..1a7d9faa00a 100644 --- a/src/netaddress.cpp +++ b/src/netaddress.cpp @@ -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 diff --git a/src/netaddress.h b/src/netaddress.h index 743c8d5b19c..88063951454 100644 --- a/src/netaddress.h +++ b/src/netaddress.h @@ -66,7 +66,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; diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp index f9b78358828..d396f182a68 100644 --- a/src/script/interpreter.cpp +++ b/src/script/interpreter.cpp @@ -249,10 +249,10 @@ bool EvalScript(vector >& stack, const CScript& script, un { 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();