Merge remote-tracking branch 'upstream/develop' into NewStateTests

Conflicts:
	test/state.cpp
	test/tmpFiller.json

1 files changed, 1 insertions, 7 deletions

diff --git a/state.cpp b/state.cpp
index 71367696..adf1e44a 100644
--- a/state.cpp
+++ b/state.cpp
@@ -54,13 +54,7 @@ void doStateTests(json_spirit::mValue& v, bool _fillin)
 
 		ImportTest importer(o, _fillin);
 
-		if (_fillin)
-		{
-			importer.code = importer.m_statePre.code(importer.m_environment.myAddress);
-			importer.m_environment.code = importer.code;
-		}
-
-		State theState = importer.m_statePre;		
+		State theState = importer.m_statePre;
 		bytes tx = importer.m_transaction.rlp();
 		bytes output;