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

Tests for payable / private combination.

Browse Source
This commit is contained in:
chriseth 2016-09-06 10:58:56 +02:00
parent ff11aa1927
commit 384f189a6a
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libsolidity/analysis/TypeChecker.cpp
View File

@ -423,9 +423,9 @@ bool TypeChecker::visit(FunctionDefinition const& _function)
typeError(_function.location(), "Library functions cannot be payable."); typeError(_function.location(), "Library functions cannot be payable.");
if (!_function.isConstructor() && !_function.name().empty() && !_function.isPartOfExternalInterface()) if (!_function.isConstructor() && !_function.name().empty() && !_function.isPartOfExternalInterface())
typeError(_function.location(), "Internal functions cannot be payable."); typeError(_function.location(), "Internal functions cannot be payable.");
} if (_function.isDeclaredConst())
if (_function.isPayable() && _function.isDeclaredConst())
typeError(_function.location(), "Functions cannot be constant and payable at the same time."); typeError(_function.location(), "Functions cannot be constant and payable at the same time.");
}
for (ASTPointer<VariableDeclaration> const& var: _function.parameters() + _function.returnParameters()) for (ASTPointer<VariableDeclaration> const& var: _function.parameters() + _function.returnParameters())
{ {
if (!type(*var)->canLiveOutsideStorage()) if (!type(*var)->canLiveOutsideStorage())

20
test/libsolidity/SolidityNameAndTypeResolution.cpp
View File

@ -3865,6 +3865,16 @@ BOOST_AUTO_TEST_CASE(payable_in_library)
BOOST_CHECK(expectError(text) == Error::Type::TypeError); BOOST_CHECK(expectError(text) == Error::Type::TypeError);
} }
BOOST_AUTO_TEST_CASE(payable_external)
{
char const* text = R"(
contract test {
function f() payable external {}
}
)";
BOOST_CHECK(success(text));
}
BOOST_AUTO_TEST_CASE(payable_internal) BOOST_AUTO_TEST_CASE(payable_internal)
{ {
char const* text = R"( char const* text = R"(
@ -3875,6 +3885,16 @@ BOOST_AUTO_TEST_CASE(payable_internal)
BOOST_CHECK(expectError(text) == Error::Type::TypeError); BOOST_CHECK(expectError(text) == Error::Type::TypeError);
} }
BOOST_AUTO_TEST_CASE(payable_private)
{
char const* text = R"(
contract test {
function f() payable private {}
}
)";
BOOST_CHECK(expectError(text) == Error::Type::TypeError);
}
BOOST_AUTO_TEST_CASE(illegal_override_payable) BOOST_AUTO_TEST_CASE(illegal_override_payable)
{ {
char const* text = R"( char const* text = R"(