refactor getContractCreationCode

libs/remix-lib/src/code/codeManager.js

@@ -63,12 +63,9 @@ CodeManager.prototype.getCode = function (address, cb) {
   if (codes) {
     return cb(null, codes)
   }
-  this.traceManager.getContractCreationCode(address, (error, hexCode) => {
+  const hexCode = this.traceManager.getContractCreationCode(address)
-    if (!error) {
+  codes = this.codeResolver.cacheExecutingCode(address, hexCode)
-      codes = this.codeResolver.cacheExecutingCode(address, hexCode)
+  cb(null, codes)
-      cb(null, codes)
-    }
-  })
 }
 
 /**

libs/remix-lib/src/trace/traceManager.js

@@ -163,12 +163,11 @@ TraceManager.prototype.getCurrentCalledAddressAt = function (stepIndex) {
   }
 }
 
-TraceManager.prototype.getContractCreationCode = function (token, callback) {
+TraceManager.prototype.getContractCreationCode = function (token) {
-  if (this.traceCache.contractCreation[token]) {
+  if (!this.traceCache.contractCreation[token]) {
-    callback(null, this.traceCache.contractCreation[token])
+    throw new Error('no contract creation named ' + token)
-  } else {
-    callback('no contract creation named ' + token, null)
   }
+  return this.traceCache.contractCreation[token]
 }
 
 TraceManager.prototype.getMemoryAt = function (stepIndex) {

libs/remix-lib/test/traceManager.js

@@ -167,15 +167,14 @@ tape('TraceManager', function (t) {
   })
 
   t.test('TraceManager.getContractCreationCode', function (st) { // contract code has been retrieved from the memory
-    traceManager.getContractCreationCode('(Contract Creation - Step 63)', function (error, result) {
+    try {
+      const result = traceManager.getContractCreationCode('(Contract Creation - Step 63)')
       console.log(result)
-      if (error) {
+      st.ok(result === '0x60606040526040516020806045833981016040528080519060200190919050505b806001016000600050819055505b50600a80603b6000396000f360606040526008565b00000000000000000000000000000000000000000000000000000000000000002d')
-        st.fail(error)
+      st.end()
-      } else {
+    } catch (error) {
-        st.ok(result === '0x60606040526040516020806045833981016040528080519060200190919050505b806001016000600050819055505b50600a80603b6000396000f360606040526008565b00000000000000000000000000000000000000000000000000000000000000002d')
+      st.fail(error)
-        st.end()
+    }
-      }
-    })
   })
 
   t.test('TraceManager.getMemoryAt', function (st) {