move ui modal dialog from setProviderFromEndPoint to caller; remove ui dependency from execution-context

pull/3094/head
Iuri Matias 7 years ago
parent 60c75c53a1
commit 0fcea104a4
  1. 7
      src/app/tabs/run-tab.js
  2. 5
      src/execution-context.js

@ -252,7 +252,12 @@ function runTab (container, appAPI, appEvents, opts) {
modalDialogCustom.confirm(null, 'Are you sure you want to connect to an ethereum node?', () => {
modalDialogCustom.prompt(null, 'Web3 Provider Endpoint', 'http://localhost:8545', (target) => {
executionContext.setProviderFromEndpoint(target, context, setFinalContext)
executionContext.setProviderFromEndpoint(target, context, (alertMsg) => {
if (alertMsg) {
modalDialogCustom.alert(alertMsg)
}
setFinalContext()
})
}, setFinalContext)
}, setFinalContext)

@ -8,7 +8,6 @@ var ethUtil = require('ethereumjs-util')
var StateManager = require('ethereumjs-vm/lib/stateManager')
var Web3VMProvider = remixLib.vm.Web3VMProvider
var rlp = ethUtil.rlp
var modalDialogCustom = require('./app/ui/modal-dialog-custom')
var injectedProvider
@ -203,7 +202,6 @@ function ExecutionContext () {
// TODO: not used here anymore and needs to be moved
function setProviderFromEndpoint (endpoint, context, cb) {
if (!cb) cb = () => {}
var oldProvider = web3.currentProvider
if (endpoint === 'ipc') {
@ -220,8 +218,7 @@ function ExecutionContext () {
web3.setProvider(oldProvider)
var alertMsg = 'Not possible to connect to the Web3 provider. '
alertMsg += 'Make sure the provider is running and a connection is open (via IPC or RPC).'
modalDialogCustom.alert(alertMsg)
cb()
cb(alertMsg)
}
}
this.setProviderFromEndpoint = setProviderFromEndpoint;

Loading…
Cancel
Save