Refactor remix lib

remix-debug/index.js

@@ -8,8 +8,7 @@ const StorageResolver = require('./src/storage/storageResolver')
 
 const SolidityDecoder = require('./src/solidity-decoder')
 
-const remixLib = require('remix-lib')
-const BreakpointManager = remixLib.code.BreakpointManager
+const BreakpointManager = require('./src/code/breakpointManager')
 
 /*
   Use of breakPointManager :

remix-debug/package.json

@@ -21,7 +21,6 @@
     "commander": "^2.19.0",
     "ethereumjs-util": "^6.2.0",
     "ethereumjs-vm": "4.1.3",
-    "remix-lib": "0.4.29",
     "web3": "^1.2.4"
   },
   "devDependencies": {

remix-debug/src/Ethdebugger.js

@@ -9,11 +9,10 @@ const stateDecoder = SolidityDecoder.stateDecoder
 const localDecoder = SolidityDecoder.localDecoder
 const InternalCallTree = SolidityDecoder.InternalCallTree
 
-const remixLib = require('remix-lib')
-const TraceManager = remixLib.trace.TraceManager
-const CodeManager = remixLib.code.CodeManager
-const traceHelper = remixLib.helpers.trace
-const EventManager = remixLib.EventManager
+const TraceManager = require('./trace/traceManager')
+const CodeManager = require('./code/codeManager')
+const traceHelper = require('./trace/traceHelper')
+const EventManager = require('./eventManager')
 
 /**
   * Ethdebugger is a wrapper around a few classes that helps debugging a transaction

remix-debug/src/cmdline/index.js

@@ -1,14 +1,10 @@
 const Web3 = require('web3')
 const Debugger = require('../debugger/debugger.js')
-const ContextManager = require('./contextManager.js')
 const EventManager = require('events')
-const remixLib = require('remix-lib')
-const executionContext = remixLib.execution.executionContext
 
 class CmdLine {
 
   constructor () {
-    this.executionContext = executionContext
     this.events = new EventManager()
     this.lineColumnPos = null
     this.rawLocation = null
@@ -32,21 +28,10 @@ class CmdLine {
   }
 
   initDebugger (cb) {
-    this.contextManager = new ContextManager(this.executionContext)
-
     this.debugger = new Debugger({
-      web3: this.contextManager.getWeb3(),
+      web3: this.web3,
       compilationResult: () => { return this.compilation.compilationResult }
     })
-
-    this.contextManager.event.register('providerChanged', () => {
-      this.debugger.updateWeb3(this.contextManager.getWeb3())
-    })
-
-    this.contextManager.initProviders()
-
-    this.contextManager.addProvider('debugger_web3', this.web3)
-    this.contextManager.switchProvider('debugger_web3', cb)
   }
 
   getSource () {

remix-lib/src/code/breakpointManager.js → remix-debug/src/code/breakpointManager.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const EventManager = require('../eventManager')
-const helper = require('../helpers/traceHelper')
+const helper = require('../trace/traceHelper')
 
 /**
   * allow to manage breakpoint

remix-lib/src/code/codeManager.js → remix-debug/src/code/codeManager.js

@@ -1,8 +1,8 @@
 'use strict'
 
 const EventManager = require('../eventManager')
-const traceHelper = require('../helpers/traceHelper')
-const SourceMappingDecoder = require('../sourceMappingDecoder')
+const traceHelper = require('../trace/traceHelper')
+const SourceMappingDecoder = require('../source/sourceMappingDecoder')
 const CodeResolver = require('./codeResolver')
 
 /*

remix-debug/src/debugger/VmDebugger.js

@@ -1,6 +1,6 @@
-const remixLib = require('remix-lib')
-const EventManager = remixLib.EventManager
-const ui = remixLib.helpers.ui
+
+const EventManager = require('../eventManager')
+const ui = require('../uiHelper')
 const StorageResolver = require('../storage/storageResolver')
 const StorageViewer = require('../storage/storageViewer')
 

remix-debug/src/debugger/debugger.js

@@ -1,17 +1,15 @@
 'use strict'
+const EventManager = require('../eventManager')
 const Ethdebugger = require('../Ethdebugger')
-const remixLib = require('remix-lib')
-const EventManager = remixLib.EventManager
-const traceHelper = remixLib.helpers.trace
-const OffsetToColumnConverter = remixLib.OffsetToColumnConverter
-
+const traceHelper = require('../trace/traceHelper')
+const BreakpointManager = require('../code/breakpointManager')
 const StepManager = require('./stepManager')
 const VmDebuggerLogic = require('./VmDebugger')
 
 function Debugger (options) {
   this.event = new EventManager()
 
-  this.offsetToLineColumnConverter = options.offsetToLineColumnConverter || (new OffsetToColumnConverter())
+  this.offsetToLineColumnConverter = options.offsetToLineColumnConverter
   /*
     Returns a compilation result for a given address or the last one available if none are found
   */
@@ -22,7 +20,7 @@ function Debugger (options) {
     compilationResult: this.compilationResult
   })
 
-  this.breakPointManager = new remixLib.code.BreakpointManager(this.debugger, async (sourceLocation) => {
+  this.breakPointManager = new BreakpointManager(this.debugger, async (sourceLocation) => {
     const compilationResult = await this.compilationResult()
     if (!compilationResult) return { start: null, end: null }
     return this.offsetToLineColumnConverter.offsetToLineColumn(sourceLocation, sourceLocation.file, compilationResult.source.sources, compilationResult.data.sources)

remix-debug/src/debugger/solidityLocals.js

@@ -1,6 +1,5 @@
-const remixLib = require('remix-lib')
-const EventManager = remixLib.EventManager
 
+const EventManager = require('../eventManager')
 const localDecoder = require('../solidity-decoder/localDecoder')
 const StorageViewer = require('../storage/storageViewer')
 

remix-debug/src/debugger/solidityState.js

@@ -1,5 +1,4 @@
-const remixLib = require('remix-lib')
-const EventManager = remixLib.EventManager
+const EventManager = require('../eventManager')
 const stateDecoder = require('../solidity-decoder/stateDecoder')
 const StorageViewer = require('../storage/storageViewer')
 

remix-debug/src/debugger/stepManager.js

@@ -1,6 +1,5 @@
-const remixLib = require('remix-lib')
-const EventManager = remixLib.EventManager
-const util = remixLib.util
+const EventManager = require('../eventManager')
+const util = require('../util')
 
 class DebuggerStepManager {
 

remix-lib/src/init.js → remix-debug/src/init.js

@@ -1,23 +1,6 @@
 'use strict'
-const Web3 = require('web3')
 
 module.exports = {
-  loadWeb3: function (url) {
-    if (!url) url = 'http://localhost:8545'
-    const web3 = new Web3()
-    web3.setProvider(new web3.providers.HttpProvider(url))
-    this.extend(web3)
-    return web3
-  },
-
-  extendWeb3: function (web3) {
-    this.extend(web3)
-  },
-
-  setProvider: function (web3, url) {
-    web3.setProvider(new web3.providers.HttpProvider(url))
-  },
-
   web3DebugNode: function (network) {
     if (web3DebugNodes[network]) {
       return this.loadWeb3(web3DebugNodes[network])

remix-debug/src/solidity-decoder/astHelper.js

@@ -1,6 +1,5 @@
 'use strict'
-const remixLib = require('remix-lib')
-const AstWalker = remixLib.AstWalker
+const AstWalker = require('../source/astWalker')
 
 /**
   * return all contract definitions of the given @astList

remix-debug/src/solidity-decoder/internalCallTree.js

@@ -1,11 +1,10 @@
 'use strict'
-const remixLib = require('remix-lib')
-const SourceLocationTracker = remixLib.SourceLocationTracker
-const AstWalker = remixLib.AstWalker
-const EventManager = remixLib.EventManager
+const SourceLocationTracker = require('../source/sourceLocationTracker')
+const AstWalker = require('../source/astWalker')
+const EventManager = require('../eventManager')
 const decodeInfo = require('./decodeInfo')
-const util = remixLib.util
-const traceHelper = remixLib.helpers.trace
+const util = require('../util')
+const traceHelper = require('../trace/traceHelper')
 const typesUtil = require('./types/util.js')
 
 /**

remix-debug/src/solidity-decoder/solidityProxy.js

@@ -1,9 +1,9 @@
 'use strict'
-const remixLib = require('remix-lib')
-const traceHelper = remixLib.helpers.trace
+
+const traceHelper = require('../trace/traceHelper')
 const stateDecoder = require('./stateDecoder')
 const astHelper = require('./astHelper')
-const util = remixLib.util
+const util = require('../util')
 
 class SolidityProxy {
   constructor (traceManager, codeManager) {

remix-debug/src/solidity-decoder/types/ArrayType.js

@@ -1,7 +1,6 @@
 'use strict'
 const util = require('./util')
-const remixLib = require('remix-lib')
-const sha3256 = remixLib.util.sha3_256
+const sha3256 = require('../../util').sha3_256
 const BN = require('ethereumjs-util').BN
 const RefType = require('./RefType')
 

remix-debug/src/solidity-decoder/types/DynamicByteArray.js

@@ -1,7 +1,6 @@
 'use strict'
 const util = require('./util')
-const remixLib = require('remix-lib')
-const sha3256 = remixLib.util.sha3_256
+const sha3256 = require('../../util').sha3_256
 const BN = require('ethereumjs-util').BN
 const RefType = require('./RefType')
 

remix-lib/src/sourceLocationTracker.js → remix-debug/src/source/sourceLocationTracker.js

@@ -1,8 +1,8 @@
 'use strict'
-const EventManager = require('./eventManager')
-const helper = require('./helpers/traceHelper')
+const EventManager = require('../eventManager')
+const helper = require('../trace/traceHelper')
 const SourceMappingDecoder = require('./sourceMappingDecoder')
-const util = require('./util')
+const util = require('../util')
 
 /**
  * Process the source code location for the current executing bytecode

remix-lib/src/sourceMappingDecoder.js → remix-debug/src/source/sourceMappingDecoder.js

@@ -1,5 +1,5 @@
 'use strict'
-const util = require('./util')
+const util = require('../util')
 const AstWalker = require('./astWalker')
 
 /**

remix-debug/src/storage/storageResolver.js

@@ -1,6 +1,5 @@
 'use strict'
-const remixLib = require('remix-lib')
-const traceHelper = remixLib.helpers.trace
+const traceHelper = require('../trace/traceHelper')
 const mappingPreimages = require('./mappingPreimages')
 
 /**

remix-debug/src/storage/storageViewer.js

@@ -1,6 +1,5 @@
 'use strict'
-const remixLib = require('remix-lib')
-const util = remixLib.util
+const util = require('../util')
 const mappingPreimages = require('./mappingPreimages')
 
  /**

remix-lib/src/trace/traceAnalyser.js → remix-debug/src/trace/traceAnalyser.js

@@ -1,5 +1,5 @@
 'use strict'
-const traceHelper = require('../helpers/traceHelper')
+const traceHelper = require('./traceHelper')
 
 function TraceAnalyser (_cache) {
   this.traceCache = _cache

remix-lib/src/helpers/traceHelper.js → remix-debug/src/trace/traceHelper.js

@@ -1,5 +1,5 @@
 'use strict'
-const ui = require('./uiHelper')
+const ui = require('../uiHelper')
 
 module.exports = {
   // vmTraceIndex has to point to a CALL, CODECALL, ...

remix-lib/src/trace/traceManager.js → remix-debug/src/trace/traceManager.js

@@ -4,7 +4,7 @@ const TraceRetriever = require('./traceRetriever')
 const TraceCache = require('./traceCache')
 const TraceStepManager = require('./traceStepManager')
 
-const traceHelper = require('../helpers/traceHelper')
+const traceHelper = require('./traceHelper')
 const util = require('../util')
 
 function TraceManager (options) {

remix-lib/src/trace/traceStepManager.js → remix-debug/src/trace/traceStepManager.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const traceHelper = require('../helpers/traceHelper')
+const traceHelper = require('./traceHelper')
 const util = require('../util')
 
 function TraceStepManager (_traceAnalyser) {

remix-lib/src/web3Provider/web3VmProvider.js → remix-debug/src/web3VmProvider.js

@@ -1,6 +1,6 @@
-const util = require('../util')
-const uiutil = require('../helpers/uiHelper')
-const traceHelper = require('../helpers/traceHelper')
+const util = require('./util')
+const uiutil = require('./uiHelper')
+const traceHelper = require('./trace/traceHelper')
 const ethutil = require('ethereumjs-util')
 const Web3 = require('web3')
 

remix-lib/test/astwalker.js → remix-debug/test/astwalker.js

@@ -1,6 +1,6 @@
 'use strict'
 const tape = require('tape')
-const AstWalker = require('../src/astWalker')
+const AstWalker = require('../src/source/astWalker')
 const node = require('./resources/ast')
 
 tape('ASTWalker', function (t) {