Merge branch 'develop' into whisper

1 files changed, 70 insertions, 54 deletions

diff --git a/TestHelper.cpp b/TestHelper.cpp
index 96e11e02..793e0565 100644
--- a/TestHelper.cpp
+++ b/TestHelper.cpp
@@ -288,7 +288,7 @@ void ImportTest::checkExpectedState(State const& _stateExpect, State const& _sta
 				{
 					addressOptions = _expectedStateOptions.at(a.first);
 				}
-				catch(std::out_of_range)
+				catch(std::out_of_range const&)
 				{
 					BOOST_ERROR("expectedStateOptions map does not match expectedState in checkExpectedState!");
 					break;
@@ -327,7 +327,8 @@ void ImportTest::checkExpectedState(State const& _stateExpect, State const& _sta
 void ImportTest::exportTest(bytes const& _output, State const& _statePost)
 {
 	// export output
-	m_TestObject["out"] = toHex(_output, 2, HexPrefix::Add);
+
+	m_TestObject["out"] = (_output.size() > 4096 && !Options::get().fulloutput) ? "#" + toString(_output.size()) : toHex(_output, 2, HexPrefix::Add);
 
 	// export logs
 	m_TestObject["logs"] = exportLog(_statePost.pending().size() ? _statePost.log(0) : LogEntries());
@@ -489,7 +490,11 @@ LogEntries importLog(json_spirit::mArray& _a)
 void checkOutput(bytes const& _output, json_spirit::mObject& _o)
 {
 	int j = 0;
-	if (_o["out"].type() == json_spirit::array_type)
+
+	if (_o["out"].get_str().find("#") == 0)
+		BOOST_CHECK((u256)_output.size() == toInt(_o["out"].get_str().substr(1)));
+
+	else if (_o["out"].type() == json_spirit::array_type)
 		for (auto const& d: _o["out"].get_array())
 		{
 			BOOST_CHECK_MESSAGE(_output[j] == toInt(d), "Output byte [" << j << "] different!");
@@ -549,58 +554,53 @@ void checkCallCreates(eth::Transactions _resultCallCreates, eth::Transactions _e
 	}
 }
 
-void userDefinedTest(string testTypeFlag, std::function<void(json_spirit::mValue&, bool)> doTests)
+void userDefinedTest(std::function<void(json_spirit::mValue&, bool)> doTests)
 {
-	Options::get(); // parse command line options, e.g. to enable JIT
+	if (!Options::get().singleTest)
+		return;
 
-	for (int i = 1; i < boost::unit_test::framework::master_test_suite().argc; ++i)
+	if (Options::get().singleTestFile.empty() || Options::get().singleTestName.empty())
 	{
-		string arg = boost::unit_test::framework::master_test_suite().argv[i];
-		if (arg == testTypeFlag)
-		{
-			if (boost::unit_test::framework::master_test_suite().argc <= i + 2)
-			{
-				cnote << "Missing filename\nUsage: testeth " << testTypeFlag << " <filename> <testname>\n";
-				return;
-			}
-			string filename = boost::unit_test::framework::master_test_suite().argv[i + 1];
-			string testname = boost::unit_test::framework::master_test_suite().argv[i + 2];
-			int currentVerbosity = g_logVerbosity;
-			g_logVerbosity = 12;
-			try
-			{
-				cnote << "Testing user defined test: " << filename;
-				json_spirit::mValue v;
-				string s = asString(contents(filename));
-				BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of " + filename + " is empty. ");
-				json_spirit::read_string(s, v);
-				json_spirit::mObject oSingleTest;
-
-				json_spirit::mObject::const_iterator pos = v.get_obj().find(testname);
-				if (pos == v.get_obj().end())
-				{
-					cnote << "Could not find test: " << testname << " in " << filename << "\n";
-					return;
-				}
-				else
-					oSingleTest[pos->first] = pos->second;
+		cnote << "Missing user test specification\nUsage: testeth --singletest <filename> <testname>\n";
+		return;
+	}
 
-				json_spirit::mValue v_singleTest(oSingleTest);
-				doTests(v_singleTest, false);
-			}
-			catch (Exception const& _e)
-			{
-				BOOST_ERROR("Failed Test with Exception: " << diagnostic_information(_e));
-				g_logVerbosity = currentVerbosity;
-			}
-			catch (std::exception const& _e)
-			{
-				BOOST_ERROR("Failed Test with Exception: " << _e.what());
-				g_logVerbosity = currentVerbosity;
-			}
-			g_logVerbosity = currentVerbosity;
+	auto& filename = Options::get().singleTestFile;
+	auto& testname = Options::get().singleTestName;
+	int currentVerbosity = g_logVerbosity;
+	g_logVerbosity = 12;
+	try
+	{
+		cnote << "Testing user defined test: " << filename;
+		json_spirit::mValue v;
+		string s = asString(contents(filename));
+		BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of " + filename + " is empty. ");
+		json_spirit::read_string(s, v);
+		json_spirit::mObject oSingleTest;
+
+		json_spirit::mObject::const_iterator pos = v.get_obj().find(testname);
+		if (pos == v.get_obj().end())
+		{
+			cnote << "Could not find test: " << testname << " in " << filename << "\n";
+			return;
 		}
+		else
+			oSingleTest[pos->first] = pos->second;
+
+		json_spirit::mValue v_singleTest(oSingleTest);
+		doTests(v_singleTest, test::Options::get().fillTests);
 	}
+	catch (Exception const& _e)
+	{
+		BOOST_ERROR("Failed Test with Exception: " << diagnostic_information(_e));
+		g_logVerbosity = currentVerbosity;
+	}
+	catch (std::exception const& _e)
+	{
+		BOOST_ERROR("Failed Test with Exception: " << _e.what());
+		g_logVerbosity = currentVerbosity;
+	}
+	g_logVerbosity = currentVerbosity;
 }
 
 void executeTests(const string& _name, const string& _testPathAppendix, const boost::filesystem::path _pathToFiller, std::function<void(json_spirit::mValue&, bool)> doTests)
@@ -707,10 +707,9 @@ Options::Options()
 	{
 		auto arg = std::string{argv[i]};
 		if (arg == "--jit")
-		{
-			jit = true;
 			eth::VMFactory::setKind(eth::VMKind::JIT);
-		}
+		else if (arg == "--vm=smart")
+			eth::VMFactory::setKind(eth::VMKind::Smart);
 		else if (arg == "--vmtrace")
 			vmtrace = true;
 		else if (arg == "--filltests")
@@ -732,6 +731,8 @@ Options::Options()
 			bigData = true;
 		else if (arg == "--checkstate")
 			checkState = true;
+		else if (arg == "--wallet")
+			wallet = true;
 		else if (arg == "--all")
 		{
 			performance = true;
@@ -739,12 +740,28 @@ Options::Options()
 			memory = true;
 			inputLimits = true;
 			bigData = true;
+			wallet= true;
 		}
 		else if (arg == "--singletest" && i + 1 < argc)
 		{
 			singleTest = true;
-			singleTestName = argv[i + 1];
+			auto name1 = std::string{argv[i + 1]};
+			if (i + 1 < argc) // two params
+			{
+				auto name2 = std::string{argv[i + 2]};
+				if (name2[0] == '-') // not param, another option
+					singleTestName = std::move(name1);
+				else
+				{
+					singleTestFile = std::move(name1);
+					singleTestName = std::move(name2);
+				}
+			}
+			else
+				singleTestName = std::move(name1);
 		}
+		else if (arg == "--fulloutput")
+			fulloutput = true;
 	}
 }
 
@@ -754,7 +771,6 @@ Options const& Options::get()
 	return instance;
 }
 
-
 LastHashes lastHashes(u256 _currentBlockNumber)
 {
 	LastHashes ret;