From 3326a2282e4bf5b83b14bc775a821806a204817e Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Tue, 5 Sep 2017 22:38:45 +0100 Subject: [PATCH] Change array too large error message as it is valid for non-calldata too --- libsolidity/analysis/TypeChecker.cpp | 2 +- test/libsolidity/SolidityNameAndTypeResolution.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp index 7d5a0c8ce..c46485d84 100644 --- a/libsolidity/analysis/TypeChecker.cpp +++ b/libsolidity/analysis/TypeChecker.cpp @@ -623,7 +623,7 @@ bool TypeChecker::visit(VariableDeclaration const& _variable) (arrayType->location() == DataLocation::CallData)) && !arrayType->validForCalldata() ) - m_errorReporter.typeError(_variable.location(), "Array is too large to be encoded as calldata."); + m_errorReporter.typeError(_variable.location(), "Array is too large to be encoded."); return false; } diff --git a/test/libsolidity/SolidityNameAndTypeResolution.cpp b/test/libsolidity/SolidityNameAndTypeResolution.cpp index a05371035..f88638761 100644 --- a/test/libsolidity/SolidityNameAndTypeResolution.cpp +++ b/test/libsolidity/SolidityNameAndTypeResolution.cpp @@ -6217,21 +6217,21 @@ BOOST_AUTO_TEST_CASE(too_large_arrays_for_calldata) } } )"; - CHECK_ERROR(text, TypeError, "Array is too large to be encoded as calldata."); + CHECK_ERROR(text, TypeError, "Array is too large to be encoded."); text = R"( contract C { function f(uint[85678901234] a) internal { } } )"; - CHECK_SUCCESS_NO_WARNINGS(text); + CHECK_ERROR(text, TypeError, "Array is too large to be encoded."); text = R"( contract C { function f(uint[85678901234] a) { } } )"; - CHECK_ERROR(text, TypeError, "Array is too large to be encoded as calldata."); + CHECK_ERROR(text, TypeError, "Array is too large to be encoded."); } BOOST_AUTO_TEST_CASE(explicit_literal_to_storage_string)