Combine State::ensureCached into State::account.

ethereum · Oct 28, 2016 · 777d14d · 777d14d
1 parent 6162531
commit 777d14d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 18 deletions.
diff --git a/deps b/deps
diff --git a/evmjit b/evmjit
diff --git a/libethereum/State.cpp b/libethereum/State.cpp
@@ -209,16 +209,6 @@ StateDiff State::diff(State const& _c, bool _quick) const
 }
 
 Account const* State::account(Address const& _a, bool _requireCode) const
-{
-	return ensureCached(_a, _requireCode);
-}
-
-Account* State::account(Address const& _a, bool _requireCode)
-{
-	return ensureCached(_a, _requireCode);
-}
-
-Account* State::ensureCached(Address const& _a, bool _requireCode) const
 {
 	Account *a = nullptr;
 	auto it = m_cache.find(_a);
@@ -233,7 +223,6 @@ Account* State::ensureCached(Address const& _a, bool _requireCode) const
 
 		clearCacheIfTooLarge();
 
-
 		RLP state(stateBack);
 		m_cache[_a] = Account(state[0].toInt<u256>(), state[1].toInt<u256>(), state[2].toHash<h256>(), state[3].toHash<h256>(), Account::Unchanged);
 		m_unchangedCacheEntries.insert(_a);
@@ -247,6 +236,12 @@ Account* State::ensureCached(Address const& _a, bool _requireCode) const
 	return a;
 }
 
+Account* State::account(Address const& _a, bool _requireCode)
+{
+	return const_cast<Account*>(account(_a, _requireCode));
+}
+
+
 void State::clearCacheIfTooLarge() const
 {
 	// TODO: Find a good magic number

diff --git a/libethereum/State.h b/libethereum/State.h
@@ -258,11 +258,6 @@ class State
 	/// The pointer is valid until the next access to the state or account.
 	Account* account(Address const& _a, bool _requireCode = false);
 
-	/// Retrieve certain information about a given address into the cache and return
-	/// a pointer to the relevant account (or a null pointer if it does not exist).
-	/// If _requireCode is true, also load the code.
-	Account* ensureCached(Address const& _a, bool _requireCode) const;
-
 	/// Purges non-modified entries in m_cache if it grows too large.
 	void clearCacheIfTooLarge() const;
+3 −0		install_deps.cmake
+0 −26		jsoncpp.cmake
+0 −89		jsonrpc.cmake
+7 −17		.travis.yml
+0 −6		CMakeLists.txt
+3 −2		circle.yml
+3 −9		cmake/llvm.cmake
+0 −11		docker/Dockerfile
+0 −11		docker/test.sh
+1 −1		docs/Doxyfile
+2 −8		examples/CMakeLists.txt
+9 −70		examples/capi.c
+0 −78		examples/examplevm.c
+114 −265		include/evm.h
+0 −27		include/evmjit.h
+35 −3		include/evmjit/JIT.h
+16 −3		libevmjit/Array.cpp
+14 −126		libevmjit/CMakeLists.txt
+5 −4		libevmjit/Cache.cpp
+1 −1		libevmjit/Cache.h
+16 −32		libevmjit/Compiler.cpp
+1 −1		libevmjit/Compiler.h
+7 −95		libevmjit/Ext.cpp
+1 −2		libevmjit/Ext.h
+1 −1		libevmjit/GasMeter.cpp
+26 −90		libevmjit/JIT.cpp
+18 −0		libevmjit/RuntimeManager.cpp
+1 −1		libevmjit/Type.h
+35 −0		libevmjit/evmjit.cpp
+4 −0		libevmjit/preprocessor/llvm_includes_end.h
+8 −0		libevmjit/preprocessor/llvm_includes_start.h
+38 −0		libevmjit/support/Path.cpp
+23 −0		libevmjit/support/Path.h
+0 −8		scripts/build.sh
+0 −8		scripts/travis_update_docs.sh
+0 −15		tests/CMakeLists.txt
+0 −15		tests/test-evmjit-standalone.c
+0 −18		wercker.yml