breakpointManager, eventManager, traceHelper import export updated

libs/remix-debug/src/cmdline/index.ts

@@ -1,5 +1,5 @@
 import Web3 from 'web3'
-const Debugger = require('../debugger/debugger.js')
+import { Debugger } from '../debugger/debugger.js'
 import { EventEmitter } from 'events'
 
 export class CmdLine {
@@ -47,13 +47,9 @@ export class CmdLine {
 
   getSource () {
     const lineColumnPos = this.lineColumnPos
-
     if (!lineColumnPos || !lineColumnPos.start) return []
-
     const content = this.compilation.compilationResult.source.sources[this.filename].content.split('\n')
-
     const source = []
-
     let line
     line = content[lineColumnPos.start.line - 2]
     if (line !== undefined) {

libs/remix-debug/src/code/breakpointManager.ts

@@ -1,7 +1,7 @@
 'use strict'
 
-const EventManager = require('../eventManager')
-const helper = require('../trace/traceHelper')
+import { EventManager } from '../eventManager'
+import { isJumpDestInstruction } from '../trace/traceHelper'
 
 /**
   * allow to manage breakpoint
@@ -72,7 +72,7 @@ export class BreakpointManager {
     // isJumpDestInstruction -> returning from a internal function call
     // depthChange -> returning from an external call
     // sourceLocation.start <= previousSourceLocation.start && ... -> previous src is contained in the current one
-    if ((helper.isJumpDestInstruction(trace[currentStep]) && previousSourceLocation.jump === 'o') ||
+    if ((isJumpDestInstruction(trace[currentStep]) && previousSourceLocation.jump === 'o') ||
       this.depthChange(currentStep, trace) ||
       (sourceLocation.start <= previousSourceLocation.start &&
         sourceLocation.start + sourceLocation.length >= previousSourceLocation.start + previousSourceLocation.length)) {

libs/remix-debug/src/eventManager.ts

@@ -1,6 +1,6 @@
 'use strict'
 
-export class eventManager {
+export class EventManager {
 
   registered
   anonymous

libs/remix-debug/src/trace/traceHelper.ts

@@ -1,70 +1,69 @@
 'use strict'
-const remixLib = require('@remix-project/remix-lib')
-const ui = remixLib.helpers.ui
+import { helpers } from '@remix-project/remix-lib'
+const ui = helpers.ui
 
-export = {
   // vmTraceIndex has to point to a CALL, CODECALL, ...
-  resolveCalledAddress: function (vmTraceIndex, trace) {
-    const step = trace[vmTraceIndex]
-    if (this.isCreateInstruction(step)) {
-      return this.contractCreationToken(vmTraceIndex)
-    } else if (this.isCallInstruction(step)) {
-      const stack = step.stack // callcode, delegatecall, ...
-      return ui.normalizeHexAddress(stack[stack.length - 2])
-    }
-    return undefined
-  },
+export function resolveCalledAddress (vmTraceIndex, trace) {
+  const step = trace[vmTraceIndex]
+  if (isCreateInstruction(step)) {
+    return contractCreationToken(vmTraceIndex)
+  } else if (isCallInstruction(step)) {
+    const stack = step.stack // callcode, delegatecall, ...
+    return ui.normalizeHexAddress(stack[stack.length - 2])
+  }
+  return undefined
+}
 
-  isCallInstruction: function (step) {
-    return step.op === 'CALL' || step.op === 'CALLCODE' || step.op === 'CREATE' || step.op === 'DELEGATECALL'
-  },
+export function isCallInstruction (step) {
+  return step.op === 'CALL' || step.op === 'CALLCODE' || step.op === 'CREATE' || step.op === 'DELEGATECALL'
+}
 
-  isCreateInstruction: function (step) {
-    return step.op === 'CREATE'
-  },
+export function isCreateInstruction (step) {
+  return step.op === 'CREATE'
+}
 
-  isReturnInstruction: function (step) {
-    return step.op === 'RETURN'
-  },
+export function isReturnInstruction (step) {
+  return step.op === 'RETURN'
+}
 
-  isJumpDestInstruction: function (step) {
-    return step.op === 'JUMPDEST'
-  },
+export function isJumpDestInstruction (step) {
+  return step.op === 'JUMPDEST'
+}
 
-  isStopInstruction: function (step) {
-    return step.op === 'STOP'
-  },
+export function isStopInstruction (step) {
+  return step.op === 'STOP'
+}
 
-  isRevertInstruction: function (step) {
-    return step.op === 'REVERT'
-  },
+export function isRevertInstruction (step) {
+  return step.op === 'REVERT'
+}
 
-  isSSTOREInstruction: function (step) {
-    return step.op === 'SSTORE'
-  },
+export function isSSTOREInstruction (step) {
+  return step.op === 'SSTORE'
+}
 
-  isSHA3Instruction: function (step) {
-    return step.op === 'SHA3'
-  },
+export function isSHA3Instruction (step) {
+  return step.op === 'SHA3'
+}
 
-  newContextStorage: function (step) {
-    return step.op === 'CREATE' || step.op === 'CALL'
-  },
+export function newContextStorage (step) {
+  return step.op === 'CREATE' || step.op === 'CALL'
+}
 
-  isCallToPrecompiledContract: function (index, trace) {
-    // if stack empty => this is not a precompiled contract
-    const step = trace[index]
-    if (this.isCallInstruction(step)) {
-      return index + 1 < trace.length && trace[index + 1].stack.length !== 0
-    }
-    return false
-  },
+export function isCallToPrecompiledContract (index, trace) {
+  // if stack empty => this is not a precompiled contract
+  const step = trace[index]
+  if (this.isCallInstruction(step)) {
+    return index + 1 < trace.length && trace[index + 1].stack.length !== 0
+  }
+  return false
+}
 
-  contractCreationToken: function (index) {
-    return '(Contract Creation - Step ' + index + ')'
-  },
+export function contractCreationToken (index) {
+  return '(Contract Creation - Step ' + index + ')'
+}
 
-  isContractCreation: function (address) {
-    return address.indexOf('(Contract Creation - Step') !== -1
-  }
+export function isContractCreation (address) {
+  return address.indexOf('(Contract Creation - Step') !== -1
 }
+