Merge pull request #127 from ethereum/solcjs-standard

Fix --standard-json on solcjs

Author: chriseth

.travis.yml

@@ -8,9 +8,6 @@ branches:
 matrix:
   fast_finish: true
   include:
-    - os: linux
-      node_js: '4'
-      env: CXX=g++-4.8 TEST_SUITE=test
     - os: linux
       node_js: '6'
       env: CXX=g++-4.8 TEST_SUITE=test

solcjs

@@ -51,15 +51,8 @@ function abort (msg) {
 }
 
 if (argv['standard-json']) {
-  var size = fs.fstatSync(process.stdin.fd).size;
-
-  if (size <= 0) {
-    abort('Empty input was read');
-  }
-
-  var input = fs.readSync(process.stdin.fd, size)[0];
-
-  console.log(solc.compileStandardWrapper(input));
+  var input = fs.readFileSync(process.stdin.fd);
+  console.log(solc.compile(input.toString('utf8')))
   process.exit(0);
 } else if (files.length === 0) {
   console.error('Must provide a file');

test/cli.js

@@ -62,4 +62,33 @@ tape('CLI', function (t) {
     spt.succeeds();
     spt.end();
   });
+
+  t.test('standard json', function (st) {
+    var input = {
+      'language': 'Solidity',
+      'settings': {
+        'outputSelection': {
+          '*': {
+            '*': [ 'evm.bytecode', 'userdoc' ]
+          }
+        }
+      },
+      'sources': {
+        'Contract.sol': {
+          'content': 'pragma solidity ^0.5.0; contract Contract { function f() pure public {} }'
+        }
+      }
+    };
+    var spt = spawn(st, './solcjs --standard-json');
+    spt.stdin.setEncoding('utf-8');
+    spt.stdin.write(JSON.stringify(input));
+    spt.stdin.end();
+    spt.stdin.on('finish', function () {
+      spt.stderr.empty();
+      spt.stdout.match(/Contract.sol/);
+      spt.stdout.match(/userdoc/);
+      spt.succeeds();
+      spt.end();
+    });
+  });
 });