Merge branch 'poc9trie' of github.com:ethereum/cpp-ethereum into poc9trie

Conflicts:
	libethereum/Client.cpp
	test/state.cpp

1 files changed, 6 insertions, 31 deletions

diff --git a/state.cpp b/state.cpp
index 7230d05f..7649dae6 100644
--- a/state.cpp
+++ b/state.cpp
@@ -168,7 +168,7 @@ BOOST_AUTO_TEST_CASE(stBlockHashTest)
 	dev::test::executeTests("stBlockHashTest", "/StateTests", dev::test::doStateTests);
 }
 
-BOOST_AUTO_TEST_CASE(stQuadraticComplexityTest)
+BOOST_AUTO_TEST_CASE(stMemoryStressTest)
 {
 	for (int i = 1; i < boost::unit_test::framework::master_test_suite().argc; ++i)
 	{
@@ -176,27 +176,15 @@ BOOST_AUTO_TEST_CASE(stQuadraticComplexityTest)
 		if (arg == "--quadratic" || arg == "--all")
 		{
 			auto start = chrono::steady_clock::now();
-
 			dev::test::executeTests("stQuadraticComplexityTest", "/StateTests", dev::test::doStateTests);
-
 			auto end = chrono::steady_clock::now();
 			auto duration(chrono::duration_cast<chrono::milliseconds>(end - start));
 			cnote << "test duration: " << duration.count() << " milliseconds.\n";
 		}
-	}
-}
-
-BOOST_AUTO_TEST_CASE(stMemoryStressTest)
-{
-	for (int i = 1; i < boost::unit_test::framework::master_test_suite().argc; ++i)
-	{
-		string arg = boost::unit_test::framework::master_test_suite().argv[i];
-		if (arg == "--memory" || arg == "--all")
+		else if (arg == "--memory" || arg == "--all")
 		{
 			auto start = chrono::steady_clock::now();
-
 			dev::test::executeTests("stMemoryStressTest", "/StateTests", dev::test::doStateTests);
-
 			auto end = chrono::steady_clock::now();
 			auto duration(chrono::duration_cast<chrono::milliseconds>(end - start));
 			cnote << "test duration: " << duration.count() << " milliseconds.\n";
@@ -204,27 +192,14 @@ BOOST_AUTO_TEST_CASE(stMemoryStressTest)
 	}
 }
 
-BOOST_AUTO_TEST_CASE(stSolidityTest)
+BOOST_AUTO_TEST_CASE(stMemoryTest)
 {
-	   for (int i = 1; i < boost::unit_test::framework::master_test_suite().argc; ++i)
-	   {
-			   string arg = boost::unit_test::framework::master_test_suite().argv[i];
-			   if (arg == "--quadratic" || arg == "--all")
-			   {
-					   auto start = chrono::steady_clock::now();
-
-					   dev::test::executeTests("stQuadraticComplexityTest", "/StateTests", dev::test::doStateTests);
-
-					   auto end = chrono::steady_clock::now();
-					   auto duration(chrono::duration_cast<chrono::milliseconds>(end - start));
-					   cnote << "test duration: " << duration.count() << " milliseconds.\n";
-			   }
-	   }
+	dev::test::executeTests("stMemoryTest", "/StateTests", dev::test::doStateTests);
 }
 
-BOOST_AUTO_TEST_CASE(stMemoryTest)
+BOOST_AUTO_TEST_CASE(stSolidityTest)
 {
-	dev::test::executeTests("stMemoryTest", "/StateTests", dev::test::doStateTests);
+	dev::test::executeTests("stSolidityTest", "/StateTests", dev::test::doStateTests);
 }
 
 BOOST_AUTO_TEST_CASE(stCreateTest)