From aa2b1618dc568e4fca11004cf3b0bfcbf00b5757 Mon Sep 17 00:00:00 2001
From: Iuri Matias <iuri.matias@gmail.com>
Date: Mon, 25 Jun 2018 17:47:29 -0400
Subject: [PATCH] update tests

---
 remix-debug/test/decoder/localsTests/int.js         | 7 ++++---
 remix-debug/test/decoder/localsTests/misc.js        | 5 ++---
 remix-debug/test/decoder/localsTests/misc2.js       | 5 ++---
 remix-debug/test/decoder/localsTests/structArray.js | 5 ++---
 remix-debug/test/decoder/stateTests/mapping.js      | 7 ++++---
 5 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/remix-debug/test/decoder/localsTests/int.js b/remix-debug/test/decoder/localsTests/int.js
index c86cf336e7..db3a35f6c8 100644
--- a/remix-debug/test/decoder/localsTests/int.js
+++ b/remix-debug/test/decoder/localsTests/int.js
@@ -1,7 +1,8 @@
 'use strict'
-var remixCore = require('remix-core')
-var TraceManager = remixCore.trace.TraceManager
-var CodeManager = remixCore.code.CodeManager
+
+var TraceManager = require('../../../src/trace/traceManager')
+var CodeManager = require('../../../src/code/codeManager')
+
 var vmCall = require('../vmCall')
 var remixLib = require('remix-lib')
 
diff --git a/remix-debug/test/decoder/localsTests/misc.js b/remix-debug/test/decoder/localsTests/misc.js
index be37d59e49..9285ab31c8 100644
--- a/remix-debug/test/decoder/localsTests/misc.js
+++ b/remix-debug/test/decoder/localsTests/misc.js
@@ -1,7 +1,6 @@
 'use strict'
-var remixCore = require('remix-core')
-var TraceManager = remixCore.trace.TraceManager
-var CodeManager = remixCore.code.CodeManager
+var TraceManager = require('../../../src/trace/traceManager')
+var CodeManager = require('../../../src/code/codeManager')
 var vmCall = require('../vmCall')
 var remixLib = require('remix-lib')
 var traceHelper = remixLib.helpers.trace
diff --git a/remix-debug/test/decoder/localsTests/misc2.js b/remix-debug/test/decoder/localsTests/misc2.js
index 78cd2745f4..19b69eba04 100644
--- a/remix-debug/test/decoder/localsTests/misc2.js
+++ b/remix-debug/test/decoder/localsTests/misc2.js
@@ -1,7 +1,6 @@
 'use strict'
-var remixCore = require('remix-core')
-var TraceManager = remixCore.trace.TraceManager
-var CodeManager = remixCore.code.CodeManager
+var TraceManager = require('../../../src/trace/traceManager')
+var CodeManager = require('../../../src/code/codeManager')
 var vmCall = require('../vmCall')
 var remixLib = require('remix-lib')
 var traceHelper = remixLib.helpers.trace
diff --git a/remix-debug/test/decoder/localsTests/structArray.js b/remix-debug/test/decoder/localsTests/structArray.js
index 8e6865e18f..984a341546 100644
--- a/remix-debug/test/decoder/localsTests/structArray.js
+++ b/remix-debug/test/decoder/localsTests/structArray.js
@@ -1,7 +1,6 @@
 'use strict'
-var remixCore = require('remix-core')
-var TraceManager = remixCore.trace.TraceManager
-var CodeManager = remixCore.code.CodeManager
+var TraceManager = require('../../../src/trace/traceManager')
+var CodeManager = require('../../../src/code/codeManager')
 var vmCall = require('../vmCall')
 var remixLib = require('remix-lib')
 var traceHelper = remixLib.helpers.trace
diff --git a/remix-debug/test/decoder/stateTests/mapping.js b/remix-debug/test/decoder/stateTests/mapping.js
index 9d587f1d74..ed14992837 100644
--- a/remix-debug/test/decoder/stateTests/mapping.js
+++ b/remix-debug/test/decoder/stateTests/mapping.js
@@ -4,6 +4,10 @@ var compiler = require('solc')
 var stateDecoder = require('../../../src/decoder/stateDecoder')
 var vmCall = require('../vmCall')
 
+var TraceManager = require('../../../src/trace/traceManager')
+var StorageResolver = require('../../../src/storage/storageResolver')
+var StorageViewer = require('../../../src/storage/storageViewer')
+
 module.exports = function testMappingStorage (st, cb) {
   var mappingStorage = require('../contracts/mappingStorage')
   var privateKey = new Buffer('dae9801649ba2d95a21e688b56f77905e5667c44ce868ec83f82e838712a2c7a', 'hex')
@@ -40,11 +44,8 @@ function testMapping (st, vm, privateKey, contractAddress, output, cb) {
                 console.log(error)
                 st.end(error)
               } else {
-                var TraceManager = require('remix-core').trace.TraceManager
                 var traceManager = new TraceManager({web3: vm.web3})
                 traceManager.resolveTrace(tx, () => {
-                  var StorageResolver = require('remix-core').storage.StorageResolver
-                  var StorageViewer = require('remix-core').storage.StorageViewer
                   var storageViewer = new StorageViewer({
                     stepIndex: 213,
                     tx: tx,