cerc-io/solidity
16
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 pull request #7903 from ethereum/fixSuperFunction

Browse Source 
Update missed tests for removal of superFunction.
This commit is contained in:
chriseth 2019-12-05 10:45:35 +01:00 committed by GitHub
commit 52467108ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/cmdlineTests/recovery_ast_constructor/output
View File

@ -70,7 +70,6 @@ JSON AST:
"overrides": null, "overrides": null,
"scope": 18, "scope": 18,
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": null,
"visibility": "public" "visibility": "public"
}, },
"children": "children":
@ -134,7 +133,6 @@ JSON AST:
"overrides": null, "overrides": null,
"scope": 18, "scope": 18,
"stateMutability": "view", "stateMutability": "view",
"superFunction": null,
"visibility": "public" "visibility": "public"
}, },
"children": "children":

2
test/cmdlineTests/standard_only_ast_requested/output.json
View File

@ -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}}}

2
test/libsolidity/GasCosts.cpp
View File

@ -109,7 +109,7 @@ BOOST_AUTO_TEST_CASE(string_storage)
if (evmVersion < EVMVersion::istanbul()) if (evmVersion < EVMVersion::istanbul())
CHECK_DEPLOY_GAS(0, 123969, evmVersion); CHECK_DEPLOY_GAS(0, 123969, evmVersion);
else else
CHECK_DEPLOY_GAS(0, 113993, evmVersion); CHECK_DEPLOY_GAS(0, 110969, evmVersion);
} }
else else
{ {