Merge pull request ethereum#1291 from ethereum/fixAddFromToEvent

[Browser Test] add "from" in event result
doradaqi · May 1, 2018 · 3b06d67 · 3b06d67
2 parents 28b6613 + f379560
commit 3b06d67
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -26,10 +26,10 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - dep-bundle-10-{{ checksum "package.json" }}
+            - dep-bundle-11-{{ checksum "package.json" }}
       - run: npm install
       - save_cache:
-          key: dep-bundle-10-{{ checksum "package.json" }}
+          key: dep-bundle-11-{{ checksum "package.json" }}
           paths:
             - ~/repo/node_modules
       - run: npm run lint && npm run test && npm run downloadsolc && npm run make-mock-compiler && npm run build

diff --git a/test-browser/tests/compiling.js b/test-browser/tests/compiling.js
@@ -125,7 +125,8 @@ function testInputValues (browser, callback) {
  "1": "bytes8[4]: _b8ret 0x1234000000000000,0x1234000000000000,0x1234000000000000,0x1234000000000000"
 }`, `[
  {
-  "topic": "d30981760edbf605bda8689e945f622877f230c9a77cbfbd448aa4b7d8ac6e7f",
+  "from": "0x8c1ed7e19abaa9f23c476da86dc1577f1ef401f5", 
+  "topic": "0xd30981760edbf605bda8689e945f622877f230c9a77cbfbd448aa4b7d8ac6e7f",
   "event": "event1",
   "args": {
    "0": "-123",