From 739533e9c7534cd3a0b321a3a6be1e041c91e4a2 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Fri, 23 Feb 2018 16:41:23 +0100
Subject: [PATCH] Activate byzantium for testing.

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

diff --git a/test/RPCSession.cpp b/test/RPCSession.cpp
index 69c75ceef..79ddf754d 100644
--- a/test/RPCSession.cpp
+++ b/test/RPCSession.cpp
@@ -19,7 +19,11 @@
 /// @file RPCSession.cpp
 /// Low-level IPC communication between the test framework and the Ethereum node.
 
-#include "RPCSession.h"
+#include <test/RPCSession.h>
+
+#include <test/TestHelper.h>
+
+#include <libsolidity/interface/EVMVersion.h>
 
 #include <libdevcore/CommonData.h>
 
@@ -215,6 +219,9 @@ string RPCSession::personal_newAccount(string const& _password)
 
 void RPCSession::test_setChainParams(vector<string> const& _accounts)
 {
+	string enableByzantium;
+	if (test::Options::get().evmVersion() == solidity::EVMVersion::byzantium())
+		 enableByzantium = "\"byzantiumForkBlock\": \"0x00\",";
 	static string const c_configString = R"(
 	{
 		"sealEngine": "NoProof",
@@ -224,6 +231,7 @@ void RPCSession::test_setChainParams(vector<string> const& _accounts)
 			"blockReward": "0x",
 			"allowFutureBlocks": true,
 			"homesteadForkBlock": "0x00",
+			)" + enableByzantium + R"(
 			"EIP150ForkBlock": "0x00",
 			"EIP158ForkBlock": "0x00"
 		},