From 518eaa86424be9fb1a3777e5b6c0eac5637f2c07 Mon Sep 17 00:00:00 2001
From: Iuri Matias <iuri.matias@gmail.com>
Date: Sun, 19 Jul 2020 11:15:10 -0400
Subject: [PATCH] refactor accumulateStorageChanges

---
 libs/remix-debug/src/storage/storageViewer.js |  8 +-------
 libs/remix-lib/src/trace/traceManager.js      |  5 ++---
 libs/remix-lib/test/traceManager.js           | 11 +++--------
 3 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/libs/remix-debug/src/storage/storageViewer.js b/libs/remix-debug/src/storage/storageViewer.js
index a5c9e80e42..206701a637 100644
--- a/libs/remix-debug/src/storage/storageViewer.js
+++ b/libs/remix-debug/src/storage/storageViewer.js
@@ -15,13 +15,7 @@ class StorageViewer {
     this.web3 = this.storageResolver.web3
     this.initialMappingsLocationPromise = null
     this.currentMappingsLocationPromise = null
-    _traceManager.accumulateStorageChanges(this.context.stepIndex, this.context.address, {}, (error, storageChanges) => {
-      if (!error) {
-        this.storageChanges = storageChanges
-      } else {
-        console.log(error)
-      }
-    })
+    this.storageChanges = _traceManager.accumulateStorageChanges(this.context.stepIndex, this.context.address, {})
   }
 
   /**
diff --git a/libs/remix-lib/src/trace/traceManager.js b/libs/remix-lib/src/trace/traceManager.js
index 0c30281b6f..8ecc2193e7 100644
--- a/libs/remix-lib/src/trace/traceManager.js
+++ b/libs/remix-lib/src/trace/traceManager.js
@@ -80,9 +80,8 @@ TraceManager.prototype.getLength = function (callback) {
   }
 }
 
-TraceManager.prototype.accumulateStorageChanges = function (index, address, storageOrigin, callback) {
-  const storage = this.traceCache.accumulateStorageChanges(index, address, storageOrigin)
-  callback(null, storage)
+TraceManager.prototype.accumulateStorageChanges = function (index, address, storageOrigin) {
+  return this.traceCache.accumulateStorageChanges(index, address, storageOrigin)
 }
 
 TraceManager.prototype.getAddresses = function (callback) {
diff --git a/libs/remix-lib/test/traceManager.js b/libs/remix-lib/test/traceManager.js
index 44e2705a19..6bec9d8231 100644
--- a/libs/remix-lib/test/traceManager.js
+++ b/libs/remix-lib/test/traceManager.js
@@ -55,14 +55,9 @@ tape('TraceManager', function (t) {
   })
 
   t.test('TraceManager.accumulateStorageChanges', function (st) {
-    traceManager.accumulateStorageChanges(110, '0x0d3a18d64dfe4f927832ab58d6451cecc4e517c5', {}, function (error, result) {
-      if (error) {
-        st.fail(error)
-      } else {
-        st.ok(result['0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563'].value === '0x38')
-        st.end()
-      }
-    })
+    const result = traceManager.accumulateStorageChanges(110, '0x0d3a18d64dfe4f927832ab58d6451cecc4e517c5', {})
+    st.ok(result['0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563'].value === '0x38')
+    st.end()
   })
 
   t.test('TraceManager.getCallData', function (st) {