Merge pull request argotorg#9401 from ethereum/isoltest-update-hex

chriseth · web-flow · commit 0212a16b02eb · 2020-07-13T20:27:15.000+02:00
Fix formatting hex strings in isoltest update
diff --git a/test/libsolidity/util/BytesUtils.cpp b/test/libsolidity/util/BytesUtils.cpp
@@ -22,6 +22,7 @@
 
 #include <liblangutil/Common.h>
 
+#include <libsolutil/CommonData.h>
 #include <libsolutil/StringUtils.h>
 
 #include <boost/algorithm/string.hpp>
@@ -198,8 +199,7 @@ string BytesUtils::formatString(bytes const& _bytes, size_t _cutOff)
 				if (isprint(v))
 					os << v;
 				else
-					os << "\\x" << setw(2) << setfill('0') << hex << v;
-
+					os << "\\x" << toHex(v);
 		}
 	}
 	os << "\"";

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`
`23`	`23`	`#include <liblangutil/Common.h>`
`24`	`24`
	`25`	`+#include <libsolutil/CommonData.h>`
`25`	`26`	`#include <libsolutil/StringUtils.h>`
`26`	`27`
`27`	`28`	`#include <boost/algorithm/string.hpp>`
`@@ -198,8 +199,7 @@ string BytesUtils::formatString(bytes const& _bytes, size_t _cutOff)`
`198`	`199`	`if (isprint(v))`
`199`	`200`	`os << v;`
`200`	`201`	`else`
`201`		`- os << "\\x" << setw(2) << setfill('0') << hex << v;`
`202`		`-`
	`202`	`+ os << "\\x" << toHex(v);`
`203`	`203`	`}`
`204`	`204`	`}`
`205`	`205`	`os << "\"";`