1 files changed, 38 insertions, 51 deletions
diff --git a/GeneralStateTests/stReturnDataTest/returndatacopy_following_call.json b/GeneralStateTests/stReturnDataTest/returndatacopy_following_call.json
index 06a81fa16..eaef1c5a2 100644
--- a/GeneralStateTests/stReturnDataTest/returndatacopy_following_call.json
+++ b/GeneralStateTests/stReturnDataTest/returndatacopy_following_call.json
@@ -2,7 +2,7 @@
     "returndatacopy_following_call" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_following_callFiller.json"
         },
         "env" : {
@@ -13,69 +13,56 @@
             "currentTimestamp" : "0x03e8",
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "post" : {
-            "EIP150" : [
-                {
-                    "hash" : "0xdc9c9102b736700c272f9094c3ae852acbe458ebba5a34a119a6917cbfafc1c4",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [
+                    "EIP150",
+                    "EIP158",
+                    "Frontier",
+                    "Homestead"
+                ],
+                "result" : {
+                    "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
                     }
                 }
-            ],
-            "EIP158" : [
-                {
-                    "hash" : "0xdc9c9102b736700c272f9094c3ae852acbe458ebba5a34a119a6917cbfafc1c4",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0xdc9c9102b736700c272f9094c3ae852acbe458ebba5a34a119a6917cbfafc1c4",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Homestead" : [
-                {
-                    "hash" : "0xdc9c9102b736700c272f9094c3ae852acbe458ebba5a34a119a6917cbfafc1c4",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Metropolis" : [
-                {
-                    "hash" : "0x376691e9e29f93981011bffcaca3712843ab3756408ab015b3db0c9d12b19291",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
+            },
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [
+                    "Metropolis"
+                ],
+                "result" : {
+                    "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                        "storage" : {
+                            "0x00" : "0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff"
+                        }
                     }
                 }
-            ]
-        },
+            }
+        ],
         "pre" : {
             "0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x00",
-                "code" : "0x7d111122223333444455556666777788889999aaaabbbbccccddddeeeeffff60005260206000f3",
+                "code" : "{ (seq (MSTORE 0 0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff) (RETURN 0 32)) }",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x00",
-                "code" : "0x60006000600060006000730aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6640900000000f1506020600060003e600051600055",
+                "code" : "{ (seq (CALL 0x0900000000 0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6 0 0 0 0 0) (RETURNDATACOPY 0 0 32) (SSTORE 0 (MLOAD 0)) )}",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"