diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-10-13 12:22:40 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-10-13 12:23:45 +0200 |
| commit | 9caaf6ed22d052bae2b9552a7d2df529166664e8 (patch) | |
| tree | 1bdc5d1979cc745f573ef4e6ad375ee7bd8473ac /src/leveldbwrapper.cpp | |
| parent | 16faccb736ab23aec0a325133b4e0caf91dd8d52 (diff) | |
| parent | dcd8e27c65de0d2cb972588a6e811ca7ccd1b3bd (diff) | |
| download | bitcoin-9caaf6ed22d052bae2b9552a7d2df529166664e8.tar.xz | |
Merge pull request #6777
dcd8e27 Refer to obfuscate_key via pointer in peripheral CLevelDB classes (James O'Beirne)
1488506 Add tests for gettxoutsetinfo, CLevelDBBatch, CLevelDBIterator (James O'Beirne)
0fdf8c8 Handle obfuscation in CLevelDBIterator (James O'Beirne)
3499ce1 Encapsulate CLevelDB iterators cleanly (Pieter Wuille)
Diffstat (limited to 'src/leveldbwrapper.cpp')
| -rw-r--r-- | src/leveldbwrapper.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/leveldbwrapper.cpp b/src/leveldbwrapper.cpp index ce96b5c8aa..32c9345be5 100644 --- a/src/leveldbwrapper.cpp +++ b/src/leveldbwrapper.cpp @@ -131,7 +131,7 @@ std::vector<unsigned char> CLevelDBWrapper::CreateObfuscateKey() const bool CLevelDBWrapper::IsEmpty() { - boost::scoped_ptr<leveldb::Iterator> it(NewIterator()); + boost::scoped_ptr<CLevelDBIterator> it(NewIterator()); it->SeekToFirst(); return !(it->Valid()); } @@ -145,3 +145,10 @@ std::string CLevelDBWrapper::GetObfuscateKeyHex() const { 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(); } |