From d63d41b3b545b0e13e2ee7f880120b2ba852c654 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 14 Mar 2018 12:04:04 +0100
Subject: test: Rename test/TestHelper.* to test/Options.* and add
 Options::validate().

---
 test/RPCSession.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test/RPCSession.cpp')

diff --git a/test/RPCSession.cpp b/test/RPCSession.cpp
index 54871057..03b1341c 100644
--- a/test/RPCSession.cpp
+++ b/test/RPCSession.cpp
@@ -21,7 +21,7 @@
 
 #include <test/RPCSession.h>
 
-#include <test/TestHelper.h>
+#include <test/Options.h>
 
 #include <libsolidity/interface/EVMVersion.h>
 
-- 
cgit v1.2.3


From 7f232358bb6e40d96b83e732ecdad882a8ed972b Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Thu, 5 Apr 2018 11:59:31 +0200
Subject: Show JSON error if jsonParseStrict failed in soltest

---
 test/RPCSession.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'test/RPCSession.cpp')

diff --git a/test/RPCSession.cpp b/test/RPCSession.cpp
index 03b1341c..c4a38f52 100644
--- a/test/RPCSession.cpp
+++ b/test/RPCSession.cpp
@@ -337,7 +337,9 @@ Json::Value RPCSession::rpcCall(string const& _methodName, vector<string> const&
 	BOOST_TEST_MESSAGE("Reply: " + reply);
 
 	Json::Value result;
-	BOOST_REQUIRE(jsonParseStrict(reply, result));
+	string errorMsg;
+	if (!jsonParseStrict(reply, result, &errorMsg))
+		BOOST_REQUIRE_MESSAGE(false, errorMsg);
 
 	if (result.isMember("error"))
 	{
-- 
cgit v1.2.3


From ac6a30442f4096d1d3b0ca97b0f1d086c1056bcd Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Thu, 5 Apr 2018 11:55:46 +0200
Subject: Support constantinople in soltest

---
 test/RPCSession.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'test/RPCSession.cpp')

diff --git a/test/RPCSession.cpp b/test/RPCSession.cpp
index 03b1341c..7d4b8924 100644
--- a/test/RPCSession.cpp
+++ b/test/RPCSession.cpp
@@ -226,6 +226,8 @@ void RPCSession::test_setChainParams(vector<string> const& _accounts)
 		forks += "\"EIP158ForkBlock\": \"0x00\",\n";
 	if (test::Options::get().evmVersion() >= solidity::EVMVersion::byzantium())
 		forks += "\"byzantiumForkBlock\": \"0x00\",\n";
+	if (test::Options::get().evmVersion() >= solidity::EVMVersion::constantinople())
+		forks += "\"constantinopleForkBlock\": \"0x00\",\n";
 	static string const c_configString = R"(
 	{
 		"sealEngine": "NoProof",
-- 
cgit v1.2.3