Merge pull request #155 from ethereum/fix_ancient_compiler_wrapper

chriseth · web-flow · commit 1188a55696a4 · 2017-10-17T19:15:02.000+02:00
Fix standard wrapper for ancient compiler.
diff --git a/wrapper.js b/wrapper.js
@@ -137,7 +137,7 @@ function setupMethods (soljson) {
     }
 
     var sources = translateSources(input);
-    if (sources === null) {
+    if (sources === null || Object.keys(sources).length === 0) {
       return formatFatalError('Failed to process sources');
     }
 
@@ -151,7 +151,7 @@ function setupMethods (soljson) {
     }
 
     // Try our luck with an ancient compiler
-    return translateOutput(compileJSON(sources[0], isOptimizerEnabled(input)));
+    return translateOutput(compileJSON(sources[Object.keys(sources)[0]], isOptimizerEnabled(input)));
   };
 
   var version = soljson.cwrap('version', 'string', []);

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ function setupMethods (soljson) {`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`var sources = translateSources(input);`
`140`		`- if (sources === null) {`
	`140`	`+ if (sources === null \|\| Object.keys(sources).length === 0) {`
`141`	`141`	`return formatFatalError('Failed to process sources');`
`142`	`142`	`}`
`143`	`143`
`@@ -151,7 +151,7 @@ function setupMethods (soljson) {`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`// Try our luck with an ancient compiler`
`154`		`- return translateOutput(compileJSON(sources[0], isOptimizerEnabled(input)));`
	`154`	`+ return translateOutput(compileJSON(sources[Object.keys(sources)[0]], isOptimizerEnabled(input)));`
`155`	`155`	`};`
`156`	`156`
`157`	`157`	`var version = soljson.cwrap('version', 'string', []);`