remove classes from remix-lib to remix-debug

Author: yann300

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-lock.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/package.json

@@ -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/Ethdebugger.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-debug/src/cmdline/contextManager.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-debug/src/cmdline/index.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')
 
 /*