aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Garzik <jeff@bloq.com>2015-10-22 20:49:02 -0400
committerJeff Garzik <jgarzik@pobox.com>2015-10-22 20:49:02 -0400
commit6ec4b7eb20abf05dd6e3c0885644616a2c2acfd7 (patch)
treeca06e01a98dcf368d18ac796498a9d581f9ef308
parenta09297010e171af28a7a3fcad65a4e0aefea53ba (diff)
leveldbwrapper: Remove unused .Prev(), .SeekToLast() methods
Also, trim trailing whitespace.
-rw-r--r--src/leveldbwrapper.cpp20
-rw-r--r--src/leveldbwrapper.h12
2 files changed, 14 insertions, 18 deletions
diff --git a/src/leveldbwrapper.cpp b/src/leveldbwrapper.cpp
index 32c9345be5..641d25152d 100644
--- a/src/leveldbwrapper.cpp
+++ b/src/leveldbwrapper.cpp
@@ -76,7 +76,7 @@ CLevelDBWrapper::CLevelDBWrapper(const boost::filesystem::path& path, size_t nCa
bool key_exists = Read(OBFUSCATE_KEY_KEY, obfuscate_key);
if (!key_exists && obfuscate && IsEmpty()) {
- // Initialize non-degenerate obfuscation if it won't upset
+ // Initialize non-degenerate obfuscation if it won't upset
// existing, non-obfuscated data.
std::vector<unsigned char> new_key = CreateObfuscateKey();
@@ -118,10 +118,10 @@ const std::string CLevelDBWrapper::OBFUSCATE_KEY_KEY("\000obfuscate_key", 14);
const unsigned int CLevelDBWrapper::OBFUSCATE_KEY_NUM_BYTES = 8;
/**
- * Returns a string (consisting of 8 random bytes) suitable for use as an
- * obfuscating XOR key.
+ * Returns a string (consisting of 8 random bytes) suitable for use as an
+ * obfuscating XOR key.
*/
-std::vector<unsigned char> CLevelDBWrapper::CreateObfuscateKey() const
+std::vector<unsigned char> CLevelDBWrapper::CreateObfuscateKey() const
{
unsigned char buff[OBFUSCATE_KEY_NUM_BYTES];
GetRandBytes(buff, OBFUSCATE_KEY_NUM_BYTES);
@@ -136,19 +136,17 @@ bool CLevelDBWrapper::IsEmpty()
return !(it->Valid());
}
-const std::vector<unsigned char>& CLevelDBWrapper::GetObfuscateKey() const
-{
- return obfuscate_key;
+const std::vector<unsigned char>& CLevelDBWrapper::GetObfuscateKey() const
+{
+ return obfuscate_key;
}
std::string CLevelDBWrapper::GetObfuscateKeyHex() const
-{
- return HexStr(obfuscate_key);
+{
+ return HexStr(obfuscate_key);
}
CLevelDBIterator::~CLevelDBIterator() { delete piter; }
bool CLevelDBIterator::Valid() { return piter->Valid(); }
void CLevelDBIterator::SeekToFirst() { piter->SeekToFirst(); }
-void CLevelDBIterator::SeekToLast() { piter->SeekToLast(); }
void CLevelDBIterator::Next() { piter->Next(); }
-void CLevelDBIterator::Prev() { piter->Prev(); }
diff --git a/src/leveldbwrapper.h b/src/leveldbwrapper.h
index 60101e18cc..0effea407a 100644
--- a/src/leveldbwrapper.h
+++ b/src/leveldbwrapper.h
@@ -68,7 +68,7 @@ public:
batch.Delete(slKey);
}
};
-
+
class CLevelDBIterator
{
private:
@@ -88,7 +88,6 @@ public:
bool Valid();
void SeekToFirst();
- void SeekToLast();
template<typename K> void Seek(const K& key) {
CDataStream ssKey(SER_DISK, CLIENT_VERSION);
@@ -99,7 +98,6 @@ public:
}
void Next();
- void Prev();
template<typename K> bool GetKey(K& key) {
leveldb::Slice slKey = piter->key();
@@ -133,7 +131,7 @@ public:
}
};
-
+
class CLevelDBWrapper
{
private:
@@ -163,10 +161,10 @@ private:
//! the key under which the obfuscation key is stored
static const std::string OBFUSCATE_KEY_KEY;
-
+
//! the length of the obfuscate key in number of bytes
static const unsigned int OBFUSCATE_KEY_NUM_BYTES;
-
+
std::vector<unsigned char> CreateObfuscateKey() const;
public:
@@ -256,7 +254,7 @@ public:
return WriteBatch(batch, true);
}
- CLevelDBIterator *NewIterator()
+ CLevelDBIterator *NewIterator()
{
return new CLevelDBIterator(pdb->NewIterator(iteroptions), &obfuscate_key);
}