From 8ccdadb2fafb7b881364ab0f098d61e15b081ea6 Mon Sep 17 00:00:00 2001
From: "Dr. Sergey Pogodin" <dr.pogodin@gmail.com>
Date: Tue, 12 Jun 2018 22:58:38 +0200
Subject: [PATCH] Update of expected test results for `nonascii.sol` test

Fix for #244
---
 .circleci/config.yml                          |   8 +-
 tests/testdata/inputs/nonascii.sol.o          |   1 +
 .../outputs_expected/nonascii.sol.o.easm      | 167 ++++++++++++++++++
 .../nonascii.sol.o.graph.html                 |  56 ++++++
 .../outputs_expected/nonascii.sol.o.json      |   1 +
 .../outputs_expected/nonascii.sol.o.markdown  |   3 +
 .../outputs_expected/nonascii.sol.o.text      |   1 +
 7 files changed, 233 insertions(+), 4 deletions(-)
 create mode 100644 tests/testdata/inputs/nonascii.sol.o
 create mode 100644 tests/testdata/outputs_expected/nonascii.sol.o.easm
 create mode 100644 tests/testdata/outputs_expected/nonascii.sol.o.graph.html
 create mode 100644 tests/testdata/outputs_expected/nonascii.sol.o.json
 create mode 100644 tests/testdata/outputs_expected/nonascii.sol.o.markdown
 create mode 100644 tests/testdata/outputs_expected/nonascii.sol.o.text

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f79a9ea7..df975e54 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -24,8 +24,8 @@ jobs:
           command: tox -vv --notest
           working_directory: /home/mythril
           environment:
-            LC_ALL: C.UTF-8
-            LANG: C.UTF-8
+            LC_ALL: en_US.ASCII
+            LANG: en_US.ASCII
 
       - save_cache:
           key: tox-env-{{ checksum "/home/mythril/setup.py" }}
@@ -43,8 +43,8 @@ jobs:
           command: tox
           working_directory: /home/mythril
           environment:
-            LC_ALL: C.UTF-8
-            LANG: C.UTF-8
+            LC_ALL: en_US.ASCII
+            LANG: en_US.ASCII
 
       - store_test_results:
           path: /home/mythril/.tox/output
diff --git a/tests/testdata/inputs/nonascii.sol.o b/tests/testdata/inputs/nonascii.sol.o
new file mode 100644
index 00000000..5e142cfe
--- /dev/null
+++ b/tests/testdata/inputs/nonascii.sol.o
@@ -0,0 +1 @@
+608060405260043610610041576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806324ff38a214610046575b600080fd5b34801561005257600080fd5b5061005b6100d6565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561009b578082015181840152602081019050610080565b50505050905090810190601f1680156100c85780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b60606040805190810160405280601781526020017fd0a5d18dd0bbd0bbd0bed18320d092d0bed180d0bbd0b40000000000000000008152509050905600a165627a7a72305820a11284868fc6a38ff1d72ce9ec40db9c6c7c49902b5cabec3680e88e5ab92dcb0029
\ No newline at end of file
diff --git a/tests/testdata/outputs_expected/nonascii.sol.o.easm b/tests/testdata/outputs_expected/nonascii.sol.o.easm
new file mode 100644
index 00000000..555d5ba3
--- /dev/null
+++ b/tests/testdata/outputs_expected/nonascii.sol.o.easm
@@ -0,0 +1,167 @@
+0 PUSH1 0x80
+2 PUSH1 0x40
+4 MSTORE
+5 PUSH1 0x04
+7 CALLDATASIZE
+8 LT
+9 PUSH2 0x0041
+12 JUMPI
+13 PUSH1 0x00
+15 CALLDATALOAD
+16 PUSH29 0x0100000000000000000000000000000000000000000000000000000000
+46 SWAP1
+47 DIV
+48 PUSH4 0xffffffff
+53 AND
+54 DUP1
+55 PUSH4 0x24ff38a2
+60 EQ
+61 PUSH2 0x0046
+64 JUMPI
+65 JUMPDEST
+66 PUSH1 0x00
+68 DUP1
+69 REVERT
+70 JUMPDEST
+71 CALLVALUE
+72 DUP1
+73 ISZERO
+74 PUSH2 0x0052
+77 JUMPI
+78 PUSH1 0x00
+80 DUP1
+81 REVERT
+82 JUMPDEST
+83 POP
+84 PUSH2 0x005b
+87 PUSH2 0x00d6
+90 JUMP
+91 JUMPDEST
+92 PUSH1 0x40
+94 MLOAD
+95 DUP1
+96 DUP1
+97 PUSH1 0x20
+99 ADD
+100 DUP3
+101 DUP2
+102 SUB
+103 DUP3
+104 MSTORE
+105 DUP4
+106 DUP2
+107 DUP2
+108 MLOAD
+109 DUP2
+110 MSTORE
+111 PUSH1 0x20
+113 ADD
+114 SWAP2
+115 POP
+116 DUP1
+117 MLOAD
+118 SWAP1
+119 PUSH1 0x20
+121 ADD
+122 SWAP1
+123 DUP1
+124 DUP4
+125 DUP4
+126 PUSH1 0x00
+128 JUMPDEST
+129 DUP4
+130 DUP2
+131 LT
+132 ISZERO
+133 PUSH2 0x009b
+136 JUMPI
+137 DUP1
+138 DUP3
+139 ADD
+140 MLOAD
+141 DUP2
+142 DUP5
+143 ADD
+144 MSTORE
+145 PUSH1 0x20
+147 DUP2
+148 ADD
+149 SWAP1
+150 POP
+151 PUSH2 0x0080
+154 JUMP
+155 JUMPDEST
+156 POP
+157 POP
+158 POP
+159 POP
+160 SWAP1
+161 POP
+162 SWAP1
+163 DUP2
+164 ADD
+165 SWAP1
+166 PUSH1 0x1f
+168 AND
+169 DUP1
+170 ISZERO
+171 PUSH2 0x00c8
+174 JUMPI
+175 DUP1
+176 DUP3
+177 SUB
+178 DUP1
+179 MLOAD
+180 PUSH1 0x01
+182 DUP4
+183 PUSH1 0x20
+185 SUB
+186 PUSH2 0x0100
+189 EXP
+190 SUB
+191 NOT
+192 AND
+193 DUP2
+194 MSTORE
+195 PUSH1 0x20
+197 ADD
+198 SWAP2
+199 POP
+200 JUMPDEST
+201 POP
+202 SWAP3
+203 POP
+204 POP
+205 POP
+206 PUSH1 0x40
+208 MLOAD
+209 DUP1
+210 SWAP2
+211 SUB
+212 SWAP1
+213 RETURN
+214 JUMPDEST
+215 PUSH1 0x60
+217 PUSH1 0x40
+219 DUP1
+220 MLOAD
+221 SWAP1
+222 DUP2
+223 ADD
+224 PUSH1 0x40
+226 MSTORE
+227 DUP1
+228 PUSH1 0x17
+230 DUP2
+231 MSTORE
+232 PUSH1 0x20
+234 ADD
+235 PUSH32 0xd0a5d18dd0bbd0bbd0bed18320d092d0bed180d0bbd0b4000000000000000000
+268 DUP2
+269 MSTORE
+270 POP
+271 SWAP1
+272 POP
+273 SWAP1
+274 JUMP
+275 STOP
diff --git a/tests/testdata/outputs_expected/nonascii.sol.o.graph.html b/tests/testdata/outputs_expected/nonascii.sol.o.graph.html
new file mode 100644
index 00000000..51ce8e60
--- /dev/null
+++ b/tests/testdata/outputs_expected/nonascii.sol.o.graph.html
@@ -0,0 +1,56 @@
+<html>
+<head>
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.min.css" integrity="sha256-iq5ygGJ7021Pi7H5S+QAUXCPUfaBzfqeplbg/KlEssg=" crossorigin="anonymous" />
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.min.js" integrity="sha256-JuQeAGbk9rG/EoRMixuy5X8syzICcvB0dj3KindZkY0=" crossorigin="anonymous"></script>
+
+    
+    <style type="text/css">
+        #mynetwork {
+            background-color: #232625;
+        }
+        body {
+            background-color: #232625;
+            color: #ffffff;
+            font-size: 10px;
+        }
+    </style>
+    
+
+    <script>
+        var options = {"autoResize": true, "edges": {"font": {"align": "horizontal", "background": "none", "color": "#FFFFFF", "face": "arial", "multi": false, "strokeColor": "#ffffff", "strokeWidth": 0, "vadjust": 0}}, "height": "100%", "layout": {"hierarchical": {"blockShifting": true, "direction": "LR", "edgeMinimization": true, "enabled": true, "levelSeparation": 450, "nodeSpacing": 200, "parentCentralization": false, "sortMethod": "directed", "treeSpacing": 100}, "improvedLayout": true}, "manipulation": false, "nodes": {"borderWidth": 1, "borderWidthSelected": 2, "chosen": true, "color": "#000000", "font": {"align": "left", "color": "#FFFFFF"}, "shape": "box"}, "physics": {"enabled": false}, "width": "100%"};
+        var nodes = [{"color": {"background": "#2f7e5b", "border": "#26996f", "highlight": {"background": "#28a16f", "border": "#26996f"}}, "fullLabel": "65 JUMPDEST\n66 PUSH1 0x00\n68 DUP1\n69 REVERT", "id": "239", "isExpanded": false, "label": "65 JUMPDEST\n66 PUSH1 0x00\n68 DUP1\n69 REVERT", "size": 150, "truncLabel": "65 JUMPDEST\n66 PUSH1 0x00\n68 DUP1\n69 REVERT"}, {"color": {"background": "#2f7e5b", "border": "#26996f", "highlight": {"background": "#28a16f", "border": "#26996f"}}, "fullLabel": "175 DUP1\n176 DUP3\n177 SUB\n178 DUP1\n179 MLOAD\n180 PUSH1 0x01\n182 DUP4\n183 PUSH1 0x20\n185 SUB\n186 PUSH2 0x0100\n189 EXP\n190 SUB\n191 NOT\n192 AND\n193 DUP2\n194 MSTORE\n195 PUSH1 0x20\n197 ADD\n198 SWAP2\n199 POP\n200 JUMPDEST\n201 POP\n202 SWAP3\n203 POP\n204 POP\n205 POP\n206 PUSH1 0x40\n208 MLOAD\n209 DUP1\n210 SWAP2\n211 SUB\n212 SWAP1\n213 RETURN", "id": "248", "isExpanded": false, "label": "175 DUP1\n176 DUP3\n177 SUB\n178 DUP1\n179 MLOAD\n180 PUSH1 0x01\n(click to expand +)", "size": 150, "truncLabel": "175 DUP1\n176 DUP3\n177 SUB\n178 DUP1\n179 MLOAD\n180 PUSH1 0x01\n(click to expand +)"}, {"color": {"background": "#2f7e5b", "border": "#26996f", "highlight": {"background": "#28a16f", "border": "#26996f"}}, "fullLabel": "155 JUMPDEST\n156 POP\n157 POP\n158 POP\n159 POP\n160 SWAP1\n161 POP\n162 SWAP1\n163 DUP2\n164 ADD\n165 SWAP1\n166 PUSH1 0x1f\n168 AND\n169 DUP1\n170 ISZERO\n171 PUSH2 0x00c8\n174 JUMPI", "id": "247", "isExpanded": false, "label": "155 JUMPDEST\n156 POP\n157 POP\n158 POP\n159 POP\n160 SWAP1\n(click to expand +)", "size": 150, "truncLabel": "155 JUMPDEST\n156 POP\n157 POP\n158 POP\n159 POP\n160 SWAP1\n(click to expand +)"}, {"color": {"background": "#2f7e5b", "border": "#26996f", "highlight": {"background": "#28a16f", "border": "#26996f"}}, "fullLabel": "128 JUMPDEST\n129 DUP4\n130 DUP2\n131 LT\n132 ISZERO\n133 PUSH2 0x009b\n136 JUMPI", "id": "246", "isExpanded": false, "label": "128 JUMPDEST\n129 DUP4\n130 DUP2\n131 LT\n132 ISZERO\n133 PUSH2 0x009b\n(click to expand +)", "size": 150, "truncLabel": "128 JUMPDEST\n129 DUP4\n130 DUP2\n131 LT\n132 ISZERO\n133 PUSH2 0x009b\n(click to expand +)"}, {"color": {"background": "#2f7e5b", "border": "#26996f", "highlight": {"background": "#28a16f", "border": "#26996f"}}, "fullLabel": "137 DUP1\n138 DUP3\n139 ADD\n140 MLOAD\n141 DUP2\n142 DUP5\n143 ADD\n144 MSTORE\n145 PUSH1 0x20\n147 DUP2\n148 ADD\n149 SWAP1\n150 POP\n151 PUSH2 0x0080\n154 JUMP", "id": "245", "isExpanded": false, "label": "137 DUP1\n138 DUP3\n139 ADD\n140 MLOAD\n141 DUP2\n142 DUP5\n(click to expand +)", "size": 150, "truncLabel": "137 DUP1\n138 DUP3\n139 ADD\n140 MLOAD\n141 DUP2\n142 DUP5\n(click to expand +)"}, {"color": {"background": "#2f7e5b", "border": "#26996f", "highlight": {"background": "#28a16f", "border": "#26996f"}}, "fullLabel": "91 JUMPDEST\n92 PUSH1 0x40\n94 MLOAD\n95 DUP1\n96 DUP1\n97 PUSH1 0x20\n99 ADD\n100 DUP3\n101 DUP2\n102 SUB\n103 DUP3\n104 MSTORE\n105 DUP4\n106 DUP2\n107 DUP2\n108 MLOAD\n109 DUP2\n110 MSTORE\n111 PUSH1 0x20\n113 ADD\n114 SWAP2\n115 POP\n116 DUP1\n117 MLOAD\n118 SWAP1\n119 PUSH1 0x20\n121 ADD\n122 SWAP1\n123 DUP1\n124 DUP4\n125 DUP4\n126 PUSH1 0x00\n128 JUMPDEST\n129 DUP4\n130 DUP2\n131 LT\n132 ISZERO\n133 PUSH2 0x009b\n136 JUMPI", "id": "244", "isExpanded": false, "label": "91 JUMPDEST\n92 PUSH1 0x40\n94 MLOAD\n95 DUP1\n96 DUP1\n97 PUSH1 0x20\n(click to expand +)", "size": 150, "truncLabel": "91 JUMPDEST\n92 PUSH1 0x40\n94 MLOAD\n95 DUP1\n96 DUP1\n97 PUSH1 0x20\n(click to expand +)"}, {"color": {"background": "#2f7e5b", "border": "#26996f", "highlight": {"background": "#28a16f", "border": "#26996f"}}, "fullLabel": "214 JUMPDEST\n215 PUSH1 0x60\n217 PUSH1 0x40\n219 DUP1\n220 MLOAD\n221 SWAP1\n222 DUP2\n223 ADD\n224 PUSH1 0x40\n226 MSTORE\n227 DUP1\n228 PUSH1 0x17\n230 DUP2\n231 MSTORE\n232 PUSH1 0x20\n234 ADD\n235 PUSH32 0xd0a5d18d(...)\n268 DUP2\n269 MSTORE\n270 POP\n271 SWAP1\n272 POP\n273 SWAP1\n274 JUMP", "id": "243", "isExpanded": false, "label": "214 JUMPDEST\n215 PUSH1 0x60\n217 PUSH1 0x40\n219 DUP1\n220 MLOAD\n221 SWAP1\n(click to expand +)", "size": 150, "truncLabel": "214 JUMPDEST\n215 PUSH1 0x60\n217 PUSH1 0x40\n219 DUP1\n220 MLOAD\n221 SWAP1\n(click to expand +)"}, {"color": {"background": "#2f7e5b", "border": "#26996f", "highlight": {"background": "#28a16f", "border": "#26996f"}}, "fullLabel": "82 JUMPDEST\n83 POP\n84 PUSH2 0x005b\n87 PUSH2 0x00d6\n90 JUMP", "id": "242", "isExpanded": false, "label": "82 JUMPDEST\n83 POP\n84 PUSH2 0x005b\n87 PUSH2 0x00d6\n90 JUMP", "size": 150, "truncLabel": "82 JUMPDEST\n83 POP\n84 PUSH2 0x005b\n87 PUSH2 0x00d6\n90 JUMP"}, {"color": {"background": "#2f7e5b", "border": "#26996f", "highlight": {"background": "#28a16f", "border": "#26996f"}}, "fullLabel": "78 PUSH1 0x00\n80 DUP1\n81 REVERT", "id": "249", "isExpanded": false, "label": "78 PUSH1 0x00\n80 DUP1\n81 REVERT", "size": 150, "truncLabel": "78 PUSH1 0x00\n80 DUP1\n81 REVERT"}, {"color": {"background": "#2f7e5b", "border": "#26996f", "highlight": {"background": "#28a16f", "border": "#26996f"}}, "fullLabel": "_function_0x24ff38a2\n71 CALLVALUE\n72 DUP1\n73 ISZERO\n74 PUSH2 0x0052\n77 JUMPI", "id": "241", "isExpanded": false, "label": "_function_0x24ff38a2\n71 CALLVALUE\n72 DUP1\n73 ISZERO\n74 PUSH2 0x0052\n77 JUMPI", "size": 150, "truncLabel": "_function_0x24ff38a2\n71 CALLVALUE\n72 DUP1\n73 ISZERO\n74 PUSH2 0x0052\n77 JUMPI"}, {"color": {"background": "#2f7e5b", "border": "#26996f", "highlight": {"background": "#28a16f", "border": "#26996f"}}, "fullLabel": "65 JUMPDEST\n66 PUSH1 0x00\n68 DUP1\n69 REVERT", "id": "250", "isExpanded": false, "label": "65 JUMPDEST\n66 PUSH1 0x00\n68 DUP1\n69 REVERT", "size": 150, "truncLabel": "65 JUMPDEST\n66 PUSH1 0x00\n68 DUP1\n69 REVERT"}, {"color": {"background": "#2f7e5b", "border": "#26996f", "highlight": {"background": "#28a16f", "border": "#26996f"}}, "fullLabel": "13 PUSH1 0x00\n15 CALLDATALOAD\n16 PUSH29 0x01000000(...)\n46 SWAP1\n47 DIV\n48 PUSH4 0xffffffff\n53 AND\n54 DUP1\n55 PUSH4 0x24ff38a2\n60 EQ\n61 PUSH2 0x0046\n64 JUMPI", "id": "240", "isExpanded": false, "label": "13 PUSH1 0x00\n15 CALLDATALOAD\n16 PUSH29 0x01000000(...)\n46 SWAP1\n47 DIV\n48 PUSH4 0xffffffff\n(click to expand +)", "size": 150, "truncLabel": "13 PUSH1 0x00\n15 CALLDATALOAD\n16 PUSH29 0x01000000(...)\n46 SWAP1\n47 DIV\n48 PUSH4 0xffffffff\n(click to expand +)"}, {"color": {"background": "#2f7e5b", "border": "#26996f", "highlight": {"background": "#28a16f", "border": "#26996f"}}, "fullLabel": "0 PUSH1 0x80\n2 PUSH1 0x40\n4 MSTORE\n5 PUSH1 0x04\n7 CALLDATASIZE\n8 LT\n9 PUSH2 0x0041\n12 JUMPI", "id": "238", "isExpanded": false, "label": "0 PUSH1 0x80\n2 PUSH1 0x40\n4 MSTORE\n5 PUSH1 0x04\n7 CALLDATASIZE\n8 LT\n(click to expand +)", "size": 150, "truncLabel": "0 PUSH1 0x80\n2 PUSH1 0x40\n4 MSTORE\n5 PUSH1 0x04\n7 CALLDATASIZE\n8 LT\n(click to expand +)"}];
+        var edges = [{"arrows": "to", "from": "238", "label": "Not(ULE(4, calldatasize_Unknown))", "smooth": {"type": "cubicBezier"}, "to": "239"}, {"arrows": "to", "from": "247", "label": "True", "smooth": {"type": "cubicBezier"}, "to": "248"}, {"arrows": "to", "from": "246", "label": "True", "smooth": {"type": "cubicBezier"}, "to": "247"}, {"arrows": "to", "from": "245", "label": "", "smooth": {"type": "cubicBezier"}, "to": "246"}, {"arrows": "to", "from": "244", "label": "True", "smooth": {"type": "cubicBezier"}, "to": "245"}, {"arrows": "to", "from": "243", "label": "", "smooth": {"type": "cubicBezier"}, "to": "244"}, {"arrows": "to", "from": "242", "label": "", "smooth": {"type": "cubicBezier"}, "to": "243"}, {"arrows": "to", "from": "241", "label": "callvalue == 0", "smooth": {"type": "cubicBezier"}, "to": "242"}, {"arrows": "to", "from": "241", "label": "Not(callvalue == 0)", "smooth": {"type": "cubicBezier"}, "to": "249"}, {"arrows": "to", "from": "240", "label": "Extract(0xff, 0xe0, calldata_Unknown_0) == 0x24ff38a2", "smooth": {"type": "cubicBezier"}, "to": "241"}, {"arrows": "to", "from": "240", "label": "Not(Extract(0xff, 0xe0, calldata_Unknown_0) == 0x24ff38a2)", "smooth": {"type": "cubicBezier"}, "to": "250"}, {"arrows": "to", "from": "238", "label": "ULE(4, calldatasize_Unknown)", "smooth": {"type": "cubicBezier"}, "to": "240"}];
+    </script>
+</head>
+<body>
+<p>Mythril / Ethereum LASER Symbolic VM</p>
+<p><div id="mynetwork"></div><br/></p>
+<script type="text/javascript">
+    var container = document.getElementById('mynetwork');
+
+    var nodesSet = new vis.DataSet(nodes);
+    var edgesSet = new vis.DataSet(edges);
+    var data = {'nodes': nodesSet, 'edges': edgesSet}
+
+    var gph = new vis.Network(container, data, options);
+    gph.on("click", function (params) {
+        // parse node id
+        var nodeID = params['nodes']['0'];
+        if (nodeID) {
+            var clickedNode = nodesSet.get(nodeID);
+
+            if(clickedNode.isExpanded) {
+                clickedNode.label = clickedNode.truncLabel;
+            }
+            else {
+                clickedNode.label = clickedNode.fullLabel;
+            }
+
+            clickedNode.isExpanded = !clickedNode.isExpanded;
+
+            nodesSet.update(clickedNode);
+        }
+    });
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/testdata/outputs_expected/nonascii.sol.o.json b/tests/testdata/outputs_expected/nonascii.sol.o.json
new file mode 100644
index 00000000..237b1c1e
--- /dev/null
+++ b/tests/testdata/outputs_expected/nonascii.sol.o.json
@@ -0,0 +1 @@
+{"error": null, "issues": [], "success": true}
\ No newline at end of file
diff --git a/tests/testdata/outputs_expected/nonascii.sol.o.markdown b/tests/testdata/outputs_expected/nonascii.sol.o.markdown
new file mode 100644
index 00000000..321484fd
--- /dev/null
+++ b/tests/testdata/outputs_expected/nonascii.sol.o.markdown
@@ -0,0 +1,3 @@
+# Analysis results for None
+
+The analysis was completed successfully. No issues were detected.
diff --git a/tests/testdata/outputs_expected/nonascii.sol.o.text b/tests/testdata/outputs_expected/nonascii.sol.o.text
new file mode 100644
index 00000000..729320d8
--- /dev/null
+++ b/tests/testdata/outputs_expected/nonascii.sol.o.text
@@ -0,0 +1 @@
+The analysis was completed successfully. No issues were detected.