aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYoichi Hirai <i@yoichihirai.com>2017-06-26 23:52:01 +0800
committerYoichi Hirai <i@yoichihirai.com>2017-06-27 18:51:09 +0800
commitf975c7c0f684bd29fea0857b9c2e6dc344656cb8 (patch)
tree362b19cd4d6e63b8837b49a0dc32d32204be376e
parent45fdeabf2648482fa155358ead296faa4a0c94e3 (diff)
downloaddexon-tests-f975c7c0f684bd29fea0857b9c2e6dc344656cb8.tar
dexon-tests-f975c7c0f684bd29fea0857b9c2e6dc344656cb8.tar.gz
dexon-tests-f975c7c0f684bd29fea0857b9c2e6dc344656cb8.tar.bz2
dexon-tests-f975c7c0f684bd29fea0857b9c2e6dc344656cb8.tar.lz
dexon-tests-f975c7c0f684bd29fea0857b9c2e6dc344656cb8.tar.xz
dexon-tests-f975c7c0f684bd29fea0857b9c2e6dc344656cb8.tar.zst
dexon-tests-f975c7c0f684bd29fea0857b9c2e6dc344656cb8.zip
Fix a test that expected staticcall to return successfully even when SSTORE is attempted inside
-rw-r--r--GeneralStateTests/stStaticCall/static_callToDelCallOpCodeCheck.json17
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callToDelCallOpCodeCheckFiller.json4
2 files changed, 13 insertions, 8 deletions
diff --git a/GeneralStateTests/stStaticCall/static_callToDelCallOpCodeCheck.json b/GeneralStateTests/stStaticCall/static_callToDelCallOpCodeCheck.json
index 2e01063e7..6b19c3b97 100644
--- a/GeneralStateTests/stStaticCall/static_callToDelCallOpCodeCheck.json
+++ b/GeneralStateTests/stStaticCall/static_callToDelCallOpCodeCheck.json
@@ -1,5 +1,10 @@
{
"static_callToDelCallOpCodeCheck" : {
+ "_info" : {
+ "comment" : "",
+ "filledwith" : "cpp-1.3.0+commit.53be05a3.Linux.g++",
+ "source" : "/src/GeneralStateTestsFiller/stStaticCall/static_callToDelCallOpCodeCheckFiller.json"
+ },
"env" : {
"currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
@@ -11,7 +16,7 @@
"post" : {
"EIP150" : [
{
- "hash" : "0xf7dcb003a72d0ad885880b24e6241d85c890775d07269f2959bbd8514cd9b116",
+ "hash" : "0x4a05e190ca9b2aa6ea6bb26553943e38bc7d0fc5720214d0cede65006c02c5b3",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -21,7 +26,7 @@
],
"EIP158" : [
{
- "hash" : "0xf7dcb003a72d0ad885880b24e6241d85c890775d07269f2959bbd8514cd9b116",
+ "hash" : "0x4a05e190ca9b2aa6ea6bb26553943e38bc7d0fc5720214d0cede65006c02c5b3",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -31,7 +36,7 @@
],
"Frontier" : [
{
- "hash" : "0xf7dcb003a72d0ad885880b24e6241d85c890775d07269f2959bbd8514cd9b116",
+ "hash" : "0x4a05e190ca9b2aa6ea6bb26553943e38bc7d0fc5720214d0cede65006c02c5b3",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -41,7 +46,7 @@
],
"Homestead" : [
{
- "hash" : "0xf7dcb003a72d0ad885880b24e6241d85c890775d07269f2959bbd8514cd9b116",
+ "hash" : "0x4a05e190ca9b2aa6ea6bb26553943e38bc7d0fc5720214d0cede65006c02c5b3",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -51,7 +56,7 @@
],
"Metropolis" : [
{
- "hash" : "0xf2b0f2957a6864f494e4f88ba73477ecf6d59666cce4ec7e280cc4922b1ee32e",
+ "hash" : "0xf27b07631e1e35993285fd56e6e21dc79b16c4aa0710c20334773f1b9a4dc624",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -77,7 +82,7 @@
},
"0x1000000000000000000000000000000000000002" : {
"balance" : "0x0de0b6b3a7640000",
- "code" : "0x3273a94f5374fce5edbc8e2a8697c15331677e6ebf0b1460225760026001556028565b60016001525b3373100000000000000000000000000000000000000014604b5760026001556051565b60016001525b30731000000000000000000000000000000000000001146074576002600155607a565b60016001525b34620186a014608c5760026001556092565b60016001525b",
+ "code" : "0x3273a94f5374fce5edbc8e2a8697c15331677e6ebf0b1460225760026001556028565b60016001525b3373100000000000000000000000000000000000000014604b5760026001556051565b60016001525b30731000000000000000000000000000000000000001146074576002600155607a565b60016001525b34600014608a5760026001556090565b60016001525b",
"nonce" : "0x00",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callToDelCallOpCodeCheckFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callToDelCallOpCodeCheckFiller.json
index 21b6484a8..6a041c17f 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callToDelCallOpCodeCheckFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callToDelCallOpCodeCheckFiller.json
@@ -24,7 +24,7 @@
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "Static call success",
+ "code" : "Static call succeed",
"code" : "{ [[ 0 ]] (STATICCALL 100000 (CALLDATALOAD 0) 0 0 0 0) }",
"nonce" : "0",
"storage" : {
@@ -40,7 +40,7 @@
},
"1000000000000000000000000000000000000002" : {
"balance" : "1000000000000000000",
- "code" : "{ (if (= 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0x1000000000000000000000000000000000000000 (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0x1000000000000000000000000000000000000001 (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0x0186a0 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) ) }",
+ "code" : "{ (if (= 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0x1000000000000000000000000000000000000000 (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0x1000000000000000000000000000000000000001 (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) ) }",
"nonce" : "0",
"storage" : {
}