Merge pull request #7091 from ethereum/isoltest-value-format-fix

[isoltest] Fix (aligned) hex parsing and formatting

test/libsolidity/semanticTests/smoke_test.sol

@@ -101,7 +101,7 @@ contract C {
 // g1() -> FAILURE
 // h(uint256,uint256): 1, -2 -> 3
 // j(bool): true -> false
-// k(bytes32): 0x10 -> 0x10, 0x10
+// k(bytes32): 0x10001 -> 0x10001, 0x10001
 // l(): hex"4200efef" -> 8
 // m(bytes): 32, 32, 0x20 -> 32, 32, 0x20
 // m(bytes): 32, 3, hex"AB33BB" -> 32, 3, left(0xAB33BB)

test/libsolidity/util/BytesUtils.cpp

@@ -21,6 +21,8 @@
 
 #include <liblangutil/Common.h>
 
+#include <libdevcore/StringUtils.h>
+
 #include <boost/algorithm/string.hpp>
 
 #include <fstream>
@@ -96,9 +98,6 @@ bytes BytesUtils::convertHexNumber(string const& _literal)
 {
 	try
 	{
-		if (_literal.size() % 2)
-			throw Error(Error::Type::ParserError, "Hex number encoding invalid.");
-		else
 		return fromHex(_literal);
 	}
 	catch (std::exception const&)
@@ -159,13 +158,10 @@ string BytesUtils::formatBoolean(bytes const& _bytes)
 
 string BytesUtils::formatHex(bytes const& _bytes)
 {
-	stringstream os;
+	soltestAssert(!_bytes.empty() && _bytes.size() <= 32, "");
+	u256 value = fromBigEndian<u256>(_bytes);
 
-	string hex{toHex(_bytes, HexPrefix::Add)};
-	boost::algorithm::replace_all(hex, "00", "");
-	os << hex;
-
-	return os.str();
+	return toCompactHexWithPrefix(value);
 }
 
 string BytesUtils::formatHexString(bytes const& _bytes)

test/libsolidity/util/TestFileParser.cpp

@@ -252,8 +252,6 @@ Parameter TestFileParser::parseParameter()
 		parameter.alignment = Parameter::Alignment::Right;
 	}
 
-	try
-	{
 	if (accept(Token::Sub, true))
 	{
 		parameter.rawString += formatToken(Token::Sub);
@@ -346,11 +344,6 @@ Parameter TestFileParser::parseParameter()
 		expect(Token::RParen);
 		parameter.rawString += formatToken(Token::RParen);
 	}
-	}
-	catch (std::exception const&)
-	{
-		throw Error(Error::Type::ParserError, "Literal encoding invalid.");
-	}
 
 	return parameter;
 }

test/libsolidity/util/TestFileParserTests.cpp

@@ -404,6 +404,27 @@ BOOST_AUTO_TEST_CASE(call_arguments_string)
 	);
 }
 
+
+BOOST_AUTO_TEST_CASE(call_hex_number)
+{
+	char const* source = R"(
+		// f(bytes32, bytes32): 0x616, 0x1042 -> 1
+	)";
+	auto const calls = parse(source);
+	BOOST_REQUIRE_EQUAL(calls.size(), 1);
+	testFunctionCall(
+		calls.at(0),
+		Mode::SingleLine,
+		"f(bytes32,bytes32)",
+		false,
+		fmt::encodeArgs(
+			fromHex("0x616"),
+			fromHex("0x1042")
+		),
+		fmt::encodeArgs(1)
+	);
+}
+
 BOOST_AUTO_TEST_CASE(call_return_string)
 {
 	char const* source = R"(
@@ -786,14 +807,6 @@ BOOST_AUTO_TEST_CASE(call_ether_type_invalid)
 	BOOST_REQUIRE_THROW(parse(source), langutil::Error);
 }
 
-BOOST_AUTO_TEST_CASE(call_hex_number_invalid)
-{
-	char const* source = R"(
-		// f(bytes32, bytes32): 0x616, 0x042 -> 1
-	)";
-	BOOST_REQUIRE_THROW(parse(source), langutil::Error);
-}
-
 BOOST_AUTO_TEST_CASE(call_signed_bool_invalid)
 {
 	char const* source = R"(

test/libsolidity/util/TestFunctionCall.cpp

@@ -193,7 +193,7 @@ string TestFunctionCall::formatBytesParameters(
 		fill_n(
 			back_inserter(defaultParameters),
 			ceil(_bytes.size() / 32),
-			Parameter{bytes(), "", ABIType{ABIType::UnsignedDec}, FormatInfo{}}
+			Parameter{bytes(), "", ABIType{ABIType::Hex}, FormatInfo{}}
 		);
 		ContractABIUtils::overwriteParameters(_errorReporter, defaultParameters, _parameters);
 		os << BytesUtils::formatBytesRange(_bytes, defaultParameters, _highlight);

test/libsolidity/util/TestFunctionCallTests.cpp

@@ -139,7 +139,8 @@ BOOST_AUTO_TEST_CASE(format_hex_singleline)
 	BOOST_REQUIRE_EQUAL(test.format(), "// f(bytes32): 0x31 -> 0x31");
 
 	bytes actualResult = fromHex("0x32");
-	bytes actualBytes = actualResult + bytes(32 - actualResult.size(), 0);
+	bytes actualBytes = bytes(32 - actualResult.size(), 0) + actualResult;
+
 	test.setRawBytes(actualBytes);
 	test.setFailure(false);