Merge pull request #13162 from ethereum/cleanup_helpers_around_errors

cleaning up helpers around errors

test/cmdlineTests/standard_urls_existing_and_missing/contract.sol

@@ -0,0 +1,2 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity *;

test/cmdlineTests/standard_urls_existing_and_missing/input.json

@@ -0,0 +1,13 @@
+{
+    "language": "Solidity",
+    "sources": {
+        "url_not_found.sol": {
+            "urls": [
+                "standard_urls_existing_and_missing/non-existent-contract-1.sol",
+                "standard_urls_existing_and_missing/contract.sol",
+                "standard_urls_existing_and_missing/non-existent-contract-2.sol"
+            ]
+        }
+    },
+    "settings": {"outputSelection": {"*": { "*": ["metadata", "evm.bytecode"]}}}
+}

test/cmdlineTests/standard_urls_existing_and_missing/output.json

@@ -0,0 +1 @@
+{"errors":[{"component":"general","formattedMessage":"Cannot import url (\"standard_urls_existing_and_missing/non-existent-contract-1.sol\"): File not found. Searched the following locations: \"\".","message":"Cannot import url (\"standard_urls_existing_and_missing/non-existent-contract-1.sol\"): File not found. Searched the following locations: \"\".","severity":"warning","type":"Warning"}],"sources":{"url_not_found.sol":{"id":0}}}

test/cmdlineTests/standard_urls_missing/contract.sol

@@ -0,0 +1,2 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity *;

test/cmdlineTests/standard_urls_missing/input.json

@@ -0,0 +1,13 @@
+{
+    "language": "Solidity",
+    "sources": {
+        "url_not_found.sol": {
+            "urls": [
+                "standard_urls_missing/non-existent-contract-1.sol",
+                "standard_urls_missing/non-existent-contract.sol",
+                "standard_urls_missing/non-existent-contract-2.sol"
+            ]
+        }
+    },
+    "settings": {"outputSelection": {"*": { "*": ["metadata", "evm.bytecode"]}}}
+}

test/cmdlineTests/standard_urls_missing/output.json

@@ -0,0 +1 @@
+{"errors":[{"component":"general","formattedMessage":"Cannot import url (\"standard_urls_missing/non-existent-contract-1.sol\"): File not found. Searched the following locations: \"\".","message":"Cannot import url (\"standard_urls_missing/non-existent-contract-1.sol\"): File not found. Searched the following locations: \"\".","severity":"error","type":"IOError"},{"component":"general","formattedMessage":"Cannot import url (\"standard_urls_missing/non-existent-contract.sol\"): File not found. Searched the following locations: \"\".","message":"Cannot import url (\"standard_urls_missing/non-existent-contract.sol\"): File not found. Searched the following locations: \"\".","severity":"error","type":"IOError"},{"component":"general","formattedMessage":"Cannot import url (\"standard_urls_missing/non-existent-contract-2.sol\"): File not found. Searched the following locations: \"\".","message":"Cannot import url (\"standard_urls_missing/non-existent-contract-2.sol\"): File not found. Searched the following locations: \"\".","severity":"error","type":"IOError"}],"sources":{}}

test/libsolidity/ErrorCheck.cpp

@@ -71,7 +71,7 @@ string solidity::frontend::test::searchErrors(ErrorList const& _errors, vector<p
 				break;
 			}
 		if (!found)
-			return "Unexpected error: " + error->typeName() + ": " + msg;
+			return "Unexpected error: " + Error::formatErrorType(error->type()) + ": " + msg;
 	}
 	if (!expectations.empty())
 	{

test/libsolidity/SyntaxTest.cpp

@@ -145,7 +145,7 @@ void SyntaxTest::filterObtainedErrors()
 			}
 		}
 		m_errorList.emplace_back(SyntaxTestError{
-			currentError->typeName(),
+			Error::formatErrorType(currentError->type()),
 			currentError->errorId(),
 			errorMessage(*currentError),
 			sourceName,

test/libyul/SyntaxTest.cpp

@@ -61,7 +61,7 @@ void SyntaxTest::parseAndAnalyze()
 		}
 
 		m_errorList.emplace_back(SyntaxTestError{
-			error->typeName(),
+			Error::formatErrorType(error->type()),
 			error->errorId(),
 			errorMessage(*error),
 			name,

test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp

@@ -79,10 +79,7 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 		SourceReferenceFormatter formatter(std::cout, stack, false, false);
 
 		for (auto const& error: stack.errors())
-			formatter.printExceptionInformation(
-				*error,
-				(error->type() == Error::Type::Warning) ? "Warning" : "Error"
-			);
+			formatter.printExceptionInformation(*error, Error::errorSeverity(error->type()));
 		yulAssert(false, "Proto fuzzer generated malformed program");
 	}