upgrade eip158 to general tests

1 files changed, 31 insertions, 3 deletions

diff --git a/src/GeneralStateTestsFiller/stSolidityTest/TestContractInteractionFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/TestContractInteractionFiller.json
index afedee617..5d3acca3e 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/TestContractInteractionFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/TestContractInteractionFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "1",
@@ -28,8 +28,36 @@
         ],
         "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								",
+		"//": "{									",
+		"//": "    bool returnValue;							",
+		"//": "    function run() returns (bool)					",
+		"//": "    {									",
+		"//": "       returnValue = testContractInteraction();				",
+		"//": "       return returnValue;						",
+		"//": "    }									",
+		"//": "   									",
+		"//" : "    function testContractInteraction() returns (bool res) 		",
+		"//" : "    { 									",
+		"//" : "        TestContract a = new TestContract(); 				",
+		"//" : "        if (a.testMethod() == 225) 					",
+		"//" : "            return true; 						",
+		"//" : "        return false; 							",
+		"//" : "    } 									",
+		"//": "}									",
                 "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463c04062268114610039578063ed973fe91461004b57005b6100416100ea565b8060005260206000f35b61005361005d565b8060005260206000f35b60006000608161011a600039608160006000f0905073ffffffffffffffffffffffffffffffffffffffff811663b9c3d0a5602060007fb9c3d0a50000000000000000000000000000000000000000000000000000000081526004600060008660325a03f16100c757005b505060005160e1146100d8576100e1565b600191506100e6565b600091505b5090565b60006100f461005d565b600060006101000a81548160ff0219169083021790555060ff600160005404169050905600607580600c6000396000f3007c01000000000000000000000000000000000000000000000000000000006000350462f55d9d81146036578063b9c3d0a514604557005b603f6004356055565b60006000f35b604b6070565b8060005260206000f35b8073ffffffffffffffffffffffffffffffffffffffff16ff50565b60e19056",
                 "nonce" : "0",
                 "storage" : {
@@ -59,4 +87,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}