move decoder from remix-solidity to remix-debug

remix-debug/package.json

@@ -28,7 +28,6 @@
     "npm-run-all": "^4.1.2",
     "fast-async": "^6.1.2",
     "remix-lib": "^0.2.9",
-    "remix-solidity": "^0.1.11",
     "solc": "https://github.com/ethereum/solc-js"
   },
   "devDependencies": {

remix-debug/src/Ethdebugger.js

@@ -5,6 +5,11 @@ var StorageViewer = require('./storage/storageViewer')
 var StorageResolver = require('./storage/storageResolver')
 var TraceManager = require('./trace/traceManager')
 
+var SolidityProxy = require('./decoder/solidityProxy')
+var stateDecoder = require('./decoder/stateDecoder')
+var localDecoder = require('./decoder/localDecoder')
+var InternalCallTree = require('./decoder/internalCallTree')
+
 var remixLib = require('remix-lib')
 var traceHelper = remixLib.helpers.trace
 var init = remixLib.init
@@ -12,11 +17,6 @@ var executionContext = remixLib.execution.executionContext
 var EventManager = remixLib.EventManager
 var Web3Providers = remixLib.vm.Web3Providers
 var DummyProvider = remixLib.vm.DummyProvider
-var remixSolidity = require('remix-solidity')
-var SolidityProxy = remixSolidity.SolidityProxy
-var stateDecoder = remixSolidity.stateDecoder
-var localDecoder = remixSolidity.localDecoder
-var InternalCallTree = remixSolidity.InternalCallTree
 
 /**
   * Ethdebugger is a wrapper around a few classes that helps debugging a transaction

remix-debug/test/tests.js

@@ -10,6 +10,11 @@ require('./traceManager.js')
 require('./codeManager.js')
 require('./disassembler.js')
 
+require('./decoder/decodeInfo.js')
+require('./decoder/storageLocation.js')
+require('./decoder/storageDecoder.js')
+require('./decoder/localDecoder.js')
+
 var BreakpointManager = require('../src/code/breakpointManager')
 
 tape('debug contract', function (t) {

remix-solidity/test/tests.js

@@ -1,7 +1,3 @@
-require('./decoder/decodeInfo.js')
-require('./decoder/storageLocation.js')
-require('./decoder/storageDecoder.js')
-require('./decoder/localDecoder.js')
 
 require('./analysis/staticAnalysisCommon-test.js')
 require('./analysis/staticAnalysisIntegration-test.js')