aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2016-04-20 09:08:45 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2016-04-23 09:32:25 +0200
commit878bf480a3875181712a53a1156754faa19e579b (patch)
tree108e95a67fae45d6b38e32b27f8b2c8ca8560602
parent74f7b1273c41892058fb2ff99aab878ccd22082a (diff)
downloadbitcoin-878bf480a3875181712a53a1156754faa19e579b.tar.xz
dbwrapper: Remove CDBWrapper::GetObfuscateKeyHex
It is an unnecessary method as it is used only two times and only internally, and the whole implementation is HexStr(obfuscate_key).
-rw-r--r--src/dbwrapper.cpp9
-rw-r--r--src/dbwrapper.h6
2 files changed, 2 insertions, 13 deletions
diff --git a/src/dbwrapper.cpp b/src/dbwrapper.cpp
index 16f85a3e65..9eae7c7c80 100644
--- a/src/dbwrapper.cpp
+++ b/src/dbwrapper.cpp
@@ -84,10 +84,10 @@ CDBWrapper::CDBWrapper(const boost::filesystem::path& path, size_t nCacheSize, b
Write(OBFUSCATE_KEY_KEY, new_key);
obfuscate_key = new_key;
- LogPrintf("Wrote new obfuscate key for %s: %s\n", path.string(), GetObfuscateKeyHex());
+ LogPrintf("Wrote new obfuscate key for %s: %s\n", path.string(), HexStr(obfuscate_key));
}
- LogPrintf("Using obfuscation key for %s: %s\n", path.string(), GetObfuscateKeyHex());
+ LogPrintf("Using obfuscation key for %s: %s\n", path.string(), HexStr(obfuscate_key));
}
CDBWrapper::~CDBWrapper()
@@ -141,11 +141,6 @@ const std::vector<unsigned char>& CDBWrapper::GetObfuscateKey() const
return obfuscate_key;
}
-std::string CDBWrapper::GetObfuscateKeyHex() const
-{
- return HexStr(obfuscate_key);
-}
-
CDBIterator::~CDBIterator() { delete piter; }
bool CDBIterator::Valid() { return piter->Valid(); }
void CDBIterator::SeekToFirst() { piter->SeekToFirst(); }
diff --git a/src/dbwrapper.h b/src/dbwrapper.h
index 96fb42429f..153c0fd1bf 100644
--- a/src/dbwrapper.h
+++ b/src/dbwrapper.h
@@ -268,12 +268,6 @@ public:
* Accessor for obfuscate_key.
*/
const std::vector<unsigned char>& GetObfuscateKey() const;
-
- /**
- * Return the obfuscate_key as a hex-formatted string.
- */
- std::string GetObfuscateKeyHex() const;
-
};
#endif // BITCOIN_DBWRAPPER_H