diff --git a/src/leveldbwrapper.h b/src/leveldbwrapper.h index 891381c5f2..60101e18cc 100644 --- a/src/leveldbwrapper.h +++ b/src/leveldbwrapper.h @@ -32,13 +32,13 @@ class CLevelDBBatch private: leveldb::WriteBatch batch; - const std::vector obfuscate_key; + const std::vector *obfuscate_key; public: /** * @param[in] obfuscate_key If passed, XOR data with this key. */ - CLevelDBBatch(const std::vector& obfuscate_key) : obfuscate_key(obfuscate_key) { }; + CLevelDBBatch(const std::vector *obfuscate_key) : obfuscate_key(obfuscate_key) { }; template void Write(const K& key, const V& value) @@ -51,7 +51,7 @@ public: CDataStream ssValue(SER_DISK, CLIENT_VERSION); ssValue.reserve(ssValue.GetSerializeSize(value)); ssValue << value; - ssValue.Xor(obfuscate_key); + ssValue.Xor(*obfuscate_key); leveldb::Slice slValue(&ssValue[0], ssValue.size()); batch.Put(slKey, slValue); @@ -73,7 +73,7 @@ class CLevelDBIterator { private: leveldb::Iterator *piter; - const std::vector obfuscate_key; + const std::vector *obfuscate_key; public: @@ -81,7 +81,7 @@ public: * @param[in] piterIn The original leveldb iterator. * @param[in] obfuscate_key If passed, XOR data with this key. */ - CLevelDBIterator(leveldb::Iterator *piterIn, const std::vector& obfuscate_key) : + CLevelDBIterator(leveldb::Iterator *piterIn, const std::vector* obfuscate_key) : piter(piterIn), obfuscate_key(obfuscate_key) { }; ~CLevelDBIterator(); @@ -120,7 +120,7 @@ public: leveldb::Slice slValue = piter->value(); try { CDataStream ssValue(slValue.data(), slValue.data() + slValue.size(), SER_DISK, CLIENT_VERSION); - ssValue.Xor(obfuscate_key); + ssValue.Xor(*obfuscate_key); ssValue >> value; } catch(std::exception &e) { return false; @@ -210,7 +210,7 @@ public: template bool Write(const K& key, const V& value, bool fSync = false) throw(leveldb_error) { - CLevelDBBatch batch(obfuscate_key); + CLevelDBBatch batch(&obfuscate_key); batch.Write(key, value); return WriteBatch(batch, fSync); } @@ -237,7 +237,7 @@ public: template bool Erase(const K& key, bool fSync = false) throw(leveldb_error) { - CLevelDBBatch batch(obfuscate_key); + CLevelDBBatch batch(&obfuscate_key); batch.Erase(key); return WriteBatch(batch, fSync); } @@ -252,13 +252,13 @@ public: bool Sync() throw(leveldb_error) { - CLevelDBBatch batch(obfuscate_key); + CLevelDBBatch batch(&obfuscate_key); return WriteBatch(batch, true); } CLevelDBIterator *NewIterator() { - return new CLevelDBIterator(pdb->NewIterator(iteroptions), obfuscate_key); + return new CLevelDBIterator(pdb->NewIterator(iteroptions), &obfuscate_key); } /** diff --git a/src/test/leveldbwrapper_tests.cpp b/src/test/leveldbwrapper_tests.cpp index 36975548c2..606313b004 100644 --- a/src/test/leveldbwrapper_tests.cpp +++ b/src/test/leveldbwrapper_tests.cpp @@ -64,7 +64,7 @@ BOOST_AUTO_TEST_CASE(leveldbwrapper_batch) uint256 in3 = GetRandHash(); uint256 res; - CLevelDBBatch batch(dbw.GetObfuscateKey()); + CLevelDBBatch batch(&dbw.GetObfuscateKey()); batch.Write(key, in); batch.Write(key2, in2); diff --git a/src/txdb.cpp b/src/txdb.cpp index 4d7ec27aae..5723c92440 100644 --- a/src/txdb.cpp +++ b/src/txdb.cpp @@ -49,7 +49,7 @@ uint256 CCoinsViewDB::GetBestBlock() const { } bool CCoinsViewDB::BatchWrite(CCoinsMap &mapCoins, const uint256 &hashBlock) { - CLevelDBBatch batch(db.GetObfuscateKey()); + CLevelDBBatch batch(&db.GetObfuscateKey()); size_t count = 0; size_t changed = 0; for (CCoinsMap::iterator it = mapCoins.begin(); it != mapCoins.end();) { @@ -141,7 +141,7 @@ bool CCoinsViewDB::GetStats(CCoinsStats &stats) const { } bool CBlockTreeDB::WriteBatchSync(const std::vector >& fileInfo, int nLastFile, const std::vector& blockinfo) { - CLevelDBBatch batch(GetObfuscateKey()); + CLevelDBBatch batch(&GetObfuscateKey()); for (std::vector >::const_iterator it=fileInfo.begin(); it != fileInfo.end(); it++) { batch.Write(make_pair(DB_BLOCK_FILES, it->first), *it->second); } @@ -157,7 +157,7 @@ bool CBlockTreeDB::ReadTxIndex(const uint256 &txid, CDiskTxPos &pos) { } bool CBlockTreeDB::WriteTxIndex(const std::vector >&vect) { - CLevelDBBatch batch(GetObfuscateKey()); + CLevelDBBatch batch(&GetObfuscateKey()); for (std::vector >::const_iterator it=vect.begin(); it!=vect.end(); it++) batch.Write(make_pair(DB_TXINDEX, it->first), it->second); return WriteBatch(batch);