Merge pull request #317 from ethereum/standard-json-libraries

chriseth · web-flow · commit 70016bce3125 · 2018-12-12T14:47:31.000+01:00
Fix translating standard JSON with libraries on old compilers
diff --git a/wrapper.js b/wrapper.js
@@ -151,13 +151,13 @@ function setupMethods (soljson) {
       }
     }
 
-    function translateOutput (output) {
+    function translateOutput (output, libraries) {
       try {
         output = JSON.parse(output);
       } catch (e) {
         return formatFatalError('Compiler returned invalid JSON: ' + e.message);
       }
-      output = translate.translateJsonCompilerOutput(output);
+      output = translate.translateJsonCompilerOutput(output, libraries);
       if (output == null) {
         return formatFatalError('Failed to process output');
       }

Original file line number	Diff line number	Diff line change
`@@ -151,13 +151,13 @@ function setupMethods (soljson) {`
`151`	`151`	`}`
`152`	`152`	`}`
`153`	`153`
`154`		`- function translateOutput (output) {`
	`154`	`+ function translateOutput (output, libraries) {`
`155`	`155`	`try {`
`156`	`156`	`output = JSON.parse(output);`
`157`	`157`	`} catch (e) {`
`158`	`158`	`return formatFatalError('Compiler returned invalid JSON: ' + e.message);`
`159`	`159`	`}`
`160`		`- output = translate.translateJsonCompilerOutput(output);`
	`160`	`+ output = translate.translateJsonCompilerOutput(output, libraries);`
`161`	`161`	`if (output == null) {`
`162`	`162`	`return formatFatalError('Failed to process output');`
`163`	`163`	`}`