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

[isoltest] Adds fallback formatting.

Browse Source
This commit is contained in:
Erik Kundt 2019-09-11 15:45:53 +02:00
parent 143e867353
commit 4162c3d7af
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -208,21 +208,21 @@ 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),
"Got " + to_string(_bytes.size()) + " bytes, but expected " +
to_string(ContractABIUtils::encodingSize(_parameters)) + " bytes."
);
stringstream os; stringstream os;
ParameterList parameters;
auto it = _bytes.begin(); auto it = _bytes.begin();
for (auto const& parameter: _parameters) if (_bytes.size() != ContractABIUtils::encodingSize(_parameters))
parameters = ContractABIUtils::defaultParameters(ceil(_bytes.size() / 32));
else
parameters = _parameters;
for (auto const& parameter: parameters)
{ {
bytes byteRange{it, it + static_cast<long>(parameter.abiType.size)}; bytes byteRange{it, it + static_cast<long>(parameter.abiType.size)};
os << _linePrefix << byteRange; os << _linePrefix << byteRange;
if (&parameter != &_parameters.back()) if (&parameter != &parameters.back())
os << endl; os << endl;
it += static_cast<long>(parameter.abiType.size); it += static_cast<long>(parameter.abiType.size);
@ -279,16 +279,17 @@ string BytesUtils::formatBytesRange(
bool _highlight bool _highlight
) )
{ {
soltestAssert(
_bytes.size() == ContractABIUtils::encodingSize(_parameters),
"Got " + to_string(_bytes.size()) + " bytes, but expected " +
to_string(ContractABIUtils::encodingSize(_parameters)) + " bytes."
);
stringstream os; stringstream os;
ParameterList parameters;
auto it = _bytes.begin(); auto it = _bytes.begin();
for (auto const& parameter: _parameters) if (_bytes.size() != ContractABIUtils::encodingSize(_parameters))
parameters = ContractABIUtils::defaultParameters(ceil(_bytes.size() / 32));
else
parameters = _parameters;
for (auto const& parameter: parameters)
{ {
bytes byteRange{it, it + static_cast<long>(parameter.abiType.size)}; bytes byteRange{it, it + static_cast<long>(parameter.abiType.size)};
@ -301,7 +302,7 @@ string BytesUtils::formatBytesRange(
else else
os << parameter.rawString; os << parameter.rawString;
if (&parameter != &_parameters.back()) if (&parameter != &parameters.back())
os << ", "; os << ", ";
it += static_cast<long>(parameter.abiType.size); it += static_cast<long>(parameter.abiType.size);

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

@ -140,7 +140,11 @@ string TestFunctionCall::format(
string bytesOutput = abiParams ? string bytesOutput = abiParams ?
BytesUtils::formatRawBytes(output, abiParams.get(), _linePrefix) : BytesUtils::formatRawBytes(output, abiParams.get(), _linePrefix) :
_linePrefix + "[]"; BytesUtils::formatRawBytes(
output,
ContractABIUtils::defaultParameters(ceil(output.size() / 32)),
_linePrefix
);
_errorReporter.warning( _errorReporter.warning(
"The call to \"" + m_call.signature + "\" returned \n" + "The call to \"" + m_call.signature + "\" returned \n" +