cerc-io/solidity
10
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 #6263 from ethereum/soltest-output-sizes

Browse Source 
[soltest] Print bytes range sizes
This commit is contained in:
chriseth 2019-03-13 18:10:09 +01:00 committed by GitHub
commit e07ca0d2ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,13 +124,21 @@ string TestFunctionCall::formatBytesParameters(bytes const& _bytes, dev::solidit
stringstream resultStream; stringstream resultStream;
if (_bytes.empty()) if (_bytes.empty())
return {}; return {};
auto sizeFold = [](size_t const _a, Parameter const& _b) { return _a + _b.abiType.size; };
size_t encodingSize = std::accumulate(_params.begin(), _params.end(), size_t{0}, sizeFold);
soltestAssert(
encodingSize == _bytes.size(),
"Encoding does not match byte range: the call returned " +
to_string(_bytes.size()) + " bytes, but " +
to_string(encodingSize) + " bytes were expected."
);
auto it = _bytes.begin(); auto it = _bytes.begin();
for (auto const& param: _params) for (auto const& param: _params)
{ {
long offset = static_cast<long>(param.abiType.size); long offset = static_cast<long>(param.abiType.size);
auto offsetIter = it + offset; auto offsetIter = it + offset;
soltestAssert(offsetIter <= _bytes.end(), "Byte range can not be extended past the end of given bytes.");
bytes byteRange{it, offsetIter}; bytes byteRange{it, offsetIter};
switch (param.abiType.type) switch (param.abiType.type)
{ {
@ -176,7 +184,6 @@ string TestFunctionCall::formatBytesParameters(bytes const& _bytes, dev::solidit
if (it != _bytes.end() && !(param.abiType.type == ABIType::None)) if (it != _bytes.end() && !(param.abiType.type == ABIType::None))
resultStream << ", "; resultStream << ", ";
} }
soltestAssert(it == _bytes.end(), "Parameter encoding too short for the given byte range.");
return resultStream.str(); return resultStream.str();
} }