diff options
| author | chriseth <chris@ethereum.org> | 2018-04-17 05:03:49 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-17 05:03:49 +0800 |
| commit | 4cb486ee993cadde5564fb6c611d2bcf4fc44414 (patch) | |
| tree | 6b971913021037cf28141c38af97c7ecda77719f /test/RPCSession.cpp | |
| parent | dfe3193c7382c80f1814247a162663a97c3f5e67 (diff) | |
| parent | b8431c5c4a6795db8c42a1a3389047658bb87301 (diff) | |
| download | dexon-solidity-4cb486ee993cadde5564fb6c611d2bcf4fc44414.tar dexon-solidity-4cb486ee993cadde5564fb6c611d2bcf4fc44414.tar.gz dexon-solidity-4cb486ee993cadde5564fb6c611d2bcf4fc44414.tar.bz2 dexon-solidity-4cb486ee993cadde5564fb6c611d2bcf4fc44414.tar.lz dexon-solidity-4cb486ee993cadde5564fb6c611d2bcf4fc44414.tar.xz dexon-solidity-4cb486ee993cadde5564fb6c611d2bcf4fc44414.tar.zst dexon-solidity-4cb486ee993cadde5564fb6c611d2bcf4fc44414.zip | |
Merge pull request #3892 from ethereum/develop
Merge develop into release for 0.4.22
Diffstat (limited to 'test/RPCSession.cpp')
| -rw-r--r-- | test/RPCSession.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/test/RPCSession.cpp b/test/RPCSession.cpp index 54871057..f4eae865 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> @@ -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", @@ -337,7 +339,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")) { |