diff options
| author | Dimitry <dimitry@ethereum.org> | 2018-02-17 06:49:32 +0800 |
|---|---|---|
| committer | Dimitry <dimitry@ethereum.org> | 2018-02-17 06:49:32 +0800 |
| commit | 40d055db4710d95ffc75d1cd26e53fbaaa015646 (patch) | |
| tree | e89d6c1790f2e339606cc881041377c1783beb85 /src/GeneralStateTestsFiller | |
| parent | 92cc4ac1cc6c8d86f8905c9fd1fe764a9df54dad (diff) | |
| download | dexon-tests-40d055db4710d95ffc75d1cd26e53fbaaa015646.tar dexon-tests-40d055db4710d95ffc75d1cd26e53fbaaa015646.tar.gz dexon-tests-40d055db4710d95ffc75d1cd26e53fbaaa015646.tar.bz2 dexon-tests-40d055db4710d95ffc75d1cd26e53fbaaa015646.tar.lz dexon-tests-40d055db4710d95ffc75d1cd26e53fbaaa015646.tar.xz dexon-tests-40d055db4710d95ffc75d1cd26e53fbaaa015646.tar.zst dexon-tests-40d055db4710d95ffc75d1cd26e53fbaaa015646.zip | |
fix stRevertTest
Diffstat (limited to 'src/GeneralStateTestsFiller')
7 files changed, 154 insertions, 18 deletions
diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json index ed5ed221d..48c6dcf1a 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json @@ -13,12 +13,11 @@ "indexes" : { "data" : 1, "gas" : 1, - "value" : 0 + "value" : -1 }, "network" : [">Frontier"], "result" : { "3e180b1862f9d158abb5e519a6d8605540c23682" : { - "balance" : "0x05", "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455", "nonce" : "54", "storage" : { @@ -35,12 +34,11 @@ "indexes" : { "data" : 0, "gas" : 1, - "value" : 0 + "value" : -1 }, "network" : [">Frontier"], "result" : { "3e180b1862f9d158abb5e519a6d8605540c23682" : { - "balance" : "0x06", "code" : "{ [[0]] 1 [[1]] (CALL (CALLDATALOAD 0) 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[4]] 12 }", "nonce" : "54", "storage" : { @@ -59,7 +57,7 @@ "indexes" : { "data" : 1, "gas" : 0, - "value" : 0 + "value" : -1 }, "network" : [">=EIP158", "EIP150"], "result" : { @@ -81,12 +79,11 @@ "indexes" : { "data" : 1, "gas" : 0, - "value" : 0 + "value" : -1 }, "network" : ["Homestead", "Frontier"], "result" : { "3e180b1862f9d158abb5e519a6d8605540c23682" : { - "balance" : "0x05", "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455", "nonce" : "54", "storage" : { @@ -103,12 +100,11 @@ "indexes" : { "data" : 0, "gas" : 0, - "value" : 0 + "value" : -1 }, "network" : [">Frontier"], "result" : { "3e180b1862f9d158abb5e519a6d8605540c23682" : { - "balance" : "0x05", "code" : "{ [[0]] 1 [[1]] (CALL (CALLDATALOAD 0) 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[4]] 12 }", "nonce" : "54", "storage" : { diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateOOGFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateOOGFiller.json index f89326f9c..a17ef9c54 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateOOGFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateOOGFiller.json @@ -14,7 +14,7 @@ "indexes" : { "data" : 1, "gas" : 1, - "value" : 0 + "value" : -1 }, "network" : [">=EIP158"], "result" : { @@ -41,7 +41,7 @@ "indexes" : { "data" : 1, "gas" : 1, - "value" : 0 + "value" : -1 }, "network" : ["EIP150"], "result" : { @@ -68,7 +68,7 @@ "indexes" : { "data" : 1, "gas" : 1, - "value" : 0 + "value" : -1 }, "network" : ["Frontier", "Homestead"], "result" : { @@ -90,7 +90,7 @@ "indexes" : { "data" : 0, "gas" : 1, - "value" : 0 + "value" : -1 }, "network" : [">Frontier"], "result" : { @@ -114,7 +114,7 @@ "indexes" : { "data" : [1, 0], "gas" : 0, - "value" : 0 + "value" : -1 }, "network" : [">=Frontier"], "result" : { diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCallsFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCallsFiller.json index 8ac18ae94..45c0469e4 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCallsFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCallsFiller.json @@ -187,7 +187,7 @@ { "indexes" : { "data" : 3, - "gas" : 0, + "gas" : [0], "value" : -1 }, "network" : [">=Byzantium"], @@ -216,6 +216,39 @@ } } } + }, + { + "indexes" : { + "data" : 3, + "gas" : [1], + "value" : -1 + }, + "network" : [">=Byzantium"], + "result" : { + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + } + }, + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x0a" : "0x00" + } + }, + "b3005374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "0", + "storage" : { + "0x00" : "0x00", + "0x02" : "0x00" + } + }, + "b3305374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "0", + "storage" : { + "0x04" : "0x00", + "0x05" : "0x00" + } + } + } } ], "pre" : diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnDataFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnDataFiller.json index 33343be34..9fccfe5ed 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnDataFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnDataFiller.json @@ -211,6 +211,37 @@ } } } + }, + { + "indexes" : { + "data" : 3, + "gas" : 1, + "value" : -1 + }, + "network" : [">=Byzantium"], + "result" : { + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + } + }, + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x0a" : "0xff" + } + }, + "b3005374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "0", + "storage" : { + "0x00" : "0x00" + } + }, + "b3305374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "0", + "storage" : { + "0x05" : "0x00" + } + } + } } ], "pre" : diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeMultipleSubCallsFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeMultipleSubCallsFiller.json index c18978242..90f9ba163 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeMultipleSubCallsFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeMultipleSubCallsFiller.json @@ -163,7 +163,7 @@ { "indexes" : { "data" : 3, - "gas" : 0, + "gas" : [0,2], "value" : -1 }, "network" : [">=Byzantium"], @@ -206,6 +206,50 @@ }, { "indexes" : { + "data" : [1,2], + "gas" : 2, + "value" : -1 + }, + "network" : [">=Byzantium"], + "result" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "0x01" + }, + "a300000000000000000000000000000000000000" : { + "nonce" : "0x00", + "storage" : { + "0x04" : "0x00", + "0x05" : "0x00", + "0x0a" : "0x00", + "0x0b" : "0x00", + "0x0c" : "0x00" + } + }, + "b000000000000000000000000000000000000000" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "c000000000000000000000000000000000000000" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "d000000000000000000000000000000000000000" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + } + } + }, + { + "indexes" : { "data" : 0, "gas" : [2], "value" : [1,0] @@ -266,7 +310,7 @@ { "indexes" : { "data" : -1, - "gas" : [1], + "gas" : [1,3], "value" : -1 }, "network" : [">=Byzantium"], diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOG2Filler.json b/src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOG2Filler.json index 6e99eefbb..b813d8f68 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOG2Filler.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOG2Filler.json @@ -13,7 +13,7 @@ "indexes" : { "data" : -1, "gas" : 0, - "value" : 0 + "value" : -1 }, "network" : [">Frontier"], "result" : { @@ -42,6 +42,22 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : 1, + "value" : 1 + }, + "network" : [">Frontier"], + "result" : { + "a000000000000000000000000000000000000000" : { + "balance" : "1", + "nonce" : "0", + "storage" : { + } + } + } } ], "pre" : diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOGFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOGFiller.json index 15e864c79..513f1f74b 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOGFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOGFiller.json @@ -43,6 +43,22 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : [0,1], + "value" : 1 + }, + "network" : [">Frontier"], + "result" : { + "a000000000000000000000000000000000000000" : { + "balance" : "1", + "nonce" : "0", + "storage" : { + } + } + } } ], "pre" : |