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

[isoltest] Cleans up BytesUtils.

Browse Source
This commit is contained in:
Erik Kundt
2019-08-05 15:00:04 +02:00
parent a7a8ba73f9
commit d9b98bf7af
3 changed files with 87 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/libsolidity/util/TestFileParser.cpp
+9 -10
View File
@@ -236,7 +236,6 @@ Parameter TestFileParser::parseParameter()
}
bool isSigned = false;
if (accept(Token::Left, true))
{
parameter.rawString += formatToken(Token::Left);
@@ -267,10 +266,10 @@ Parameter TestFileParser::parseParameter()
parameter.abiType = ABIType{ABIType::Boolean, ABIType::AlignRight, 32};
string parsed = parseBoolean();
parameter.rawString += parsed;
parameter.rawBytes = BytesUtils().applyAlign(
parameter.rawBytes = BytesUtils::applyAlign(
parameter.alignment,
parameter.abiType,
BytesUtils().convertBoolean(parsed)
BytesUtils::convertBoolean(parsed)
);
}
else if (accept(Token::HexNumber))
@@ -281,10 +280,10 @@ Parameter TestFileParser::parseParameter()
parameter.abiType = ABIType{ABIType::Hex, ABIType::AlignRight, 32};
string parsed = parseHexNumber();
parameter.rawString += parsed;
parameter.rawBytes = BytesUtils().applyAlign(
parameter.rawBytes = BytesUtils::applyAlign(
parameter.alignment,
parameter.abiType,
BytesUtils().convertHexNumber(parsed)
BytesUtils::convertHexNumber(parsed)
);
}
else if (accept(Token::Hex, true))
@@ -296,7 +295,7 @@ Parameter TestFileParser::parseParameter()
string parsed = parseString();
parameter.rawString += "hex\"" + parsed + "\"";
parameter.rawBytes = BytesUtils().convertHexNumber(parsed);
parameter.rawBytes = BytesUtils::convertHexNumber(parsed);
parameter.abiType = ABIType{
ABIType::HexString, ABIType::AlignNone, parameter.rawBytes.size()
};
@@ -311,10 +310,10 @@ Parameter TestFileParser::parseParameter()
string parsed = parseString();
parameter.abiType = {ABIType::String, ABIType::AlignLeft, parsed.size()};
parameter.rawString += "\"" + parsed + "\"";
parameter.rawBytes = BytesUtils().applyAlign(
parameter.rawBytes = BytesUtils::applyAlign(
Parameter::Alignment::Left,
parameter.abiType,
BytesUtils().convertString(parsed)
BytesUtils::convertString(parsed)
);
}
else if (accept(Token::Number))
@@ -327,10 +326,10 @@ Parameter TestFileParser::parseParameter()
if (isSigned)
parsed = "-" + parsed;
parameter.rawBytes = BytesUtils().applyAlign(
parameter.rawBytes = BytesUtils::applyAlign(
parameter.alignment,
parameter.abiType,
BytesUtils().convertNumber(parsed)
BytesUtils::convertNumber(parsed)
);
}
else if (accept(Token::Failure, true))