From 5f3e458d6933d2deded8afd938d2f50bc979a153 Mon Sep 17 00:00:00 2001 From: Admin Date: Tue, 5 Oct 2021 19:10:30 +0530 Subject: [PATCH] revert dumpStorage changes --- apps/remix-ide-e2e/src/tests/ballot.test.ts | 6 +++--- apps/remix-ide-e2e/src/tests/solidityUnittests.spec.ts | 5 +++-- libs/remix-lib/src/web3Provider/web3VmProvider.ts | 8 ++++---- libs/remix-simulator/test/blocks.ts | 4 ++-- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/apps/remix-ide-e2e/src/tests/ballot.test.ts b/apps/remix-ide-e2e/src/tests/ballot.test.ts index a81fb591ff..993d8ce262 100644 --- a/apps/remix-ide-e2e/src/tests/ballot.test.ts +++ b/apps/remix-ide-e2e/src/tests/ballot.test.ts @@ -57,7 +57,7 @@ module.exports = { .goToVMTraceStep(144) .pause(2000) // Should be uncommented while fixing https://github.com/ethereum/remix-project/issues/1644 - .checkVariableDebug('soliditystate', stateCheck) + // .checkVariableDebug('soliditystate', stateCheck) .checkVariableDebug('soliditylocals', localsCheck) }, @@ -117,7 +117,7 @@ const localsCheck = { type: 'address' } } - +/* const stateCheck = { chairperson: { value: '0xCA35B7D915458EF540ADE6068DFE2F44E8FA733C', @@ -175,7 +175,7 @@ const stateCheck = { immutable: false } } - +*/ const ballotABI = `[ { "inputs": [ diff --git a/apps/remix-ide-e2e/src/tests/solidityUnittests.spec.ts b/apps/remix-ide-e2e/src/tests/solidityUnittests.spec.ts index b87e08c34c..067cf17b5d 100644 --- a/apps/remix-ide-e2e/src/tests/solidityUnittests.spec.ts +++ b/apps/remix-ide-e2e/src/tests/solidityUnittests.spec.ts @@ -253,7 +253,7 @@ module.exports = { .waitForElementContainsText('*[data-id="functionPanel"]', 'vote(proposal)', 60000) .pause(2000) // Should be uncommented while fixing https://github.com/ethereum/remix-project/issues/1644 - .checkVariableDebug('soliditylocals', locals) + // .checkVariableDebug('soliditylocals', locals) .clickLaunchIcon('filePanel') .pause(2000) .openFile('tests/ballotFailedDebug_test.sol') @@ -558,7 +558,7 @@ const sources = [ } } ] - +/* const locals = { sender: { value: { @@ -586,3 +586,4 @@ const locals = { type: 'uint256' } } +*/ diff --git a/libs/remix-lib/src/web3Provider/web3VmProvider.ts b/libs/remix-lib/src/web3Provider/web3VmProvider.ts index 76d9eb9f01..a431507687 100644 --- a/libs/remix-lib/src/web3Provider/web3VmProvider.ts +++ b/libs/remix-lib/src/web3Provider/web3VmProvider.ts @@ -132,8 +132,8 @@ export class Web3VmProvider { // dumpStorage throws error as 'Missing Node in DB' // This can be uncommented once that error is handled // https://github.com/ethereum/remix-project/issues/1644 - const storage = await this.vm.stateManager.dumpStorage(data.to) - // const storage = {} + // const storage = await this.vm.stateManager.dumpStorage(data.to) + const storage = {} this.storageCache[this.processingHash][tx['to']] = storage this.lastProcessedStorageTxHash[tx['to']] = this.processingHash } catch (e) { @@ -252,8 +252,8 @@ export class Web3VmProvider { // dumpStorage throws error as 'Missing Node in DB' // This can be uncommented once that error is handled // https://github.com/ethereum/remix-project/issues/1644 - const storage = await this.vm.stateManager.dumpStorage(account) - // const storage = {} + // const storage = await this.vm.stateManager.dumpStorage(account) + const storage = {} this.storageCache[this.processingHash][this.processingAddress] = storage this.lastProcessedStorageTxHash[this.processingAddress] = this.processingHash } catch (e) { diff --git a/libs/remix-simulator/test/blocks.ts b/libs/remix-simulator/test/blocks.ts index 9ef7df7537..b26849b928 100644 --- a/libs/remix-simulator/test/blocks.ts +++ b/libs/remix-simulator/test/blocks.ts @@ -115,7 +115,7 @@ describe('blocks', () => { assert.deepEqual(numberTransactions, correctBlock.uncles.length) }) }) - +/* describe('eth_getStorageAt', () => { it('should get storage at position at given address', async () => { const abi: any = [ @@ -222,7 +222,7 @@ describe('blocks', () => { assert.deepEqual(storage, '0xc8') }) }) - +*/ describe('eth_call', () => { it('should get a value', async () => { const abi: any = [