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

Fix develop 060 merge

Browse Source
This commit is contained in:
Leonardo Alt
2019-11-20 13:49:40 +01:00
parent 389da5228e
commit 72eff30778
5 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/libsolidity/GasCosts.cpp
+11 -11
View File
@@ -41,7 +41,7 @@ namespace test
#define CHECK_DEPLOY_GAS(_gasNoOpt, _gasOpt, _evmVersion) \
do \
{ \
u256 ipfsCost = GasMeter::dataGas(dev::ipfsHash(m_compiler.metadata(m_compiler.lastContractName())), true); \
u256 ipfsCost = GasMeter::dataGas(dev::ipfsHash(m_compiler.metadata(m_compiler.lastContractName())), true, _evmVersion); \
u256 gasOpt{_gasOpt}; \
u256 gasNoOpt{_gasNoOpt}; \
u256 gas = m_optimiserSettings == OptimiserSettings::minimal() ? gasNoOpt : gasOpt; \
@@ -99,7 +99,7 @@ BOOST_AUTO_TEST_CASE(string_storage)
auto evmVersion = dev::test::Options::get().evmVersion();
if (evmVersion <= EVMVersion::byzantium())
CHECK_DEPLOY_GAS(134071, 130763, evmVersion);
CHECK_DEPLOY_GAS(134145, 130831, evmVersion);
// This is only correct on >=Constantinople.
else if (Options::get().useABIEncoderV2)
{
@@ -107,28 +107,28 @@ BOOST_AUTO_TEST_CASE(string_storage)
{
// Costs with 0 are cases which cannot be triggered in tests.
if (evmVersion < EVMVersion::istanbul())
CHECK_DEPLOY_GAS(0, 127653, evmVersion);
CHECK_DEPLOY_GAS(0, 127721, evmVersion);
else
CHECK_DEPLOY_GAS(0, 113821, evmVersion);
CHECK_DEPLOY_GAS(0, 113993, evmVersion);
}
else
{
if (evmVersion < EVMVersion::istanbul())
CHECK_DEPLOY_GAS(0, 135371, evmVersion);
CHECK_DEPLOY_GAS(151523, 135371, evmVersion);
else
CHECK_DEPLOY_GAS(0, 120083, evmVersion);
CHECK_DEPLOY_GAS(134883, 120083, evmVersion);
}
}
else if (evmVersion < EVMVersion::istanbul())
CHECK_DEPLOY_GAS(126861, 119591, evmVersion);
CHECK_DEPLOY_GAS(126929, 119659, evmVersion);
else
CHECK_DEPLOY_GAS(114173, 107163, evmVersion);
CHECK_DEPLOY_GAS(114345, 107335, evmVersion);
if (evmVersion >= EVMVersion::byzantium())
{
callContractFunction("f()");
if (evmVersion == EVMVersion::byzantium())
CHECK_GAS(21551, 21526, 20);
CHECK_GAS(21545, 21526, 20);
// This is only correct on >=Constantinople.
else if (Options::get().useABIEncoderV2)
{
@@ -142,9 +142,9 @@ BOOST_AUTO_TEST_CASE(string_storage)
else
{
if (evmVersion < EVMVersion::istanbul())
CHECK_GAS(0, 21635, 20);
CHECK_GAS(21707, 21635, 20);
else
CHECK_GAS(0, 21431, 20);
CHECK_GAS(21499, 21431, 20);
}
}
else if (evmVersion < EVMVersion::istanbul())