From dc3b9224e3e5ca4d7cd5f328d04593d6e1e6d24d Mon Sep 17 00:00:00 2001 From: yann300 Date: Tue, 26 Sep 2017 12:49:44 +0200 Subject: [PATCH 1/3] fix test --- test/solidity/localsTests/int.js | 14 +++++++------- test/solidity/localsTests/structArray.js | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/solidity/localsTests/int.js b/test/solidity/localsTests/int.js index 797f306630..011aa2f6fc 100644 --- a/test/solidity/localsTests/int.js +++ b/test/solidity/localsTests/int.js @@ -32,12 +32,12 @@ module.exports = function (st, vm, privateKey, contractBytecode, compilationResu callTree.event.register('callTreeReady', (scopes, scopeStarts) => { try { st.equals(scopeStarts[0], '') - st.equals(scopeStarts[12], '1') - st.equals(scopeStarts[104], '2') - st.equals(scopeStarts[119], '2.1') - st.equals(scopeStarts[142], '3') - st.equals(scopeStarts[161], '4') - st.equals(scopeStarts[176], '4.1') + st.equals(scopeStarts[11], '1') + st.equals(scopeStarts[103], '2') + st.equals(scopeStarts[118], '2.1') + st.equals(scopeStarts[139], '3') + st.equals(scopeStarts[157], '4') + st.equals(scopeStarts[172], '4.1') st.equals(scopes[''].locals['ui8'].type.typeName, 'uint8') st.equals(scopes[''].locals['ui16'].type.typeName, 'uint16') st.equals(scopes[''].locals['ui32'].type.typeName, 'uint32') @@ -81,7 +81,7 @@ module.exports = function (st, vm, privateKey, contractBytecode, compilationResu st.equals(locals['ishrink'].value, '2') }) - helper.decodeLocals(st, 175, traceManager, callTree, function (locals) { + helper.decodeLocals(st, 171, traceManager, callTree, function (locals) { try { st.equals(locals['ui8'].value, '123') st.equals(Object.keys(locals).length, 1) diff --git a/test/solidity/localsTests/structArray.js b/test/solidity/localsTests/structArray.js index 8d733ebd21..0adfafa078 100644 --- a/test/solidity/localsTests/structArray.js +++ b/test/solidity/localsTests/structArray.js @@ -30,7 +30,7 @@ module.exports = function (st, vm, privateKey, contractBytecode, compilationResu st.fail(error) }) callTree.event.register('callTreeReady', (scopes, scopeStarts) => { - helper.decodeLocals(st, 2094, traceManager, callTree, function (locals) { + helper.decodeLocals(st, 2089, traceManager, callTree, function (locals) { try { st.equals(locals['bytesSimple'].length, '0x14') st.equals(locals['bytesSimple'].value, '0x746573745f7375706572') From 721dcd9c0b28561b6d35267ef27484a7f7d55cd7 Mon Sep 17 00:00:00 2001 From: yann300 Date: Tue, 26 Sep 2017 12:51:43 +0200 Subject: [PATCH 2/3] fix standard --- src/ui/styles/basicStyles.js | 30 ++++++++++---------- src/ui/styles/style-guide.js | 54 ++++++++++++++++++------------------ 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/ui/styles/basicStyles.js b/src/ui/styles/basicStyles.js index a74ae37a49..c824703d3f 100644 --- a/src/ui/styles/basicStyles.js +++ b/src/ui/styles/basicStyles.js @@ -65,20 +65,20 @@ module.exports = { 'margin-bottom': '10px' }, button: { - 'border-color' : 'transparent', - 'border-radius' : '3px', - 'border' : '.3px solid ${colors.veryLightGrey}', - 'cursor' : 'pointer', - 'min-height' : '25px', - 'max-height' : '25px', - 'padding' : '3px', - 'min-width' : '100px', - 'font-size' : '12px', - 'overflow' : 'hidden', - 'word-break' : 'normal', - 'background-color' : 'hsla(0, 0%, 40%, .2)', - 'color' : 'hsla(0, 0%, 40%, 1)', - 'margin' : '3px', - 'text-decoration' : 'none' + 'border-color': 'transparent', + 'border-radius': '3px', + 'border': '.3px solid ${colors.veryLightGrey}', + 'cursor': 'pointer', + 'min-height': '25px', + 'max-height': '25px', + 'padding': '3px', + 'min-width': '100px', + 'font-size': '12px', + 'overflow': 'hidden', + 'word-break': 'normal', + 'background-color': 'hsla(0, 0%, 40%, .2)', + 'color': 'hsla(0, 0%, 40%, 1)', + 'margin': '3px', + 'text-decoration': 'none' } } diff --git a/src/ui/styles/style-guide.js b/src/ui/styles/style-guide.js index d81cb6d31f..042788b6e7 100644 --- a/src/ui/styles/style-guide.js +++ b/src/ui/styles/style-guide.js @@ -1,4 +1,4 @@ -var csjs = require('csjs-inject') +// var csjs = require('csjs-inject') module.exports = styleGuide @@ -40,32 +40,32 @@ function styleGuide () { FONTS -------------------------------------------------------------------------- */ -var texts = { - 'title-XL': ` - font-size : 2em; - font-weight : 700; - letter-spacing : .05em; - `, - - 'title-L': ` - font-size : 1em; - font-weight : 600; - `, - - 'title-M': ` - font-size : 1em; - font-weight : 400; - `, - - 'title-S': ` - font-size : .8em; - font-weight : 300; - `, - - 'text': ` - font-size : .8em; - ` -} + var texts = { + 'title-XL': ` + font-size : 2em; + font-weight : 700; + letter-spacing : .05em; + `, + + 'title-L': ` + font-size : 1em; + font-weight : 600; + `, + + 'title-M': ` + font-size : 1em; + font-weight : 400; + `, + + 'title-S': ` + font-size : .8em; + font-weight : 300; + `, + + 'text': ` + font-size : .8em; + ` + } /* -------------------------------------------------------------------------- TEXT-BOXES From 02760d8e3c8b6e1a3bc78f35234d07d1b6de86fa Mon Sep 17 00:00:00 2001 From: yann300 Date: Tue, 26 Sep 2017 12:53:00 +0200 Subject: [PATCH 3/3] fail test if standard fail --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a1ddaa35c6..a79479db2f 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "start_dev": "npm-run-all -lpr serve watch onchange", "start_eth": "npm run warning_message; eth -j --rpccorsdomain '*'", "start_geth": "npm run warning_message; geth --rpc --rpcapi 'web3,eth,debug' --rpcport 8545 --rpccorsdomain '*'", - "test": "standard; tape ./test/tests.js", + "test": "standard && tape ./test/tests.js", "test-browser": "npm-run-all -lpr selenium serve waittest", "waittest": "sleep 5 && npm run nightwatch_local", "warning_message": "echo 'DO NOT DO THIS IF eth/geth STORES PRIVATE KEYS!! External system might be able to access your node through the RPC server.\n\n';",