fix References

pull/1/head
yann300 7 years ago
parent 213a8cf4b9
commit c3b3f42587
  1. 5
      src/app/tabs/run-tab.js
  2. 12
      src/recorder.js

@ -198,7 +198,10 @@ function updateAccountBalances (container, self) {
RECORDER RECORDER
------------------------------------------------ */ ------------------------------------------------ */
function makeRecorder (registry, runTabEvent, self) { function makeRecorder (registry, runTabEvent, self) {
var recorder = new Recorder(self._deps.compiler, self._deps.udapp, { var recorder = new Recorder(self._deps.compiler, self._deps.udapp,
(msg) => {
self._deps.editorPanel.logMessage(msg)
}, {
events: { events: {
udapp: self._deps.udapp.event, udapp: self._deps.udapp.event,
executioncontext: executionContext.event, executioncontext: executionContext.event,

@ -13,9 +13,9 @@ var modal = require('./app/ui/modal-dialog-custom')
* *
*/ */
class Recorder { class Recorder {
constructor (compiler, udapp, opts = {}) { constructor (compiler, udapp, logMessageCallback, opts = {}) {
var self = this var self = this
self._api = opts.api self.logMessageCallback = logMessageCallback
self.event = new EventManager() self.event = new EventManager()
self.data = { _listen: true, _replay: false, journal: [], _createdContracts: {}, _createdContractsReverse: {}, _usedAccounts: {}, _abis: {}, _contractABIReferences: {}, _linkReferences: {} } self.data = { _listen: true, _replay: false, journal: [], _createdContracts: {}, _createdContractsReverse: {}, _usedAccounts: {}, _abis: {}, _contractABIReferences: {}, _linkReferences: {} }
opts.events.executioncontext.register('contextChanged', () => { opts.events.executioncontext.register('contextChanged', () => {
@ -184,7 +184,7 @@ class Recorder {
run (records, accounts, options, abis, linkReferences, udapp, newContractFn) { run (records, accounts, options, abis, linkReferences, udapp, newContractFn) {
var self = this var self = this
self.setListen(false) self.setListen(false)
self._api.logMessage(`Running ${records.length} transaction(s) ...`) self.logMessageCallback(`Running ${records.length} transaction(s) ...`)
async.eachOfSeries(records, function (tx, index, cb) { async.eachOfSeries(records, function (tx, index, cb) {
var record = self.resolveAddress(tx.record, accounts, options) var record = self.resolveAddress(tx.record, accounts, options)
var abi = abis[tx.record.abi] var abi = abis[tx.record.abi]
@ -241,14 +241,14 @@ class Recorder {
cb(data.error) cb(data.error)
return return
} else { } else {
self._api.logMessage(`(${index}) ${JSON.stringify(record, null, '\t')}`) self.logMessageCallback(`(${index}) ${JSON.stringify(record, null, '\t')}`)
self._api.logMessage(`(${index}) data: ${data.data}`) self.logMessageCallback(`(${index}) data: ${data.data}`)
record.data = { dataHex: data.data, funArgs: tx.record.parameters, funAbi: fnABI, contractBytecode: tx.record.bytecode, contractName: tx.record.contractName } record.data = { dataHex: data.data, funArgs: tx.record.parameters, funAbi: fnABI, contractBytecode: tx.record.bytecode, contractName: tx.record.contractName }
} }
udapp.runTx(record, function (err, txResult) { udapp.runTx(record, function (err, txResult) {
if (err) { if (err) {
console.error(err) console.error(err)
self._api.logMessage(err + '. Execution failed at ' + index) self.logMessageCallback(err + '. Execution failed at ' + index)
} else { } else {
var address = executionContext.isVM() ? txResult.result.createdAddress : txResult.result.contractAddress var address = executionContext.isVM() ? txResult.result.createdAddress : txResult.result.contractAddress
if (address) { if (address) {

Loading…
Cancel
Save