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

Merge remote-tracking branch 'origin/develop' into breaking

Browse Source
This commit is contained in:
chriseth
2020-05-12 17:48:53 +02:00
parent 5566cd9f74 cccf16ec35
commit 0be56a0abf
342 changed files with 4644 additions and 1159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/libsolidity/GasCosts.cpp
+2 -2
View File
@@ -100,7 +100,7 @@ BOOST_AUTO_TEST_CASE(string_storage)
// This is only correct on >=Constantinople.
else if (CommonOptions::get().useABIEncoderV2)
{
if (CommonOptions::get().optimizeYul)
if (CommonOptions::get().optimize)
{
// Costs with 0 are cases which cannot be triggered in tests.
if (evmVersion < EVMVersion::istanbul())
@@ -129,7 +129,7 @@ BOOST_AUTO_TEST_CASE(string_storage)
// This is only correct on >=Constantinople.
else if (CommonOptions::get().useABIEncoderV2)
{
if (CommonOptions::get().optimizeYul)
if (CommonOptions::get().optimize)
{
if (evmVersion < EVMVersion::istanbul())
CHECK_GAS(0, 21567, 20);