From d3755d3d1a4dbc46d00c3c96860c094872509d90 Mon Sep 17 00:00:00 2001 From: ninabreznik Date: Wed, 14 Mar 2018 21:46:14 +0000 Subject: [PATCH] Update compiling.js tests --- contracts/folder1/contract_firefox_toremove.sol | 1 - ...ntract_firefox.sol => renamed_contract_firefox.sol} | 0 src/app/execution/txLogger.js | 10 ++++++---- test-browser/tests/compiling.js | 8 +------- 4 files changed, 7 insertions(+), 12 deletions(-) delete mode 100644 contracts/folder1/contract_firefox_toremove.sol rename contracts/folder1/{contract_firefox.sol => renamed_contract_firefox.sol} (100%) diff --git a/contracts/folder1/contract_firefox_toremove.sol b/contracts/folder1/contract_firefox_toremove.sol deleted file mode 100644 index 04f9b2eb26..0000000000 --- a/contracts/folder1/contract_firefox_toremove.sol +++ /dev/null @@ -1 +0,0 @@ -contract test2 { function get () returns (uint) { return 11; }} \ No newline at end of file diff --git a/contracts/folder1/contract_firefox.sol b/contracts/folder1/renamed_contract_firefox.sol similarity index 100% rename from contracts/folder1/contract_firefox.sol rename to contracts/folder1/renamed_contract_firefox.sol diff --git a/src/app/execution/txLogger.js b/src/app/execution/txLogger.js index 7571381feb..a7c9f8fbd0 100644 --- a/src/app/execution/txLogger.js +++ b/src/app/execution/txLogger.js @@ -17,6 +17,7 @@ var typeConversion = remixLib.execution.typeConversion var css = csjs` .log { display: flex; + justify-content: space-between; cursor: pointer; } .log:hover { @@ -34,7 +35,7 @@ var css = csjs` color: ${styles.terminal.icon_HoverColor_Menu}; } .txLog { - width: 95%; + width: 75%; } .txItem { color: ${styles.terminal.text_Primary}; @@ -50,7 +51,9 @@ var css = csjs` float: left; margin: 0 10px; } - .txTable, .tr, .td { + .txTable, + .tr, + .td { border-collapse: collapse; font-size: 10px; color: ${styles.terminal.text_Primary}; @@ -89,8 +92,7 @@ var css = csjs` } .debug:hover { opacity: 0.8; - } - ` + }` /** * This just export a function that register to `newTransaction` and forward them to the logger. * Emit debugRequested diff --git a/test-browser/tests/compiling.js b/test-browser/tests/compiling.js index 4148e2e1e5..4c74e2d1f2 100644 --- a/test-browser/tests/compiling.js +++ b/test-browser/tests/compiling.js @@ -73,13 +73,7 @@ function testReturnValues (browser, callback) { .testFunction('retunValues1 - transact (not payable)', '0x79dc928d149d2ade02ab610a8ae290636222d034d4adce0bb08a68401e3d1f7f', `[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" -}`) + null) .pause(500) .testFunction('retunValues2 - transact (not payable)', '0x09175dcb30227b3af422d75786dbba3b0549985e5c7f59f86d12c7e1043ccb8c',