diff options
Diffstat (limited to 'test/RPCSession.cpp')
| -rw-r--r-- | test/RPCSession.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/test/RPCSession.cpp b/test/RPCSession.cpp index 79ddf754..54871057 100644 --- a/test/RPCSession.cpp +++ b/test/RPCSession.cpp @@ -219,9 +219,13 @@ 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\","; + string forks; + if (test::Options::get().evmVersion() >= solidity::EVMVersion::tangerineWhistle()) + forks += "\"EIP150ForkBlock\": \"0x00\",\n"; + if (test::Options::get().evmVersion() >= solidity::EVMVersion::spuriousDragon()) + forks += "\"EIP158ForkBlock\": \"0x00\",\n"; + if (test::Options::get().evmVersion() >= solidity::EVMVersion::byzantium()) + forks += "\"byzantiumForkBlock\": \"0x00\",\n"; static string const c_configString = R"( { "sealEngine": "NoProof", @@ -230,10 +234,8 @@ void RPCSession::test_setChainParams(vector<string> const& _accounts) "maximumExtraDataSize": "0x1000000", "blockReward": "0x", "allowFutureBlocks": true, - "homesteadForkBlock": "0x00", - )" + enableByzantium + R"( - "EIP150ForkBlock": "0x00", - "EIP158ForkBlock": "0x00" + )" + forks + R"( + "homesteadForkBlock": "0x00" }, "genesis": { "author": "0000000000000010000000000000000000000000", |