From c32664134178f86f344f8a5631294edc133ee51e Mon Sep 17 00:00:00 2001 From: chriseth Date: Thu, 5 Dec 2019 09:37:52 +0100 Subject: [PATCH 1/2] Update missed tests for removal of superFunction. --- test/cmdlineTests/recovery_ast_constructor/output | 2 -- test/cmdlineTests/standard_only_ast_requested/output.json | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/test/cmdlineTests/recovery_ast_constructor/output b/test/cmdlineTests/recovery_ast_constructor/output index 69e7a597a..1a3526893 100644 --- a/test/cmdlineTests/recovery_ast_constructor/output +++ b/test/cmdlineTests/recovery_ast_constructor/output @@ -70,7 +70,6 @@ JSON AST: "overrides": null, "scope": 18, "stateMutability": "nonpayable", - "superFunction": null, "visibility": "public" }, "children": @@ -134,7 +133,6 @@ JSON AST: "overrides": null, "scope": 18, "stateMutability": "view", - "superFunction": null, "visibility": "public" }, "children": diff --git a/test/cmdlineTests/standard_only_ast_requested/output.json b/test/cmdlineTests/standard_only_ast_requested/output.json index 896ec9b11..aa1988e16 100644 --- a/test/cmdlineTests/standard_only_ast_requested/output.json +++ b/test/cmdlineTests/standard_only_ast_requested/output.json @@ -1 +1 @@ -{"sources":{"A":{"ast":{"absolutePath":"A","exportedSymbols":{"C":[6]},"id":7,"nodeType":"SourceUnit","nodes":[{"id":1,"literals":["solidity",">=","0.0"],"nodeType":"PragmaDirective","src":"0:22:0"},{"abstract":false,"baseContracts":[],"contractDependencies":[],"contractKind":"contract","documentation":null,"fullyImplemented":true,"id":6,"linearizedBaseContracts":[6],"name":"C","nodeType":"ContractDefinition","nodes":[{"body":{"id":4,"nodeType":"Block","src":"61:2:0","statements":[]},"documentation":null,"id":5,"implemented":true,"kind":"function","modifiers":[],"name":"f","nodeType":"FunctionDefinition","overrides":null,"parameters":{"id":2,"nodeType":"ParameterList","parameters":[],"src":"46:2:0"},"returnParameters":{"id":3,"nodeType":"ParameterList","parameters":[],"src":"61:0:0"},"scope":6,"src":"36:27:0","stateMutability":"pure","superFunction":null,"visibility":"public"}],"scope":7,"src":"23:42:0"}],"src":"0:65:0"},"id":0}}} +{"sources":{"A":{"ast":{"absolutePath":"A","exportedSymbols":{"C":[6]},"id":7,"nodeType":"SourceUnit","nodes":[{"id":1,"literals":["solidity",">=","0.0"],"nodeType":"PragmaDirective","src":"0:22:0"},{"abstract":false,"baseContracts":[],"contractDependencies":[],"contractKind":"contract","documentation":null,"fullyImplemented":true,"id":6,"linearizedBaseContracts":[6],"name":"C","nodeType":"ContractDefinition","nodes":[{"body":{"id":4,"nodeType":"Block","src":"61:2:0","statements":[]},"documentation":null,"id":5,"implemented":true,"kind":"function","modifiers":[],"name":"f","nodeType":"FunctionDefinition","overrides":null,"parameters":{"id":2,"nodeType":"ParameterList","parameters":[],"src":"46:2:0"},"returnParameters":{"id":3,"nodeType":"ParameterList","parameters":[],"src":"61:0:0"},"scope":6,"src":"36:27:0","stateMutability":"pure","visibility":"public"}],"scope":7,"src":"23:42:0"}],"src":"0:65:0"},"id":0}}} From ac996d209f530398f190c83ba008d4049ae66fe3 Mon Sep 17 00:00:00 2001 From: chriseth Date: Thu, 5 Dec 2019 10:17:09 +0100 Subject: [PATCH 2/2] Fix gas cost test. --- test/libsolidity/GasCosts.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/libsolidity/GasCosts.cpp b/test/libsolidity/GasCosts.cpp index f1761e071..6b6adf2e3 100644 --- a/test/libsolidity/GasCosts.cpp +++ b/test/libsolidity/GasCosts.cpp @@ -109,7 +109,7 @@ BOOST_AUTO_TEST_CASE(string_storage) if (evmVersion < EVMVersion::istanbul()) CHECK_DEPLOY_GAS(0, 123969, evmVersion); else - CHECK_DEPLOY_GAS(0, 113993, evmVersion); + CHECK_DEPLOY_GAS(0, 110969, evmVersion); } else {