Commit 63a92996 authored by Iuri Matias's avatar Iuri Matias

move remix-core code & tests to remix-debug

parent e174d97b
...@@ -7,4 +7,5 @@ test-browser/reports/* ...@@ -7,4 +7,5 @@ test-browser/reports/*
babelify-src babelify-src
docs/_build docs/_build
package-lock.json package-lock.json
.DS_Store .DS_Store
\ No newline at end of file .tern-port
require('./traceManager.js')
require('./codeManager.js')
require('./disassembler.js')
...@@ -2,6 +2,12 @@ ...@@ -2,6 +2,12 @@
var remixCore = require('remix-core') var remixCore = require('remix-core')
var EthDebugger = require('./src/Ethdebugger') var EthDebugger = require('./src/Ethdebugger')
var CodeManager = require('./src/code/codeManager')
var BreakpointManager = require('./src/code/breakpointManager')
var StorageViewer = require('./src/storage/storageViewer')
var StorageResolver = require('./src/storage/storageResolver')
var TraceManager = require('./src/trace/traceManager')
/* /*
Use of breakPointManager : Use of breakPointManager :
...@@ -12,11 +18,23 @@ var EthDebugger = require('./src/Ethdebugger') ...@@ -12,11 +18,23 @@ var EthDebugger = require('./src/Ethdebugger')
*/ */
module.exports = { module.exports = {
EthDebugger: EthDebugger, EthDebugger: EthDebugger,
/** /**
* constructor * constructor
* *
* @param {Object} _debugger - type of EthDebugger * @param {Object} _debugger - type of EthDebugger
* @return {Function} _locationToRowConverter - function implemented by editor which return a column/line position for a char source location * @return {Function} _locationToRowConverter - function implemented by editor which return a column/line position for a char source location
*/ */
BreakpointManager: remixCore.code.BreakpointManager BreakpointManager: remixCore.code.BreakpointManager,
code: {
CodeManager: CodeManager,
BreakpointManager: BreakpointManager
},
storage: {
StorageViewer: StorageViewer,
StorageResolver: StorageResolver
},
trace: {
TraceManager: TraceManager
}
} }
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
"ethereumjs-vm": "^2.3.3", "ethereumjs-vm": "^2.3.3",
"notify-error": "^1.2.0", "notify-error": "^1.2.0",
"npm-run-all": "^4.1.2", "npm-run-all": "^4.1.2",
"remix-core": "^0.0.15", "fast-async": "^6.1.2",
"remix-lib": "^0.2.9", "remix-lib": "^0.2.9",
"remix-solidity": "^0.1.11", "remix-solidity": "^0.1.11",
"solc": "https://github.com/ethereum/solc-js" "solc": "https://github.com/ethereum/solc-js"
...@@ -57,7 +57,8 @@ ...@@ -57,7 +57,8 @@
"node_modules/*", "node_modules/*",
"build/*", "build/*",
"test/resources/*" "test/resources/*"
] ],
"parser": "babel-eslint"
}, },
"babel": { "babel": {
"plugins": [ "plugins": [
...@@ -91,6 +92,18 @@ ...@@ -91,6 +92,18 @@
"sourceMaps": true, "sourceMaps": true,
"plugins": [ "plugins": [
[ [
[
"fast-async",
{
"runtimePatten": null,
"compiler": {
"promises": true,
"es7": true,
"noRuntime": true,
"wrapAwait": true
}
}
],
"transform-object-assign" "transform-object-assign"
] ]
], ],
......
'use strict' 'use strict'
var remixCore = require('remix-core')
var TraceManager = remixCore.trace.TraceManager var CodeManager = require('./code/codeManager')
var StorageViewer = remixCore.storage.StorageViewer var StorageViewer = require('./storage/storageViewer')
var StorageResolver = require('./storage/storageResolver')
var TraceManager = require('./trace/traceManager')
var remixLib = require('remix-lib') var remixLib = require('remix-lib')
var traceHelper = remixLib.helpers.trace var traceHelper = remixLib.helpers.trace
var init = remixLib.init var init = remixLib.init
...@@ -9,13 +12,11 @@ var executionContext = remixLib.execution.executionContext ...@@ -9,13 +12,11 @@ var executionContext = remixLib.execution.executionContext
var EventManager = remixLib.EventManager var EventManager = remixLib.EventManager
var Web3Providers = remixLib.vm.Web3Providers var Web3Providers = remixLib.vm.Web3Providers
var DummyProvider = remixLib.vm.DummyProvider var DummyProvider = remixLib.vm.DummyProvider
var CodeManager = remixCore.code.CodeManager
var remixSolidity = require('remix-solidity') var remixSolidity = require('remix-solidity')
var SolidityProxy = remixSolidity.SolidityProxy var SolidityProxy = remixSolidity.SolidityProxy
var stateDecoder = remixSolidity.stateDecoder var stateDecoder = remixSolidity.stateDecoder
var localDecoder = remixSolidity.localDecoder var localDecoder = remixSolidity.localDecoder
var InternalCallTree = remixSolidity.InternalCallTree var InternalCallTree = remixSolidity.InternalCallTree
var StorageResolver = remixCore.storage.StorageResolver
/** /**
* Ethdebugger is a wrapper around a few classes that helps debugging a transaction * Ethdebugger is a wrapper around a few classes that helps debugging a transaction
......
'use strict' 'use strict'
var tape = require('tape') var tape = require('tape')
var remixLib = require('remix-lib') var remixLib = require('remix-lib')
var remixCore = require('remix-core')
var compilerInput = remixLib.helpers.compiler.compilerInput var compilerInput = remixLib.helpers.compiler.compilerInput
var vmCall = require('./vmCall') var vmCall = require('./vmCall')
var Debugger = require('../src/Ethdebugger') var Debugger = require('../src/Ethdebugger')
var compiler = require('solc') var compiler = require('solc')
require('./traceManager.js')
require('./codeManager.js')
require('./disassembler.js')
var BreakpointManager = require('../src/code/breakpointManager')
tape('debug contract', function (t) { tape('debug contract', function (t) {
t.plan(12) t.plan(12)
var privateKey = new Buffer('dae9801649ba2d95a21e688b56f77905e5667c44ce868ec83f82e838712a2c7a', 'hex') var privateKey = new Buffer('dae9801649ba2d95a21e688b56f77905e5667c44ce868ec83f82e838712a2c7a', 'hex')
...@@ -95,7 +100,7 @@ function testDebugging (t, debugManager) { ...@@ -95,7 +100,7 @@ function testDebugging (t, debugManager) {
}) })
var sourceMappingDecoder = new remixLib.SourceMappingDecoder() var sourceMappingDecoder = new remixLib.SourceMappingDecoder()
var breakPointManager = new remixCore.code.BreakpointManager(debugManager, (rawLocation) => { var breakPointManager = new BreakpointManager(debugManager, (rawLocation) => {
return sourceMappingDecoder.convertOffsetToLineColumn(rawLocation, sourceMappingDecoder.getLinebreakPositions(ballot)) return sourceMappingDecoder.convertOffsetToLineColumn(rawLocation, sourceMappingDecoder.getLinebreakPositions(ballot))
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment