aboutsummaryrefslogtreecommitdiffstats
path: root/state.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'state.cpp')
-rw-r--r--state.cpp19
1 files changed, 7 insertions, 12 deletions
diff --git a/state.cpp b/state.cpp
index 9c0a7188..91d9f3e5 100644
--- a/state.cpp
+++ b/state.cpp
@@ -43,7 +43,6 @@ namespace dev { namespace test {
void doStateTests(json_spirit::mValue& v, bool _fillin)
{
- cout << "start state test\n";
for (auto& i: v.get_obj())
{
cnote << i.first;
@@ -55,12 +54,6 @@ 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;
bytes tx = importer.m_transaction.rlp();
bytes output;
@@ -124,12 +117,14 @@ BOOST_AUTO_TEST_CASE(stSystemOperationsTest)
dev::test::executeTests("stSystemOperationsTest", "/StateTests", dev::test::doStateTests);
}
-BOOST_AUTO_TEST_CASE(tmp)
+BOOST_AUTO_TEST_CASE(stPreCompiledContracts)
+{
+ dev::test::executeTests("stPreCompiledContracts", "/StateTests", dev::test::doStateTests);
+}
+
+BOOST_AUTO_TEST_CASE(userDefinedFileState)
{
- int currentVerbosity = g_logVerbosity;
- g_logVerbosity = 12;
- dev::test::executeTests("tmp", "/StateTests", dev::test::doStateTests);
- g_logVerbosity = currentVerbosity;
+ dev::test::userDefinedTest("--statetest", dev::test::doStateTests);
}
BOOST_AUTO_TEST_SUITE_END()