cerc-io/solidity
11
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

EVMVersion in langutil namespace instead of solidity

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
test/ExecutionFramework.h
+1 -1
View File
@@ -239,7 +239,7 @@ protected:
bytes data;
};
solidity::EVMVersion m_evmVersion;
langutil::EVMVersion m_evmVersion;
unsigned m_optimizeRuns = 200;
bool m_optimize = false;
bool m_showMessages = false;
test/Options.cpp
+3 -3
View File
@@ -59,16 +59,16 @@ Options::Options()
parse(suite.argc, suite.argv);
}
dev::solidity::EVMVersion Options::evmVersion() const
langutil::EVMVersion Options::evmVersion() const
{
if (!evmVersionString.empty())
{
// We do this check as opposed to in the constructor because the BOOST_REQUIRE
// macros cannot yet be used in the constructor.
auto version = solidity::EVMVersion::fromString(evmVersionString);
auto version = langutil::EVMVersion::fromString(evmVersionString);
BOOST_REQUIRE_MESSAGE(version, "Invalid EVM version: " + evmVersionString);
return *version;
}
else
return dev::solidity::EVMVersion();
return langutil::EVMVersion();
}
test/Options.h
+1 -1
View File
@@ -37,7 +37,7 @@ struct Options: CommonOptions
bool showMessages = false;
bool useABIEncoderV2 = false;
solidity::EVMVersion evmVersion() const;
langutil::EVMVersion evmVersion() const;
static Options const& get();
test/RPCSession.cpp
+4 -4
View File
@@ -237,16 +237,16 @@ string RPCSession::personal_newAccount(string const& _password)
void RPCSession::test_setChainParams(vector<string> const& _accounts)
{
string forks;
if (test::Options::get().evmVersion() >= solidity::EVMVersion::tangerineWhistle())
if (test::Options::get().evmVersion() >= langutil::EVMVersion::tangerineWhistle())
forks += "\"EIP150ForkBlock\": \"0x00\",\n";
if (test::Options::get().evmVersion() >= solidity::EVMVersion::spuriousDragon())
if (test::Options::get().evmVersion() >= langutil::EVMVersion::spuriousDragon())
forks += "\"EIP158ForkBlock\": \"0x00\",\n";
if (test::Options::get().evmVersion() >= solidity::EVMVersion::byzantium())
if (test::Options::get().evmVersion() >= langutil::EVMVersion::byzantium())
{
forks += "\"byzantiumForkBlock\": \"0x00\",\n";
m_receiptHasStatusField = true;
}
if (test::Options::get().evmVersion() >= solidity::EVMVersion::constantinople())
if (test::Options::get().evmVersion() >= langutil::EVMVersion::constantinople())
forks += "\"constantinopleForkBlock\": \"0x00\",\n";
static string const c_configString = R"(
{
test/libsolidity/ABIDecoderTests.cpp
+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));
test/libsolidity/SolidityEndToEndTest.cpp
+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 {
test/tools/fuzzer_common.cpp
+1 -1
View File
@@ -114,7 +114,7 @@ void FuzzerUtil::testConstantOptimizer(string const& _input, bool _quiet)
ConstantOptimisationMethod::optimiseConstants(
isCreation,
runs,
EVMVersion{},
langutil::EVMVersion{},
tmp
);
}