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 pull request #1729 from ethereum/constantvariables

Browse Source 
Only allow pure expressions for constant state variables.
This commit is contained in:
Yoichi Hirai
2017-03-15 10:03:35 +01:00
committed by GitHub
parent 64e00e5371 9f328ff749
commit d134fda0c0
8 changed files with 241 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/libsolidity/SolidityEndToEndTest.cpp
+52 -1
View File
@@ -4542,7 +4542,6 @@ BOOST_AUTO_TEST_CASE(simple_constant_variables_test)
BOOST_AUTO_TEST_CASE(constant_variables)
{
//for now constant specifier is valid only for uint, bytesXX, string and enums
char const* sourceCode = R"(
contract Foo {
uint constant x = 56;
@@ -4553,6 +4552,58 @@ BOOST_AUTO_TEST_CASE(constant_variables)
compileAndRun(sourceCode);
}
BOOST_AUTO_TEST_CASE(assignment_to_const_var_involving_expression)
{
char const* sourceCode = R"(
contract C {
uint constant x = 0x123 + 0x456;
function f() returns (uint) { return x + 1; }
}
)";
compileAndRun(sourceCode);
BOOST_CHECK(callContractFunction("f()") == encodeArgs(0x123 + 0x456 + 1));
}
BOOST_AUTO_TEST_CASE(assignment_to_const_var_involving_keccak)
{
char const* sourceCode = R"(
contract C {
bytes32 constant x = keccak256("abc");
function f() returns (bytes32) { return x; }
}
)";
compileAndRun(sourceCode);
BOOST_CHECK(callContractFunction("f()") == encodeArgs(dev::keccak256("abc")));
}
// Disabled until https://github.com/ethereum/solidity/issues/715 is implemented
//BOOST_AUTO_TEST_CASE(assignment_to_const_array_vars)
//{
// char const* sourceCode = R"(
// contract C {
// uint[3] constant x = [uint(1), 2, 3];
// uint constant y = x[0] + x[1] + x[2];
// function f() returns (uint) { return y; }
// }
// )";
// compileAndRun(sourceCode);
// BOOST_CHECK(callContractFunction("f()") == encodeArgs(1 + 2 + 3));
//}
// Disabled until https://github.com/ethereum/solidity/issues/715 is implemented
//BOOST_AUTO_TEST_CASE(constant_struct)
//{
// char const* sourceCode = R"(
// contract C {
// struct S { uint x; uint[] y; }
// S constant x = S(5, new uint[](4));
// function f() returns (uint) { return x.x; }
// }
// )";
// compileAndRun(sourceCode);
// BOOST_CHECK(callContractFunction("f()") == encodeArgs(5));
//}
BOOST_AUTO_TEST_CASE(packed_storage_structs_uint)
{
char const* sourceCode = R"(
test/libsolidity/SolidityNameAndTypeResolution.cpp
+84 -6
View File
@@ -2173,16 +2173,94 @@ BOOST_AUTO_TEST_CASE(assigning_value_to_const_variable)
CHECK_ERROR(text, TypeError, "");
}
BOOST_AUTO_TEST_CASE(complex_const_variable)
BOOST_AUTO_TEST_CASE(assigning_state_to_const_variable)
{
//for now constant specifier is valid only for uint bytesXX and enums
char const* text = R"(
contract Foo {
mapping(uint => bool) x;
mapping(uint => bool) constant mapVar = x;
contract C {
address constant x = msg.sender;
}
)";
CHECK_ERROR(text, TypeError, "");
// Change to TypeError for 0.5.0.
CHECK_WARNING(text, "Initial value for constant variable has to be compile-time constant.");
}
BOOST_AUTO_TEST_CASE(constant_string_literal_disallows_assignment)
{
char const* text = R"(
contract Test {
string constant x = "abefghijklmnopqabcdefghijklmnopqabcdefghijklmnopqabca";
function f() {
x[0] = "f";
}
}
)";
// Even if this is made possible in the future, we should not allow assignment
// to elements of constant arrays.
CHECK_ERROR(text, TypeError, "Index access for string is not possible.");
}
BOOST_AUTO_TEST_CASE(assign_constant_function_value_to_constant)
{
char const* text = R"(
contract C {
function () constant returns (uint) x;
uint constant y = x();
}
)";
// Change to TypeError for 0.5.0.
CHECK_WARNING(text, "Initial value for constant variable has to be compile-time constant.");
}
BOOST_AUTO_TEST_CASE(assignment_to_const_var_involving_conversion)
{
char const* text = R"(
contract C {
C constant x = C(0x123);
}
)";
CHECK_SUCCESS(text);
}
BOOST_AUTO_TEST_CASE(assignment_to_const_var_involving_expression)
{
char const* text = R"(
contract C {
uint constant x = 0x123 + 0x456;
}
)";
CHECK_SUCCESS(text);
}
BOOST_AUTO_TEST_CASE(assignment_to_const_var_involving_keccak)
{
char const* text = R"(
contract C {
bytes32 constant x = keccak256("abc");
}
)";
CHECK_SUCCESS(text);
}
BOOST_AUTO_TEST_CASE(assignment_to_const_array_vars)
{
char const* text = R"(
contract C {
uint[3] constant x = [uint(1), 2, 3];
}
)";
CHECK_ERROR(text, TypeError, "implemented");
}
BOOST_AUTO_TEST_CASE(constant_struct)
{
char const* text = R"(
contract C {
struct S { uint x; uint[] y; }
S constant x = S(5, new uint[](4));
}
)";
CHECK_ERROR(text, TypeError, "implemented");
}
BOOST_AUTO_TEST_CASE(uninitialized_const_variable)