Ensure the wrapper error messages are similar to libsolc

Author: axic

test/compiler.js

@@ -563,21 +563,21 @@ function runTests (solc, versionText) {
       t.test('compiling standard JSON (invalid JSON)', function (st) {
         var output = JSON.parse(solc.compile('{invalid'));
         // TODO: change wrapper to output matching error
-        st.ok(expectError(output, 'JSONError', 'Line 1, Column 2\n  Missing \'}\' or object member name') || expectError(output, 'SOLCError', 'Invalid JSON supplied'));
+        st.ok(expectError(output, 'JSONError', 'Line 1, Column 2\n  Missing \'}\' or object member name') || expectError(output, 'SOLCError', 'Invalid JSON supplied:'));
         st.end();
       });
 
       t.test('compiling standard JSON (invalid language)', function (st) {
         var output = JSON.parse(solc.compile('{"language":"InvalidSolidity","sources":{"cont.sol":{"content":""}}}'));
         // TODO: change wrapper to output matching error
-        st.ok(expectError(output, 'JSONError', 'supported as a language.') || expectError(output, 'SOLCError', 'Only Solidity sources are supported'));
+        st.ok(expectError(output, 'JSONError', 'supported as a language.') || expectError(output, 'SOLCError', 'Only "Solidity" is supported as a language.'));
         st.end();
       });
 
       t.test('compiling standard JSON (no sources)', function (st) {
         var output = JSON.parse(solc.compile('{"language":"Solidity"}'));
         // TODO: change wrapper to output matching error
-        st.ok(expectError(output, 'JSONError', 'No input sources specified.') || expectError(output, 'SOLCError', 'No input specified'));
+        st.ok(expectError(output, 'JSONError', 'No input sources specified.') || expectError(output, 'SOLCError', 'No input sources specified.'));
         st.end();
       });
 
@@ -586,7 +586,7 @@ function runTests (solc, versionText) {
         if (solc.features.multipleInputs) {
           st.ok(expectNoError(output));
         } else {
-          st.ok(expectError(output, 'SOLCError', 'Multiple sources provided, but compiler only supports single input') || expectError(output, 'Parser error', 'Parser error: Source not found.'));
+          st.ok(expectError(output, 'SOLCError', 'Multiple sources provided, but compiler only supports single input.') || expectError(output, 'Parser error', 'Parser error: Source not found.'));
         }
         st.end();
       });

wrapper.js

@@ -148,17 +148,17 @@ function setupMethods (soljson) {
     }
 
     if (input['language'] !== 'Solidity') {
-      return formatFatalError('Only Solidity sources are supported');
+      return formatFatalError('Only "Solidity" is supported as a language.');
     }
 
     // NOTE: this is deliberately `== null`
     if (input['sources'] == null || input['sources'].length === 0) {
-      return formatFatalError('No input specified');
+      return formatFatalError('No input sources specified.');
     }
 
     // Bail out early
     if ((input['sources'].length > 1) && (compileJSONMulti === null)) {
-      return formatFatalError('Multiple sources provided, but compiler only supports single input');
+      return formatFatalError('Multiple sources provided, but compiler only supports single input.');
     }
 
     function isOptimizerEnabled (input) {
@@ -192,14 +192,14 @@ function setupMethods (soljson) {
       }
       output = translate.translateJsonCompilerOutput(output, libraries);
       if (output == null) {
-        return formatFatalError('Failed to process output');
+        return formatFatalError('Failed to process output.');
       }
       return JSON.stringify(output);
     }
 
     var sources = translateSources(input);
     if (sources === null || Object.keys(sources).length === 0) {
-      return formatFatalError('Failed to process sources');
+      return formatFatalError('Failed to process sources.');
     }
 
     // Try linking if libraries were supplied