Remove old database stuff.

libethereum/BlockChain.cpp

@@ -68,20 +68,6 @@ std::ostream& dev::eth::operator<<(std::ostream& _out, BlockChain const& _bc)
 	return _out;
 }
 
-ldb::Slice dev::eth::oldToSlice(h256 const& _h, unsigned _sub)
-{
-#if ALL_COMPILERS_ARE_CPP11_COMPLIANT
-	static thread_local h256 h = _h ^ sha3(h256(u256(_sub)));
-	return ldb::Slice((char const*)&h, 32);
-#else
-	static boost::thread_specific_ptr<h256> t_h;
-	if (!t_h.get())
-		t_h.reset(new h256);
-	*t_h = _h ^ sha3(h256(u256(_sub)));
-	return ldb::Slice((char const*)t_h.get(), 32);
-#endif
-}
-
 ldb::Slice dev::eth::toSlice(h256 const& _h, unsigned _sub)
 {
 #if ALL_COMPILERS_ARE_CPP11_COMPLIANT
@@ -996,33 +982,3 @@ bytes BlockChain::block(h256 const& _hash) const
 
 	return m_blocks[_hash];
 }
-
-bytes BlockChain::oldBlock(h256 const& _hash) const
-{
-	if (_hash == m_genesisHash)
-		return m_genesisBlock;
-
-	{
-		ReadGuard l(x_blocks);
-		auto it = m_blocks.find(_hash);
-		if (it != m_blocks.end())
-			return it->second;
-	}
-
-	string d;
-	m_blocksDB->Get(m_readOptions, oldToSlice(_hash), &d);
-
-	if (!d.size())
-	{
-		cwarn << "Couldn't find requested block:" << _hash.abridged();
-		return bytes();
-	}
-
-	noteUsed(_hash);
-
-	WriteGuard l(x_blocks);
-	m_blocks[_hash].resize(d.size());
-	memcpy(m_blocks[_hash].data(), d.data(), d.size());
-
-	return m_blocks[_hash];
-}

libethereum/BlockChain.h

@@ -64,7 +64,6 @@ struct BlockChainWarn: public LogChannel { static const char* name() { return "=
 std::map<Address, Account> const& genesisState();
 
 ldb::Slice toSlice(h256 const& _h, unsigned _sub = 0);
-ldb::Slice oldToSlice(h256 const& _h, unsigned _sub = 0);
 
 using BlocksHash = std::map<h256, bytes>;
 using TransactionHashes = h256s;
@@ -274,30 +273,6 @@ private:
 		return ret.first->second;
 	}
 
-	template<class T, unsigned N> T oldQueryExtras(h256 const& _h, std::map<h256, T>& _m, boost::shared_mutex& _x, T const& _n, ldb::DB* _extrasDB = nullptr) const
-	{
-		{
-			ReadGuard l(_x);
-			auto it = _m.find(_h);
-			if (it != _m.end())
-				return it->second;
-		}
-
-		std::string s;
-		(_extrasDB ? _extrasDB : m_extrasDB)->Get(m_readOptions, oldToSlice(_h, N), &s);
-		if (s.empty())
-		{
-//			cout << "Not found in DB: " << _h << endl;
-			return _n;
-		}
-
-		noteUsed(_h, N);
-
-		WriteGuard l(_x);
-		auto ret = _m.insert(std::make_pair(_h, T(RLP(s))));
-		return ret.first->second;
-	}
-
 	void checkConsistency();
 
 	/// The caches of the disk DB and their locks.