Merge pull request #624 from ethereum/default_theme

.gitignore

@@ -7,3 +7,4 @@ test-browser/reports/*
 babelify-src
 docs/_build
 package-lock.json
+.DS_Store
\ No newline at end of file

remix-debugger/package.json

@@ -118,4 +118,3 @@
     ]
   }
 }
-

remix-lib/src/helpers/compilerHelper.js

@@ -14,12 +14,12 @@ function compilerInput (contracts) {
       optimizer: {
         enabled: false,
         runs: 500
-      }
-    },
-    outputSelection: {
-      '*': {
-        '': [ 'legacyAST' ],
-        '*': [ 'abi', 'metadata', 'evm.legacyAssembly', 'evm.bytecode', 'evm.deployedBytecode', 'evm.methodIdentifiers', 'evm.gasEstimates' ]
+      },
+      outputSelection: {
+        '*': {
+          '': [ 'legacyAST' ],
+          '*': [ 'abi', 'metadata', 'evm.legacyAssembly', 'evm.bytecode', 'evm.deployedBytecode', 'evm.methodIdentifiers', 'evm.gasEstimates' ]
+        }
       }
     }
   })

remix-solidity/test/decoder/storageDecoder.js

@@ -3,6 +3,8 @@ var tape = require('tape')
 var compiler = require('solc')
 var stateDecoder = require('../../src/decoder/stateDecoder')
 var MockStorageResolver = require('./mockStorageResolver')
+var remixLib = require('remix-lib')
+var compilerInput = remixLib.helpers.compiler.compilerInput
 
 tape('solidity', function (t) {
   t.test('storage decoder', function (st) {
@@ -269,25 +271,3 @@ function testStructArrayStorage (st, cb) {
     cb()
   })
 }
-
-function compilerInput (contracts) {
-  return JSON.stringify({
-    language: 'Solidity',
-    sources: {
-      'test.sol': {
-        content: contracts
-      }
-    },
-    settings: {
-      optimizer: {
-        enabled: false,
-        runs: 500
-      }
-    },
-    outputSelection: {
-      '*': {
-        '*': [ 'metadata', 'evm.bytecode', 'abi', 'legacyAST', 'metadata', 'evm.assembly', 'evm.methodIdentifiers', 'evm.gasEstimates' ]
-      }
-    }
-  })
-}

remix-solidity/test/decoder/storageLocation.js

@@ -3,6 +3,8 @@ var tape = require('tape')
 var compiler = require('solc')
 var stateDecoder = require('../../src/decoder/stateDecoder')
 var contracts = require('./contracts/miscContracts')
+var remixLib = require('remix-lib')
+var compilerInput = remixLib.helpers.compiler.compilerInput
 
 tape('solidity', function (t) {
   t.test('storage location', function (st) {
@@ -55,25 +57,3 @@ function checkLocation (st, location, slot, offset) {
   st.equal(location.offset, offset)
   st.equal(location.slot, slot)
 }
-
-function compilerInput (contracts) {
-  return JSON.stringify({
-    language: 'Solidity',
-    sources: {
-      'test.sol': {
-        content: contracts
-      }
-    },
-    settings: {
-      optimizer: {
-        enabled: false,
-        runs: 500
-      }
-    },
-    outputSelection: {
-      '*': {
-        '*': [ 'metadata', 'evm.bytecode', 'abi', 'legacyAST', 'metadata', 'evm.assembly', 'evm.methodIdentifiers', 'evm.gasEstimates' ]
-      }
-    }
-  })
-}