upgrade eip158 to general tests

1 files changed, 47 insertions, 3 deletions

diff --git a/src/GeneralStateTestsFiller/stSolidityTest/CreateContractFromMethodFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/CreateContractFromMethodFiller.json
index c56b2e8c6..c2a94e819 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/CreateContractFromMethodFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/CreateContractFromMethodFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["Frontier", "Homestead"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "1"
@@ -28,12 +28,56 @@
                         }
                     }
                 }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["EIP158"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "nonce" : "1"
+                    },
+                    "d2571607e241ecf590ed94b12d87c94babe36db6" : {
+                        "balance" : "0",
+                        "code" : "0x60003560e060020a90048062f55d9d14601e578063b9c3d0a514602d57005b60276004356046565b60006000f35b6033603d565b8060005260206000f35b600060e1905090565b80600160a060020a0316ff5056",
+                        "nonce" : "1",
+                        "storage" : {
+                        }
+                    }
+                }
             }
         ],
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "//" : "}\t\t\t\t\t\t\t\t\t",
                 "balance" : "100000",
+		"//": "contract TestContract							",
+		"//": "{									",
+		"//": "    function testMethod() returns (int res) 				",
+		"//": "    {									",
+		"//": "        return 225; 							",
+    		"//": "    } 									",
+		"//": "     									",
+		"//": "    function destroy(address sendFoundsTo) 				",
+		"//": "    { 									",
+		"//": "        suicide(sendFoundsTo);         					",
+		"//": "    } 									",
+		"//": "}									",
+		"//": "										",
+		"//": "contract main								",
+		"//": "{									",
+		"//": "   function run() returns (uint)						",
+		"//": "   {									",
+		"//": "       createContractFromMethod();					",
+		"//": "   }									",
+		"//": "   									",
+		"//": "   function createContractFromMethod() returns (TestContract a)		",
+		"//": "   { 									",
+		"//": "       a = new TestContract(); 						",
+		"//": "   } 									",
+		"//": "}									",
                 "code" : "0x60003560e060020a900480637ee17e1214601f578063c040622614602b57005b60256047565b60006000f35b6031603b565b8060005260206000f35b600060436047565b5090565b60006060605d600039606060006000f09050905600605480600c6000396000f30060003560e060020a90048062f55d9d14601e578063b9c3d0a514602d57005b60276004356046565b60006000f35b6033603d565b8060005260206000f35b600060e1905090565b80600160a060020a0316ff5056",
                 "nonce" : "0",
                 "storage" : {
@@ -63,4 +107,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}