pull/5370/head
yann300 3 years ago
parent 4aaefb0298
commit 7e115dee5d
  1. 2
      apps/remix-ide-e2e/src/tests/terminal.test.ts
  2. 26
      libs/remix-lib/src/execution/logsManager.ts

@ -106,7 +106,7 @@ module.exports = {
.pause(1000) .pause(1000)
.executeScript('remix.execute(\'resolveExternalUrlAndSaveToaPath.js\')') .executeScript('remix.execute(\'resolveExternalUrlAndSaveToaPath.js\')')
.waitForElementContainsText('*[data-id="terminalJournal"]', 'abstract contract ERC20Burnable', 60000) .waitForElementContainsText('*[data-id="terminalJournal"]', 'abstract contract ERC20Burnable', 60000)
.openFile('.deps/github/newFile.sol') .openFile('.deps/github/newFile.sol')
}, },
'Deploy "Owner" using an ether.js script listen to event and check event are logged in the terminal': function (browser: NightwatchBrowser) { 'Deploy "Owner" using an ether.js script listen to event and check event are logged in the terminal': function (browser: NightwatchBrowser) {

@ -146,19 +146,19 @@ export class LogsManager {
getLogsByTxHash (hash) { getLogsByTxHash (hash) {
return this.oldLogs.filter((log) => '0x' + log.tx.hash().toString('hex') === hash) return this.oldLogs.filter((log) => '0x' + log.tx.hash().toString('hex') === hash)
.map((log) => { .map((log) => {
return { return {
logIndex: '0x1', // 1 logIndex: '0x1', // 1
blockNumber: log.blockNumber, blockNumber: log.blockNumber,
blockHash: ('0x' + log.block.hash().toString('hex')), blockHash: ('0x' + log.block.hash().toString('hex')),
transactionHash: ('0x' + log.tx.hash().toString('hex')), transactionHash: ('0x' + log.tx.hash().toString('hex')),
transactionIndex: '0x' + log.txNumber.toString(16), transactionIndex: '0x' + log.txNumber.toString(16),
// TODO: if it's a contract deploy, it should be that address instead // TODO: if it's a contract deploy, it should be that address instead
address: log.log.address, address: log.log.address,
data: log.log.data, data: log.log.data,
topics: log.log.topics topics: log.log.topics
} }
}) })
} }
getLogsFor (params) { getLogsFor (params) {

Loading…
Cancel
Save