EVMVersion in langutil namespace instead of solidity

This commit is contained in:
Leonardo Alt
2019-02-25 15:29:57 +01:00
parent 52ee955fba
commit 2405b2151a
30 changed files with 72 additions and 75 deletions
+3 -3
View File
@@ -762,7 +762,7 @@ BOOST_AUTO_TEST_CASE(complex_struct)
BOOST_AUTO_TEST_CASE(return_dynamic_types_cross_call_simple)
{
if (m_evmVersion == EVMVersion::homestead())
if (m_evmVersion == langutil::EVMVersion::homestead())
return;
string sourceCode = R"(
@@ -783,7 +783,7 @@ BOOST_AUTO_TEST_CASE(return_dynamic_types_cross_call_simple)
BOOST_AUTO_TEST_CASE(return_dynamic_types_cross_call_advanced)
{
if (m_evmVersion == EVMVersion::homestead())
if (m_evmVersion == langutil::EVMVersion::homestead())
return;
string sourceCode = R"(
@@ -830,7 +830,7 @@ BOOST_AUTO_TEST_CASE(return_dynamic_types_cross_call_out_of_range)
)";
BOTH_ENCODERS(
compileAndRun(sourceCode, 0, "C");
if (m_evmVersion == EVMVersion::homestead())
if (m_evmVersion == langutil::EVMVersion::homestead())
{
ABI_CHECK(callContractFunction("f(uint256)", 0x60), encodeArgs(true));
ABI_CHECK(callContractFunction("f(uint256)", 0x7f), encodeArgs(true));
+1 -1
View File
@@ -3080,7 +3080,7 @@ BOOST_AUTO_TEST_CASE(gasprice)
BOOST_AUTO_TEST_CASE(blockhash)
{
// depending on the aleth version, this test only works for pre-constantinople
if (Options::get().evmVersion() < EVMVersion::constantinople())
if (Options::get().evmVersion() < langutil::EVMVersion::constantinople())
{
char const* sourceCode = R"(
contract C {