From 28db5983249d2b62d9c111ff391cf81677e9350f Mon Sep 17 00:00:00 2001 From: ninabreznik Date: Mon, 19 Feb 2018 20:24:25 +0000 Subject: [PATCH] Update contracts.js --- src/app/execution/txLogger.js | 2 +- test-browser/tests/compiling.js | 118 ++++++++++++++++---------------- 2 files changed, 61 insertions(+), 59 deletions(-) diff --git a/src/app/execution/txLogger.js b/src/app/execution/txLogger.js index 044bf9ebb5..288bdc019b 100644 --- a/src/app/execution/txLogger.js +++ b/src/app/execution/txLogger.js @@ -193,7 +193,7 @@ function renderKnownTransaction (self, data) { ${context(self, {from, to, data})}
-
[debug]
+
[debug]
diff --git a/test-browser/tests/compiling.js b/test-browser/tests/compiling.js index 91d4aa3719..45378f0b93 100644 --- a/test-browser/tests/compiling.js +++ b/test-browser/tests/compiling.js @@ -44,10 +44,10 @@ function testSimpleContract (browser, callback) { .click('#runTabView .instance div[class^="title"]') .testFunction('f - transact (not payable)', '0xa178c603400a184ce5fedbcfab392d9b77822f6ffa7facdec693aded214523bc', - `[vm]\nfrom:0xca3...a733c\nto:TestContract.f() 0x692...77b3a\nvalue:0 wei\ndata:0x5c1...4d2db\nlogs:0\nhash:0xa17...523bc`, null, + `[vm]\nfrom:0xca3...a733c\nto:TestContract.f() 0x692...77b3a\nvalue:0 wei\ndata:0x261...21ff0\nlogs:0\nhash:0xa17...523bc`, null, `{ - "0": "uint256: 8" -}`) + "0": "uint256: 8" + }`) .pause(500) .perform((client, done) => { contractHelper.useFilter(browser, '0x12332162e2e31397dc1e07ed0a1cf08f728e9b4487c6f9ed79d2f39410c92782', '', () => { @@ -56,12 +56,13 @@ function testSimpleContract (browser, callback) { }) .testFunction('g - transact (not payable)', '0xb1532162e2e31397dc1e07ed0a1cf08f728e9b4487c6f9ed79d2f39410c92781', - `[vm]\nfrom:0xca3...a733c\nto:TestContract.g() 0x692...77b3a\nvalue:0 wei\ndata:0x5c1...4d2db\nlogs:0\nhash:0xb15...92781`, null, `{ - "0": "uint256: 345", - "1": "string: comment_comment_", - "2": "bool: true", - "3": "uint256: 4" -}`).perform(() => { callback(null, browser) }) + `[vm]\nfrom:0xca3...a733c\nto:TestContract.g() 0x692...77b3a\nvalue:0 wei\ndata:0xe21...79b8e\nlogs:0\nhash:0xb15...92781`, null, + `{ + "0": "uint256: 345", + "1": "string: comment_comment_", + "2": "bool: true", + "3": "uint256: 4" + }`).perform(() => { callback(null, browser) }) }) } @@ -72,34 +73,35 @@ function testReturnValues (browser, callback) { .pause(500) .testFunction('retunValues1 - transact (not payable)', '0x79dc928d149d2ade02ab610a8ae290636222d034d4adce0bb08a68401e3d1f7f', - `[vm]\nfrom:0xca3...a733c\nto:testReturnValues.retunValues1() 0x5e7...26e9f\nvalue:0 wei\ndata:0x5c1...4d2db\nlogs:0\nhash:0x79d...d1f7f`, + `[vm]\nfrom:0xca3...a733c\nto:testReturnValues.retunValues1() 0x5e7...26e9f\nvalue:0 wei\ndata:0x9ed...59eb7\nlogs:0\nhash:0x79d...d1f7f`, null, `{ - "0": "bool: _b true", - "1": "uint256: _u 345", - "2": "int256: _i -345", - "3": "address: _a 0xca35b7d915458ef540ade6068dfe2f44e8fa733c" -}`) + "0": "bool: _b true", + "1": "uint256: _u 345", + "2": "int256: _i -345", + "3": "address: _a 0xca35b7d915458ef540ade6068dfe2f44e8fa733c" + }`) .pause(500) .testFunction('retunValues2 - transact (not payable)', '0x09175dcb30227b3af422d75786dbba3b0549985e5c7f59f86d12c7e1043ccb8c', - `[vm]\nfrom:0xca3...a733c\nto:testReturnValues.retunValues2() 0x5e7...26e9f\nvalue:0 wei\ndata:0x5c1...4d2db\nlogs:0\nhash:0x091...ccb8c`, null, `{ - "0": "bytes1: _b 0x12", - "1": "bytes2: _b2 0x1223", - "2": "bytes3: _b3 0x000000", - "3": "bytes: _blit 0x123498", - "4": "bytes5: _b5 0x0000043245", - "5": "bytes6: _b6 0x002345532532", - "6": "string: _str this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string", - "7": "bytes7: _b7 0x03252353253253", - "8": "bytes22: _b22 0x00000000000000000000325235235325325325235325", - "9": "bytes32: _b32 0x0000000000000000000000000000000000032523532532523532523532523532" -}`).pause(500).testFunction('retunValues3 - transact (not payable)', - '0x7faab07aeaafc8afe6bf283bb83be70c000dff381dec04e779354e354da14aff', - `[vm]\nfrom:0xca3...a733c\nto:testReturnValues.retunValues3() 0x5e7...26e9f\nvalue:0 wei\ndata:0x5c1...4d2db\nlogs:0\nhash:0x7fa...14aff`, null, `{ - "0": "uint8: _en 2", - "1": "int256[5][]: _a1 1,-45,-78,56,60, -1,42,334,-45455,-446, 1,10,-5435,45,-7" -}`).perform(() => { callback(null, browser) }) + `[vm]\nfrom:0xca3...a733c\nto:testReturnValues.retunValues2() 0x5e7...26e9f\nvalue:0 wei\ndata:0xf57...4036c\nlogs:0\nhash:0x091...ccb8c`, null, + `{ + "0": "bytes1: _b 0x12", + "1": "bytes2: _b2 0x1223", + "2": "bytes3: _b3 0x000000", + "3": "bytes: _blit 0x123498", + "4": "bytes5: _b5 0x0000043245", + "5": "bytes6: _b6 0x002345532532", + "6": "string: _str this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string", + "7": "bytes7: _b7 0x03252353253253", + "8": "bytes22: _b22 0x00000000000000000000325235235325325325235325", + "9": "bytes32: _b32 0x0000000000000000000000000000000000032523532532523532523532523532" + }`).pause(500).testFunction('retunValues3 - transact (not payable)', + '0x7faab07aeaafc8afe6bf283bb83be70c000dff381dec04e779354e354da14aff', + `[vm]\nfrom:0xca3...a733c\nto:testReturnValues.retunValues3() 0x5e7...26e9f\nvalue:0 wei\ndata:0x033...e0a7d\nlogs:0\nhash:0x7fa...14aff`, null, `{ + "0": "uint8: _en 2", + "1": "int256[5][]: _a1 1,-45,-78,56,60, -1,42,334,-45455,-446, 1,10,-5435,45,-7" + }`).perform(() => { callback(null, browser) }) }) } @@ -109,34 +111,34 @@ function testInputValues (browser, callback) { .click('#runTabView div[class^="create"]') .pause(500) .testFunction('inputValue1 - transact (not payable)', - '0x057d54e2f76f3993078ecf9e1b54a148def4520afc141a182293b3610bd3ce2e', - `[vm]\nfrom:0xca3...a733c\nto:test.inputValue1(uint256,int256,string) 0x8c1...401f5\nvalue:0 wei\ndata:0x5c1...4d2db\nlogs:0\nhash:0x057...3ce2e`, + '0x917a873d27d105213eaf5461e14780387ccceb66fed574f8432d1963917832ae', + `[vm]\nfrom:0xca3...a733c\nto:test.inputValue1(uint256,int256,string) 0x8c1...401f5\nvalue:0 wei\ndata:0xd69...00000\nlogs:0\nhash:0x917...832ae`, {types: 'uint256 _u, int256 _i, string _str', values: '"2343242", "-4324324", "string _ string _ string _ string _ string _ string _ string _ string _ string _ string _"'}, `{ - "0": "uint256: _uret 2343242", - "1": "int256: _iret -4324324", - "2": "string: _strret string _ string _ string _ string _ string _ string _ string _ string _ string _ string _" -}`).pause(500).testFunction('inputValue2 - transact (not payable)', - '0x057d54e2f76f3993078ecf9e1b54a148def4520afc141a182293b3610bd3ce2e', - `[vm]\nfrom:0xca3...a733c\nto:test.inputValue2(uint256[3],bytes8[4]) 0x8c1...401f5\nvalue:0 wei\ndata:0x5c1...4d2db\nlogs:0\nhash:0x057...3ce2e`, - {types: 'uint256[3] _n, bytes8[4] _b8', values: '[1,2,3], ["0x1234", "0x1234","0x1234","0x1234"]'}, - `{ - "0": "uint256[3]: _nret 1, 2, 3", - "1": "bytes8[4]: _b8ret 0x1234000000000000, 0x1234000000000000, 0x1234000000000000, 0x1234000000000000" -}`, `[ - { - "topic": "d30981760edbf605bda8689e945f622877f230c9a77cbfbd448aa4b7d8ac6e7f", - "event": "event1", - "args": [ - "-123", - "000000000000000000000000000000000000000000000000000000000000007b", - "9c22ff5f21f0b81b113e63f7db6da94fedef11b2119b4088b89664fb9a3cb658", - "0x00001234", - "test _ test _ test _ test test _ test test _ test test _ test test _ test test _ test test _ test " - ] - } -]`) - .perform(() => { callback(null, browser) }) + "0": "uint256: _uret 2343242", + "1": "int256: _iret -4324324", + "2": "string: _strret string _ string _ string _ string _ string _ string _ string _ string _ string _ string _" + }`).pause(500).testFunction('inputValue2 - transact (not payable)', + '0x487d09e244853bcb108b3a22cd6ee57b6431e50869619c9b918e9764fc16ef7f', + `[vm]\nfrom:0xca3...a733c\nto:test.inputValue2(uint256[3],bytes8[4]) 0x8c1...401f5\nvalue:0 wei\ndata:0x1b7...00000\nlogs:0\nhash:0x487...6ef7f`, + {types: 'uint256[3] _n, bytes8[4] _b8', values: '[1,2,3], ["0x1234", "0x1234","0x1234","0x1234"]'}, + `{ + "0": "uint256[3]: _nret 1, 2, 3", + "1": "bytes8[4]: _b8ret 0x1234000000000000, 0x1234000000000000, 0x1234000000000000, 0x1234000000000000" + }`, `[ + { + "topic": "d30981760edbf605bda8689e945f622877f230c9a77cbfbd448aa4b7d8ac6e7f", + "event": "event1", + "args": [ + "-123", + "000000000000000000000000000000000000000000000000000000000000007b", + "9c22ff5f21f0b81b113e63f7db6da94fedef11b2119b4088b89664fb9a3cb658", + "0x00001234", + "test _ test _ test _ test test _ test test _ test test _ test test _ test test _ test test _ test " + ] + } + ]`) + .perform(() => { callback(null, browser) }) }) }