Check State

vmArithmeticTestFiller, memory test fix

test/stMemoryStressTestFiller.json

@@ -131,7 +131,7 @@
 	"expect" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "storage" : {
-                    "0x" : "0x0100000020"
+                    "0x" : "0x20"
                 }
             }
 	},

test/vm.cpp

@@ -390,10 +390,12 @@ void doVMTests(json_spirit::mValue& v, bool _fillin)
 
 				if (o.count("expect") > 0)
 				{
-					State postState, expectState;
+					State postState(Address(), OverlayDB(), eth::BaseState::Empty);
+					State expectState(Address(), OverlayDB(), eth::BaseState::Empty);
+					stateOptionsMap expectStateMap;
 					ImportTest::importState(o["post"].get_obj(), postState);
-					ImportTest::importState(o["expect"].get_obj(), expectState);
+					ImportTest::importState(o["expect"].get_obj(), expectState, expectStateMap);
-					ImportTest::checkExpectedState(expectState, postState, Options::get().checkState ? WhenError::Throw : WhenError::DontThrow);
+					ImportTest::checkExpectedState(expectState, postState, expectStateMap, Options::get().checkState ? WhenError::Throw : WhenError::DontThrow);
 					o.erase(o.find("expect"));
 				}