From 78c52764c6c26f0a3c2dca25fcd2e1b932ee2c43 Mon Sep 17 00:00:00 2001
From: Dimitry <winsvega@mail.ru>
Date: Tue, 1 Aug 2017 11:04:30 +0300
Subject: update general tests

---
 .../delegatecallSenderCheck.json                   | 140 ++++++++++++---------
 1 file changed, 82 insertions(+), 58 deletions(-)

(limited to 'GeneralStateTests/stDelegatecallTestHomestead/delegatecallSenderCheck.json')

diff --git a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallSenderCheck.json b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallSenderCheck.json
index 4352d1625..bb702da1f 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallSenderCheck.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallSenderCheck.json
@@ -6,70 +6,94 @@
             "source" : "/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallSenderCheckFiller.json"
         },
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
-            "currentGasLimit" : "30000000",
-            "currentNumber" : "1",
-            "currentTimestamp" : "1000",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "currentGasLimit" : "0x01c9c380",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : [
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : "Frontier",
-                "result" : {
-                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "storage" : {
-                            "0x00" : "0x00",
-                            "0x01" : "0x00"
-                        }
-                    }
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "0x3ee3def6faec0d2b15492365eb1b13e698028761b972eecb90debc5f4fca1b8e",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : [
-                    "Homestead",
-                    "EIP158",
-                    "EIP150"
-                ],
-                "result" : {
-                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "storage" : {
-                            "0x00" : "0x01",
-                            "0x01" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
-                        }
-                    }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0x3ee3def6faec0d2b15492365eb1b13e698028761b972eecb90debc5f4fca1b8e",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 }
-            }
-        ],
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "0x79e93486f433ce20789892e86732ea1b82da98e95e3106a4e230d7375bf8ce78",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xff3106c25f8522d36427351cfe036b0de9c6a31fb1dc11369330263b8bb8671d",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x3ee3def6faec0d2b15492365eb1b13e698028761b972eecb90debc5f4fca1b8e",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ]
+        },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "1000000000000000000",
-                "code" : "{  [[ 0 ]] (DELEGATECALL 500000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 0 64 0 2 ) }",
-                "nonce" : "0",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "23",
-                "code" : "{[[ 1 ]] (CALLER)}",
-                "nonce" : "0",
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x17",
+                "code" : "0x33600155",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "1000000000000000000",
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
                 "code" : "",
-                "nonce" : "0",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
@@ -79,14 +103,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
-- 
cgit v1.2.3