From d350f5c96a1fb253d2a271c96d2051eb311737f4 Mon Sep 17 00:00:00 2001
From: Dimitry <winsvega@mail.ru>
Date: Fri, 9 Dec 2016 17:17:42 +0300
Subject: upgrade eip158 to general tests

---
 .../refund_CallToSuicideStorageFiller.json         | 39 ++++++++++++++++++----
 1 file changed, 33 insertions(+), 6 deletions(-)

(limited to 'src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideStorageFiller.json')

diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideStorageFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideStorageFiller.json
index 3fd062c66..be74a6859 100644
--- a/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideStorageFiller.json
+++ b/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideStorageFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : {
-                    "data" : -1,
+                    "data" : 0,
                     "gas" : -1,
                     "value" : -1
                 },
@@ -25,19 +25,46 @@
                         }
                     },
                     "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                        "balance" : "20534"
+                        "balance" : "20663"
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "99979456",
+                        "balance" : "99979327",
                         "nonce" : "1"
                     }
                 }
+            },
+	    {
+                "indexes" : {
+                    "data" : 1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["EIP158"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "balance" : "2000000000000000010",
+                        "storage" : {
+                            "0x" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "23461"
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "99976529",
+                        "nonce" : "1"
+                    },
+		    "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+			"shouldnotexist" : "1"
+		    }
+                }
             }
         ],
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
-                "code" : "{ [[ 0 ]] (CALL 500 0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa 0 0 0 0 0 )}",
+                "code" : "{ [[ 0 ]] (CALL (CALLDATALOAD 0) 0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa 0 0 0 0 0 )}",
                 "nonce" : "0",
                 "storage" : {
                     "0x01" : "0x01"
@@ -61,7 +88,7 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0x00000000000000000000000000000000000000000000000000000000000001f4", "0x0000000000000000000000000000000000000000000000000000000000010000"
             ],
             "gasLimit" : [
                 "10000000"
@@ -75,4 +102,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit