From 7458738f0b906b52075f4ff79a7309ce28c8fe56 Mon Sep 17 00:00:00 2001 From: Dimitry Date: Fri, 24 Mar 2017 19:17:31 +0400 Subject: refill revert tests --- .../stRevertTest/RevertOpcodeCallsFiller.json | 11 +-- .../stRevertTest/RevertOpcodeDirectCallFiller.json | 4 +- .../RevertOpcodeMultipleSubCallsFiller.json | 87 ++++------------------ .../stRevertTest/RevertOpcodeReturnFiller.json | 4 +- 4 files changed, 24 insertions(+), 82 deletions(-) (limited to 'src') diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCallsFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCallsFiller.json index 65b1da723..bfeaaaf6f 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCallsFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCallsFiller.json @@ -71,13 +71,14 @@ "b0005374fce5edbc8e2a8697c15331677e6ebf0b" : { "nonce" : "0", "storage" : { - "0x00" : "0x01", + "0x00" : "0x00", "0x02" : "0x0e" } } } }, { + "comment" : "OOG", "indexes" : { "data" : 0, "gas" : 1, @@ -115,7 +116,7 @@ "b1005374fce5edbc8e2a8697c15331677e6ebf0b" : { "nonce" : "0", "storage" : { - "0x00" : "0x01", + "0x00" : "0x00", "0x02" : "0x0e" } } @@ -159,7 +160,7 @@ "b2005374fce5edbc8e2a8697c15331677e6ebf0b" : { "nonce" : "0", "storage" : { - "0x00" : "0x01", + "0x00" : "0x00", "0x02" : "0x0e" } } @@ -210,7 +211,7 @@ "b3305374fce5edbc8e2a8697c15331677e6ebf0b" : { "nonce" : "0", "storage" : { - "0x04" : "0x01", + "0x04" : "0x00", "0x05" : "0x0e" } } @@ -284,7 +285,7 @@ "0x000000000000000000000000b3005374fce5edbc8e2a8697c15331677e6ebf0b" ], "gasLimit" : [ - "460000", "100000" + "460000", "88000" ], "gasPrice" : "1", "nonce" : "0", diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeDirectCallFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeDirectCallFiller.json index 71c78d645..40eaf231c 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeDirectCallFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeDirectCallFiller.json @@ -40,7 +40,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "nonce" : "0", "storage" : { - "0x00" : "0x01", + "0x00" : "0x00", "0x02" : "0x0e" } } @@ -102,7 +102,7 @@ "0x000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b" ], "gasLimit" : [ - "460000", "70000" + "460000", "68000" ], "gasPrice" : "1", "nonce" : "0", diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeMultipleSubCallsFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeMultipleSubCallsFiller.json index 409c06e2d..0b40433ed 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeMultipleSubCallsFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeMultipleSubCallsFiller.json @@ -44,9 +44,9 @@ "storage" : { "0x04" : "0x0c", "0x05" : "0x0c", - "0x0a" : "0x01", - "0x0b" : "0x01", - "0x0c" : "0x01" + "0x0a" : "0x00", + "0x0b" : "0x00", + "0x0c" : "0x00" } }, "b000000000000000000000000000000000000000" : { @@ -88,9 +88,9 @@ "storage" : { "0x04" : "0x0c", "0x05" : "0x0c", - "0x0a" : "0x01", - "0x0b" : "0x01", - "0x0c" : "0x01" + "0x0a" : "0x00", + "0x0b" : "0x00", + "0x0c" : "0x00" } }, "b000000000000000000000000000000000000000" : { @@ -132,9 +132,9 @@ "storage" : { "0x04" : "0x0c", "0x05" : "0x0c", - "0x0a" : "0x01", - "0x0b" : "0x01", - "0x0c" : "0x01" + "0x0a" : "0x00", + "0x0b" : "0x00", + "0x0c" : "0x00" } }, "b000000000000000000000000000000000000000" : { @@ -176,70 +176,11 @@ "storage" : { "0x04" : "0x0c", "0x05" : "0x0c", - "0x0a" : "0x01", - "0x0b" : "0x01", - "0x0c" : "0x01" - } - }, - "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" : -1, - "gas" : [2], - "value" : 1 - }, - "network" : ["Metropolis"], - "result" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "0x01" - }, - "a000000000000000000000000000000000000000" : { - "nonce" : "0x00", - "storage" : { - "0x04" : "0x00", - "0x05" : "0x00", "0x0a" : "0x00", "0x0b" : "0x00", "0x0c" : "0x00" } }, - "a100000000000000000000000000000000000000" : { - "nonce" : "0x00", - "storage" : { - } - }, - "a200000000000000000000000000000000000000" : { - "nonce" : "0x00", - "storage" : { - } - }, - "a300000000000000000000000000000000000000" : { - "nonce" : "0x00", - "storage" : { - } - }, "b000000000000000000000000000000000000000" : { "storage" : { "0x01" : "0x00", @@ -267,7 +208,7 @@ "indexes" : { "data" : 0, "gas" : [2], - "value" : 0 + "value" : [1,0] }, "network" : ["Metropolis"], "result" : { @@ -279,9 +220,9 @@ "storage" : { "0x04" : "0x0c", "0x05" : "0x0c", - "0x0a" : "0x01", - "0x0b" : "0x01", - "0x0c" : "0x01" + "0x0a" : "0x00", + "0x0b" : "0x00", + "0x0c" : "0x00" } }, "a100000000000000000000000000000000000000" : { @@ -457,7 +398,7 @@ "000000000000000000000000a300000000000000000000000000000000000000" ], "gasLimit" : [ - "800000", "160000", "190000" + "800000", "140000", "160000", "50000" ], "gasPrice" : "1", "nonce" : "0", diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeReturnFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeReturnFiller.json index bfa126b39..dd57096f0 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeReturnFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeReturnFiller.json @@ -40,7 +40,7 @@ }, "a000000000000000000000000000000000000000" : { "storage" : { - "0x01" : "0x01", + "0x01" : "0x00", "0x02" : "0x726576657274206d657373616765" } }, @@ -63,7 +63,7 @@ }, "a000000000000000000000000000000000000000" : { "storage" : { - "0x01" : "0x01", + "0x01" : "0x00", "0x02" : "0x00" } }, -- cgit v1.2.3