From 03f55cc5649cdfc1a3c206dc026ebfcaa12ce32d Mon Sep 17 00:00:00 2001 From: yann300 Date: Thu, 4 Jan 2018 19:07:56 +0100 Subject: [PATCH] fix run scenario from remixd --- src/app/tabs/run-tab.js | 45 +++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/src/app/tabs/run-tab.js b/src/app/tabs/run-tab.js index 707720f3e0..52b9f949c4 100644 --- a/src/app/tabs/run-tab.js +++ b/src/app/tabs/run-tab.js @@ -327,27 +327,32 @@ function makeRecorder (events, appAPI, appEvents) { } runButton.onclick = () => { var currentFile = appAPI.config.get('currentFile') - var json = appAPI.filesProviders['browser'].get(currentFile) - if (currentFile.match('.json$')) { - try { - var obj = JSON.parse(json) - var txArray = obj.transactions || [] - var accounts = obj.accounts || [] - var options = obj.options - var abis = obj.abis - var linkReferences = obj.linkReferences || {} - } catch (e) { - return modalDialogCustom.alert('Invalid Scenario File, please try again') - } - if (txArray.length) { - noInstancesText.style.display = 'none' - recorder.run(txArray, accounts, options, abis, linkReferences, (abi, address, contractName) => { - instanceContainer.appendChild(appAPI.udapp().renderInstanceFromABI(abi, address, contractName)) - }) + appAPI.fileProviderOf(currentFile).get(currentFile, (error, json) => { + if (error) { + modalDialogCustom.alert('Invalid Scenario File ' + error) + } else { + if (currentFile.match('.json$')) { + try { + var obj = JSON.parse(json) + var txArray = obj.transactions || [] + var accounts = obj.accounts || [] + var options = obj.options + var abis = obj.abis + var linkReferences = obj.linkReferences || {} + } catch (e) { + return modalDialogCustom.alert('Invalid Scenario File, please try again') + } + if (txArray.length) { + noInstancesText.style.display = 'none' + recorder.run(txArray, accounts, options, abis, linkReferences, (abi, address, contractName) => { + instanceContainer.appendChild(appAPI.udapp().renderInstanceFromABI(abi, address, contractName)) + }) + } + } else { + modalDialogCustom.alert('A Scenario File is required. The file must be of type JSON. Use the "Save Transactions" Button to generate a new Scenario File.') + } } - } else { - modalDialogCustom.alert('A Scenario File is required. The file must be of type JSON. Use the "Save Transactions" Button to generate a new Scenario File.') - } + }) } return { recordButton, runButton } }