refill GeneralStateTests/stTimeConsuming

ethereum · Sep 5, 2019 · a7e07da · a7e07da
1 parent f386934
commit a7e07da
Show file tree

Hide file tree

Showing 9 changed files with 28,472 additions and 28,176 deletions.
diff --git a/GeneralStateTests/stExample/add11.json b/GeneralStateTests/stExample/add11.json
@@ -2,11 +2,11 @@
     "add11" : {
         "_info" : {
             "comment" : "A test for (add 1 1) opcode result",
-            "filling-rpc-server" : "Geth-1.9.2-unstable-96ab8e15-20190730",
-            "filling-tool-version" : "retesteth-0.0.1+commit.c1488516.Linux.g++",
-            "lllcversion" : "Version: 0.5.0-develop.2018.11.9+commit.9709dfe0.Linux.g++",
+            "filling-rpc-server" : "Geth-1.9.4-unstable-67bfc930-20190904",
+            "filling-tool-version" : "retesteth-0.0.1+commit.2c0b0842.Linux.g++",
+            "lllcversion" : "Version: 0.5.12-develop.2019.9.4+commit.dd2c003a.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stExample/add11Filler.json",
-            "sourceHash" : "85075a3efd000a97048066c3c956a742bd812617ce53b19193ad41c859854e72"
+            "sourceHash" : "0d06bb2c94c4c2e66ca9a083fcd4d2760dd3434976f943b60b2c5855eecb75c1"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -24,15 +24,15 @@
                         "gas" : 0,
                         "value" : 0
                     },
-                    "hash" : "0x17454a767e5f04461256f3812ffca930443c04a47d05ce3f38940c4a14b8c479",
+                    "hash" : "0x6491ef5db3b9c170aab1460bad81429c2321174f6ce5e73d8bdde909f279015e",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ]
         },
         "pre" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
+                "code" : "0x600260010160005500",
                 "nonce" : "0x00",
                 "storage" : {
                 }

diff --git a/GeneralStateTests/stTimeConsuming/sstore_combinations_initial00.json b/GeneralStateTests/stTimeConsuming/sstore_combinations_initial00.json
diff --git a/...nsuming/sstore_combinations_initial0.json → ...suming/sstore_combinations_initial01.json b/...nsuming/sstore_combinations_initial0.json → ...suming/sstore_combinations_initial01.json
diff --git a/GeneralStateTests/stTimeConsuming/sstore_combinations_initial10.json b/GeneralStateTests/stTimeConsuming/sstore_combinations_initial10.json
diff --git a/...nsuming/sstore_combinations_initial1.json → ...suming/sstore_combinations_initial11.json b/...nsuming/sstore_combinations_initial1.json → ...suming/sstore_combinations_initial11.json
diff --git a/GeneralStateTests/stTimeConsuming/sstore_combinations_initial20.json b/GeneralStateTests/stTimeConsuming/sstore_combinations_initial20.json
diff --git a/...nsuming/sstore_combinations_initial2.json → ...suming/sstore_combinations_initial21.json b/...nsuming/sstore_combinations_initial2.json → ...suming/sstore_combinations_initial21.json
diff --git a/GeneralStateTests/stTimeConsuming/static_Call50000_sha256.json b/GeneralStateTests/stTimeConsuming/static_Call50000_sha256.json
@@ -2,9 +2,8 @@
     "static_Call50000_sha256" : {
         "_info" : {
             "comment" : "",
-            "filling-rpc-server" : "Geth-1.9.2-unstable-96ab8e15-20190730",
-            "filling-tool-version" : "retesteth-0.0.1+commit.c1488516.Linux.g++",
-            "lllcversion" : "Version: 0.5.0-develop.2018.11.9+commit.9709dfe0.Linux.g++",
+            "filledwith" : "testeth 1.7.0-alpha.1-41+commit.e4af4acd.dirty",
+            "lllcversion" : "Version: 0.5.0-develop.2019.9.5+commit.9709dfe0.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stTimeConsuming/static_Call50000_sha256Filler.json",
             "sourceHash" : "3d57a58e9385f7083fbcbc9d58e78025533bbdb4b6ca5b07b233cdcd98b4ec9f"
         },
@@ -19,21 +18,21 @@
         "post" : {
             "ConstantinopleFix" : [
                 {
+                    "hash" : "0xaf00fbc3ebd221608c528fe17d937e0fe5d2ba954bfc81e5e13167b21aeaa27d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
-                    "hash" : "0xaf00fbc3ebd221608c528fe17d937e0fe5d2ba954bfc81e5e13167b21aeaa27d",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
                 {
+                    "hash" : "0x8952830477bfcf66f7fdf134884f209728e591666336e55700f994e76b5b3b16",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
                         "value" : 0
                     },
-                    "hash" : "0x8952830477bfcf66f7fdf134884f209728e591666336e55700f994e76b5b3b16",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ]
@@ -48,7 +47,7 @@
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }

diff --git a/src/GeneralStateTestsFiller/stExample/add11Filler.json b/src/GeneralStateTestsFiller/stExample/add11Filler.json
@@ -33,9 +33,9 @@
                         "//comment" : "So unless the test doesn't really requrie it, don't check coinbase/miner address balance or sender balance in post section",
                         "balance" : "1000000000000100000",
                         "//comment" : "Byte Code example",
-                        "code" : "0x6001600101600055",
+                        "code" : "0x600160010160005500",                               
                         "storage" : {
-                            "0x00" : "0x02"
+                            "0x00" : "0x03"
                         }
                     },
                     "//comment" : "could be incomplete type. only balance field would be checked.",
@@ -66,7 +66,7 @@
                 "code" : "0x6001600101600055",
                 "//comment" : "LLL Code example. Use LLL with comments, so your tests would have transparent source logic.",
                 "//comment" : "If the LLL is to bit for .json use .yml test format for better sourcing of the contract",
-                "code" : "{ [[0]] (ADD 1 1) }",
+                "code" : "{ [[0]] (ADD 1 2) }",
                 "nonce" : "0",
                 "storage" : {
                 }