cerc-io/solidity
10
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

Fixes defects in end-to-end tests.

Browse Source
This commit is contained in:
Erik Kundt 2018-06-29 21:09:33 +02:00
parent 7cb46ea707
commit cbfe3766db
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/libsolidity/SolidityEndToEndTest.cpp
View File

@ -2733,7 +2733,7 @@ BOOST_AUTO_TEST_CASE(base_constructor_arguments)
m_a *= m_a; m_a *= m_a;
} }
} }
contract Derived is Base() public { contract Derived is Base() {
function getA() public returns (uint r) { return m_a; } function getA() public returns (uint r) { return m_a; }
} }
)"; )";
@ -2753,7 +2753,7 @@ BOOST_AUTO_TEST_CASE(function_usage_in_constructor_arguments)
} }
contract Base is BaseBase(BaseBase.g()) { contract Base is BaseBase(BaseBase.g()) {
} }
contract Derived is Base() public { contract Derived is Base() {
function getA() public returns (uint r) { return m_a; } function getA() public returns (uint r) { return m_a; }
} }
)"; )";
@ -2774,7 +2774,7 @@ BOOST_AUTO_TEST_CASE(virtual_function_usage_in_constructor_arguments)
} }
contract Base is BaseBase(BaseBase.g()) { contract Base is BaseBase(BaseBase.g()) {
} }
contract Derived is Base() public { contract Derived is Base() {
function getA() public returns (uint r) { return m_a; } function getA() public returns (uint r) { return m_a; }
function overridden() public returns (uint r) { return 2; } function overridden() public returns (uint r) { return 2; }
} }
@ -9627,7 +9627,7 @@ BOOST_AUTO_TEST_CASE(pass_function_types_internally)
function f(uint x) public returns (uint) { function f(uint x) public returns (uint) {
return eval(g, x); return eval(g, x);
} }
function eval(function(uint) public returns (uint) x, uint a) internal returns (uint) { function eval(function(uint) internal returns (uint) x, uint a) internal returns (uint) {
return x(a); return x(a);
} }
function g(uint x) public returns (uint) { return x + 1; } function g(uint x) public returns (uint) { return x + 1; }
@ -9703,7 +9703,7 @@ BOOST_AUTO_TEST_CASE(store_function)
function addTwo(uint x) public returns (uint) { return x + 2; } function addTwo(uint x) public returns (uint) { return x + 2; }
} }
contract C { contract C {
function (function (uint) external returns (uint)) public returns (uint) ev; function (function (uint) external returns (uint)) internal returns (uint) ev;
function (uint) external returns (uint) x; function (uint) external returns (uint) x;
function store(function(uint) external returns (uint) y) { function store(function(uint) external returns (uint) y) {
x = y; x = y;
@ -9836,7 +9836,7 @@ BOOST_AUTO_TEST_CASE(function_type_library_internal)
{ {
char const* sourceCode = R"( char const* sourceCode = R"(
library Utils { library Utils {
function reduce(uint[] memory array, function(uint, uint) public returns (uint) f, uint init) internal returns (uint) { function reduce(uint[] memory array, function(uint, uint) internal returns (uint) f, uint init) internal returns (uint) {
for (uint i = 0; i < array.length; i++) { for (uint i = 0; i < array.length; i++) {
init = f(array[i], init); init = f(array[i], init);
} }
@ -9932,7 +9932,7 @@ BOOST_AUTO_TEST_CASE(packed_functions)
char const* sourceCode = R"( char const* sourceCode = R"(
contract C { contract C {
// these should take the same slot // these should take the same slot
function() public returns (uint) a; function() external returns (uint) a;
function() external returns (uint) b; function() external returns (uint) b;
function() external returns (uint) c; function() external returns (uint) c;
function() public returns (uint) d; function() public returns (uint) d;