Merge pull request #718 from ethereum/fixTreeView

Save keyPath for reference and not key

remix-debugger/src/ui/TreeView.js

@@ -77,32 +77,32 @@ class TreeView {
 
   formatData (key, data, children, expand, keyPath) {
     var self = this
-    var li = yo`<li key=${key} class=${css.li_tv}></li>`
+    var li = yo`<li key=${keyPath} class=${css.li_tv}></li>`
     var caret = yo`<div class="fa fa-caret-right caret ${css.caret_tv}"></div>`
     var label = yo`
-      <div key=${key} class=${css.label_tv}>
+      <div key=${keyPath} class=${css.label_tv}>
         ${caret}
         <span>${self.formatSelf(key, data, li)}</span>
       </div>`
     li.appendChild(label)
     if (data.children) {
-      var list = yo`<ul key=${key} class=${css.ul_tv}>${children}</ul>`
+      var list = yo`<ul key=${keyPath} class=${css.ul_tv}>${children}</ul>`
       list.style.display = 'none'
       caret.className = list.style.display === 'none' ? `fa fa-caret-right caret ${css.caret_tv}` : `fa fa-caret-down caret ${css.caret_tv}`
       label.onclick = function () {
         self.expand(keyPath)
       }
       label.oncontextmenu = function (event) {
-        self.event.trigger('nodeRightClick', [key, data, label, event])
+        self.event.trigger('nodeRightClick', [keyPath, data, label, event])
       }
       li.appendChild(list)
     } else {
       caret.style.visibility = 'hidden'
       label.oncontextmenu = function (event) {
-        self.event.trigger('leafRightClick', [key, data, label, event])
+        self.event.trigger('leafRightClick', [keyPath, data, label, event])
       }
       label.onclick = function (event) {
-        self.event.trigger('leafClick', [key, data, label, event])
+        self.event.trigger('leafClick', [keyPath, data, label, event])
       }
     }
     return li

remix-lib/test/txFormat.js

@@ -12,7 +12,7 @@ tape('ContractParameters - (TxFormat.buildData) - format input parameters', func
   var contract = output.contracts['test.sol']['uintContractTest']
   var udapp = { runTx: () => {} } // fake
   context = { output, contract, udapp }
-  var bytecode = '6060604052341561000f57600080fd5b6101058061001e6000396000f300606060405260043610603f576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680634b521953146044575b600080fd5b3415604e57600080fd5b608a600480803590602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050608c565b005b8260008190555081600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505050505600a165627a7a72305820e2f31aca91b90c01fe46fd2de5b3788ba02f577f9858e6aae48800e29db122670029'
+  var bytecode = '6060604052341561000f57600080fd5b6101058061001e6000396000f300606060405260043610603f576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680634b521953146044575b600080fd5b3415604e57600080fd5b608a600480803590602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050608c565b005b8260008190555081600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505050505600a165627a7a72305820d05e3789952dfb3ba575bcb79da62b6e259adbf498ea909031a42b647f7bceb30029'
   t.test('(TxFormat.buildData)', function (st) {
     st.plan(3)
     testWithInput(st, '123123, "0xf7a10e525d4b168f45f74db1b61f63d3e7619ea8", "34"', bytecode + '000000000000000000000000000000000000000000000000000000000001e0f3000000000000000000000000f7a10e525d4b168f45f74db1b61f63d3e7619ea80000000000000000000000000000000000000000000000000000000000000022')

remix-solidity/test/decoder/vmCall.js

@@ -52,6 +52,7 @@ function initVM (st, privateKey) {
       st.fail(mes)
     } else {
       remixLib.global.web3 = obj
+      remixLib.global.web3Debug = obj
     }
   })
   return vm