From d9d73b079fa5596ce01f9e07a653a93a3fe46470 Mon Sep 17 00:00:00 2001 From: Iuri Matias Date: Wed, 18 Jul 2018 17:08:07 +0300 Subject: [PATCH] update requires to new remix libs --- src/app/debugger/debugger.js | 3 +-- .../debugger/remix-debugger/src/ui/Ethdebugger.js | 13 ++++++------- .../remix-debugger/src/ui/FullStoragesChanges.js | 4 ++-- .../remix-debugger/src/ui/SolidityLocals.js | 8 ++++---- .../debugger/remix-debugger/src/ui/SolidityState.js | 8 ++++---- .../debugger/remix-debugger/src/ui/StoragePanel.js | 4 ++-- .../debugger/remix-debugger/src/ui/VmDebugger.js | 4 ++-- src/app/staticanalysis/staticAnalysisView.js | 2 +- team-best-practices.md | 1 - 9 files changed, 22 insertions(+), 25 deletions(-) diff --git a/src/app/debugger/debugger.js b/src/app/debugger/debugger.js index f0bcfd25c0..7b6890c985 100644 --- a/src/app/debugger/debugger.js +++ b/src/app/debugger/debugger.js @@ -2,7 +2,6 @@ var Ethdebugger = require('./remix-debugger/src/ui/Ethdebugger') var remixLib = require('remix-lib') -var remixCore = require('remix-core') var executionContext = require('../../execution-context') var globlalRegistry = require('../../global/registry') @@ -34,7 +33,7 @@ function Debugger (container, sourceHighlighter, localRegistry) { container.appendChild(this.debugger.render()) this.isActive = false - this.breakPointManager = new remixCore.code.BreakpointManager(this.debugger, (sourceLocation) => { + this.breakPointManager = new remixLib.code.BreakpointManager(this.debugger, (sourceLocation) => { return self._deps.offsetToLineColumnConverter.offsetToLineColumn(sourceLocation, sourceLocation.file, this._deps.compiler.lastCompilationResult.source.sources) }) diff --git a/src/app/debugger/remix-debugger/src/ui/Ethdebugger.js b/src/app/debugger/remix-debugger/src/ui/Ethdebugger.js index 3323551d06..8ff491fa49 100644 --- a/src/app/debugger/remix-debugger/src/ui/Ethdebugger.js +++ b/src/app/debugger/remix-debugger/src/ui/Ethdebugger.js @@ -1,10 +1,9 @@ 'use strict' var TxBrowser = require('./TxBrowser') var StepManager = require('./StepManager') -var remixCore = require('remix-core') -var TraceManager = remixCore.trace.TraceManager -var VmDebugger = require('./VmDebugger') var remixLib = require('remix-lib') +var TraceManager = remixLib.trace.TraceManager +var VmDebugger = require('./VmDebugger') var global = remixLib.global var init = remixLib.init var executionContext = remixLib.execution.executionContext @@ -13,10 +12,10 @@ var yo = require('yo-yo') var csjs = require('csjs-inject') var Web3Providers = remixLib.vm.Web3Providers var DummyProvider = remixLib.vm.DummyProvider -var CodeManager = remixCore.code.CodeManager -var remixSolidity = require('remix-solidity') -var SolidityProxy = remixSolidity.SolidityProxy -var InternalCallTree = remixSolidity.InternalCallTree +var CodeManager = remixLib.code.CodeManager +var remixDebug = require('remix-debug') +var SolidityProxy = remixDebug.SolidityDecoder.SolidityProxy +var InternalCallTree = remixDebug.SolidityDecoder.InternalCallTree var css = csjs` .statusMessage { diff --git a/src/app/debugger/remix-debugger/src/ui/FullStoragesChanges.js b/src/app/debugger/remix-debugger/src/ui/FullStoragesChanges.js index ef454851c2..0c2dabd7ce 100644 --- a/src/app/debugger/remix-debugger/src/ui/FullStoragesChanges.js +++ b/src/app/debugger/remix-debugger/src/ui/FullStoragesChanges.js @@ -1,7 +1,7 @@ 'use strict' var DropdownPanel = require('./DropdownPanel') -var remixCore = require('remix-core') -var StorageViewer = remixCore.storage.StorageViewer +var remixDebug = require('remix-debug') +var StorageViewer = remixDebug.storage.StorageViewer var yo = require('yo-yo') function FullStoragesChanges (_parent, _traceManager) { diff --git a/src/app/debugger/remix-debugger/src/ui/SolidityLocals.js b/src/app/debugger/remix-debugger/src/ui/SolidityLocals.js index aaa5334c20..e7b19d0517 100644 --- a/src/app/debugger/remix-debugger/src/ui/SolidityLocals.js +++ b/src/app/debugger/remix-debugger/src/ui/SolidityLocals.js @@ -1,10 +1,10 @@ 'use strict' var DropdownPanel = require('./DropdownPanel') -var remixSolidity = require('remix-solidity') -var localDecoder = remixSolidity.localDecoder +// TODO: update this +var remixDebug = require('remix-debug') +var localDecoder = remixDebug.SoliditySecoder.localDecoder var solidityTypeFormatter = require('./SolidityTypeFormatter') -var remixCore = require('remix-core') -var StorageViewer = remixCore.storage.StorageViewer +var StorageViewer = remixDebug.storage.StorageViewer var yo = require('yo-yo') class SolidityLocals { diff --git a/src/app/debugger/remix-debugger/src/ui/SolidityState.js b/src/app/debugger/remix-debugger/src/ui/SolidityState.js index f69fc045f4..f735def0d1 100644 --- a/src/app/debugger/remix-debugger/src/ui/SolidityState.js +++ b/src/app/debugger/remix-debugger/src/ui/SolidityState.js @@ -1,10 +1,10 @@ 'use strict' var DropdownPanel = require('./DropdownPanel') -var remixSolidity = require('remix-solidity') -var stateDecoder = remixSolidity.stateDecoder +var remixDebug = require('remix-debug') +var stateDecoder = remixDebug.SolidityDecoder.stateDecoder var solidityTypeFormatter = require('./SolidityTypeFormatter') -var remixCore = require('remix-core') -var StorageViewer = remixCore.storage.StorageViewer +var remixLib = require('remix-lib') +var StorageViewer = remixLib.storage.StorageViewer var yo = require('yo-yo') function SolidityState (_parent, _traceManager, _codeManager, _solidityProxy) { diff --git a/src/app/debugger/remix-debugger/src/ui/StoragePanel.js b/src/app/debugger/remix-debugger/src/ui/StoragePanel.js index cd4573e4f7..d4386a2644 100644 --- a/src/app/debugger/remix-debugger/src/ui/StoragePanel.js +++ b/src/app/debugger/remix-debugger/src/ui/StoragePanel.js @@ -1,7 +1,7 @@ 'use strict' var DropdownPanel = require('./DropdownPanel') -var remixCore = require('remix-core') -var StorageViewer = remixCore.storage.StorageViewer +var remixLib = require('remix-lib') +var StorageViewer = remixLib.storage.StorageViewer var yo = require('yo-yo') function StoragePanel (_parent, _traceManager) { diff --git a/src/app/debugger/remix-debugger/src/ui/VmDebugger.js b/src/app/debugger/remix-debugger/src/ui/VmDebugger.js index 9e8be588b7..f42d77802e 100644 --- a/src/app/debugger/remix-debugger/src/ui/VmDebugger.js +++ b/src/app/debugger/remix-debugger/src/ui/VmDebugger.js @@ -11,8 +11,8 @@ var StepDetail = require('./StepDetail') var DropdownPanel = require('./DropdownPanel') var SolidityState = require('./SolidityState') var SolidityLocals = require('./SolidityLocals') -var remixCore = require('remix-core') -var StorageResolver = remixCore.storage.StorageResolver +var remixLib = require('remix-lib') +var StorageResolver = remixLib.storage.StorageResolver var yo = require('yo-yo') var css = csjs` diff --git a/src/app/staticanalysis/staticAnalysisView.js b/src/app/staticanalysis/staticAnalysisView.js index ae68a79e73..6bb5b56398 100644 --- a/src/app/staticanalysis/staticAnalysisView.js +++ b/src/app/staticanalysis/staticAnalysisView.js @@ -1,5 +1,5 @@ 'use strict' -var StaticAnalysisRunner = require('remix-solidity').CodeAnalysis +var StaticAnalysisRunner = require('remix-analyzer').CodeAnalysis var yo = require('yo-yo') var $ = require('jquery') var remixLib = require('remix-lib') diff --git a/team-best-practices.md b/team-best-practices.md index 3a5047cd98..beca23356e 100644 --- a/team-best-practices.md +++ b/team-best-practices.md @@ -16,7 +16,6 @@ Related links: - Remix live: remix.ethereum.org - Remix alpha live: remix-alpha.ethereum.org - Remix-ide NPM module: https://www.npmjs.com/package/remix-ide - - Remix-core NPM module: https://www.npmjs.com/package/remix-core - Remix-lib NPM module: https://www.npmjs.com/package/remix-lib - Remix-solidity NPM module: https://www.npmjs.com/package/remix-solidity - Remix-debug NPM module: https://www.npmjs.com/package/remix-debug