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 #7280 from ethereum/isoltest-empty-revert

Browse Source 
[isoltest] Support empty revert message
This commit is contained in:
Mathias L. Baumann 2019-08-26 11:45:36 +02:00 committed by GitHub
commit e1bb4b9f81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/libsolidity/semanticTests/smoke/failure.sol
View File

@ -1,10 +1,19 @@
contract C { contract C {
function e() public { function e() public pure {
revert("Transaction failed."); revert("Transaction failed.");
} }
function f(bool _value) public pure {
string memory message;
require(_value, message);
}
function g(bool _value) public pure {
require(_value, "Value is false.");
}
} }
// ==== // ====
// EVMVersion: >homestead // EVMVersion: >homestead
// ---- // ----
// _() -> FAILURE // _() -> FAILURE
// e() -> FAILURE, hex"08c379a0", 0x20, 19, "Transaction failed." // e() -> FAILURE, hex"08c379a0", 0x20, 19, "Transaction failed."
// f(bool): false -> FAILURE, hex"08c379a0", 0x20, 0
// g(bool): false -> FAILURE, hex"08c379a0", 0x20, 15, "Value is false."

12
test/libsolidity/util/BytesUtils.cpp
View File

@ -208,7 +208,11 @@ string BytesUtils::formatRawBytes(
dev::solidity::test::ParameterList const& _parameters, dev::solidity::test::ParameterList const& _parameters,
string _linePrefix) string _linePrefix)
{ {
soltestAssert(_bytes.size() == ContractABIUtils::encodingSize(_parameters), ""); soltestAssert(
_bytes.size() == ContractABIUtils::encodingSize(_parameters),
"Got " + to_string(_bytes.size()) + " bytes, but expected " +
to_string(ContractABIUtils::encodingSize(_parameters)) + " bytes."
);
stringstream os; stringstream os;
auto it = _bytes.begin(); auto it = _bytes.begin();
@ -275,7 +279,11 @@ string BytesUtils::formatBytesRange(
bool _highlight bool _highlight
) )
{ {
soltestAssert(_bytes.size() == ContractABIUtils::encodingSize(_parameters), ""); soltestAssert(
_bytes.size() == ContractABIUtils::encodingSize(_parameters),
"Got " + to_string(_bytes.size()) + " bytes, but expected " +
to_string(ContractABIUtils::encodingSize(_parameters)) + " bytes."
);
stringstream os; stringstream os;
auto it = _bytes.begin(); auto it = _bytes.begin();

8
test/libsolidity/util/ContractABIUtils.cpp
View File

@ -313,14 +313,18 @@ dev::solidity::test::ParameterList ContractABIUtils::defaultParameters(size_t co
return parameters; return parameters;
} }
dev::solidity::test::ParameterList ContractABIUtils::failureParameters() dev::solidity::test::ParameterList ContractABIUtils::failureParameters(bytes const _bytes)
{ {
ParameterList parameters; ParameterList parameters;
parameters.push_back(Parameter{bytes(), "", ABIType{ABIType::HexString, ABIType::AlignNone, 4}, FormatInfo{}}); parameters.push_back(Parameter{bytes(), "", ABIType{ABIType::HexString, ABIType::AlignNone, 4}, FormatInfo{}});
parameters.push_back(Parameter{bytes(), "", ABIType{ABIType::Hex}, FormatInfo{}}); parameters.push_back(Parameter{bytes(), "", ABIType{ABIType::Hex}, FormatInfo{}});
parameters.push_back(Parameter{bytes(), "", ABIType{ABIType::UnsignedDec}, FormatInfo{}}); parameters.push_back(Parameter{bytes(), "", ABIType{ABIType::UnsignedDec}, FormatInfo{}});
parameters.push_back(Parameter{bytes(), "", ABIType{ABIType::String}, FormatInfo{}});
/// If _bytes contains at least a 1 byte message (function selector + tail pointer + message length + message)
/// append an additional string parameter to represent that message.
if (_bytes.size() > 68)
parameters.push_back(Parameter{bytes(), "", ABIType{ABIType::String}, FormatInfo{}});
return parameters; return parameters;
} }

6
test/libsolidity/util/ContractABIUtils.h
View File

@ -66,8 +66,10 @@ public:
); );
/// Returns a list of parameters corresponding to the encoding of /// Returns a list of parameters corresponding to the encoding of
/// returned values in case of a failure. /// returned values in case of a failure. Creates an additional parameter
static ParameterList failureParameters(); /// for the error message if _bytes is larger than 68 bytes
/// (function_selector + tail_ptr + message_length).
static ParameterList failureParameters(bytes const _bytes);
/// Returns _count parameters with their type set to ABIType::UnsignedDec /// Returns _count parameters with their type set to ABIType::UnsignedDec
/// and their size set to 32 bytes. /// and their size set to 32 bytes.

4
test/libsolidity/util/TestFunctionCall.cpp
View File

@ -127,7 +127,7 @@ string TestFunctionCall::format(
boost::optional<ParameterList> abiParams; boost::optional<ParameterList> abiParams;
if (isFailure && !output.empty()) if (isFailure && !output.empty())
abiParams = boost::make_optional(ContractABIUtils::failureParameters()); abiParams = boost::make_optional(ContractABIUtils::failureParameters(output));
else else
abiParams = ContractABIUtils::parametersFromJsonOutputs( abiParams = ContractABIUtils::parametersFromJsonOutputs(
_errorReporter, _errorReporter,
@ -193,7 +193,7 @@ string TestFunctionCall::formatBytesParameters(
{ {
os << BytesUtils::formatBytesRange( os << BytesUtils::formatBytesRange(
_bytes, _bytes,
ContractABIUtils::failureParameters(), ContractABIUtils::failureParameters(_bytes),
_highlight _highlight
); );