revert dumpStorage changes

pull/5370/head
Admin 3 years ago committed by Aniket
parent 1bcf158d45
commit 5f3e458d69
  1. 6
      apps/remix-ide-e2e/src/tests/ballot.test.ts
  2. 5
      apps/remix-ide-e2e/src/tests/solidityUnittests.spec.ts
  3. 8
      libs/remix-lib/src/web3Provider/web3VmProvider.ts
  4. 4
      libs/remix-simulator/test/blocks.ts

@ -57,7 +57,7 @@ module.exports = {
.goToVMTraceStep(144) .goToVMTraceStep(144)
.pause(2000) .pause(2000)
// Should be uncommented while fixing https://github.com/ethereum/remix-project/issues/1644 // Should be uncommented while fixing https://github.com/ethereum/remix-project/issues/1644
.checkVariableDebug('soliditystate', stateCheck) // .checkVariableDebug('soliditystate', stateCheck)
.checkVariableDebug('soliditylocals', localsCheck) .checkVariableDebug('soliditylocals', localsCheck)
}, },
@ -117,7 +117,7 @@ const localsCheck = {
type: 'address' type: 'address'
} }
} }
/*
const stateCheck = { const stateCheck = {
chairperson: { chairperson: {
value: '0xCA35B7D915458EF540ADE6068DFE2F44E8FA733C', value: '0xCA35B7D915458EF540ADE6068DFE2F44E8FA733C',
@ -175,7 +175,7 @@ const stateCheck = {
immutable: false immutable: false
} }
} }
*/
const ballotABI = `[ const ballotABI = `[
{ {
"inputs": [ "inputs": [

@ -253,7 +253,7 @@ module.exports = {
.waitForElementContainsText('*[data-id="functionPanel"]', 'vote(proposal)', 60000) .waitForElementContainsText('*[data-id="functionPanel"]', 'vote(proposal)', 60000)
.pause(2000) .pause(2000)
// Should be uncommented while fixing https://github.com/ethereum/remix-project/issues/1644 // Should be uncommented while fixing https://github.com/ethereum/remix-project/issues/1644
.checkVariableDebug('soliditylocals', locals) // .checkVariableDebug('soliditylocals', locals)
.clickLaunchIcon('filePanel') .clickLaunchIcon('filePanel')
.pause(2000) .pause(2000)
.openFile('tests/ballotFailedDebug_test.sol') .openFile('tests/ballotFailedDebug_test.sol')
@ -558,7 +558,7 @@ const sources = [
} }
} }
] ]
/*
const locals = { const locals = {
sender: { sender: {
value: { value: {
@ -586,3 +586,4 @@ const locals = {
type: 'uint256' type: 'uint256'
} }
} }
*/

@ -132,8 +132,8 @@ export class Web3VmProvider {
// dumpStorage throws error as 'Missing Node in DB' // dumpStorage throws error as 'Missing Node in DB'
// This can be uncommented once that error is handled // This can be uncommented once that error is handled
// https://github.com/ethereum/remix-project/issues/1644 // https://github.com/ethereum/remix-project/issues/1644
const storage = await this.vm.stateManager.dumpStorage(data.to) // const storage = await this.vm.stateManager.dumpStorage(data.to)
// const storage = {} const storage = {}
this.storageCache[this.processingHash][tx['to']] = storage this.storageCache[this.processingHash][tx['to']] = storage
this.lastProcessedStorageTxHash[tx['to']] = this.processingHash this.lastProcessedStorageTxHash[tx['to']] = this.processingHash
} catch (e) { } catch (e) {
@ -252,8 +252,8 @@ export class Web3VmProvider {
// dumpStorage throws error as 'Missing Node in DB' // dumpStorage throws error as 'Missing Node in DB'
// This can be uncommented once that error is handled // This can be uncommented once that error is handled
// https://github.com/ethereum/remix-project/issues/1644 // https://github.com/ethereum/remix-project/issues/1644
const storage = await this.vm.stateManager.dumpStorage(account) // const storage = await this.vm.stateManager.dumpStorage(account)
// const storage = {} const storage = {}
this.storageCache[this.processingHash][this.processingAddress] = storage this.storageCache[this.processingHash][this.processingAddress] = storage
this.lastProcessedStorageTxHash[this.processingAddress] = this.processingHash this.lastProcessedStorageTxHash[this.processingAddress] = this.processingHash
} catch (e) { } catch (e) {

@ -115,7 +115,7 @@ describe('blocks', () => {
assert.deepEqual(numberTransactions, correctBlock.uncles.length) assert.deepEqual(numberTransactions, correctBlock.uncles.length)
}) })
}) })
/*
describe('eth_getStorageAt', () => { describe('eth_getStorageAt', () => {
it('should get storage at position at given address', async () => { it('should get storage at position at given address', async () => {
const abi: any = [ const abi: any = [
@ -222,7 +222,7 @@ describe('blocks', () => {
assert.deepEqual(storage, '0xc8') assert.deepEqual(storage, '0xc8')
}) })
}) })
*/
describe('eth_call', () => { describe('eth_call', () => {
it('should get a value', async () => { it('should get a value', async () => {
const abi: any = [ const abi: any = [

Loading…
Cancel
Save