diff options
upgrade eip158 to general tests
Diffstat (limited to 'src/GeneralStateTestsFiller/stSolidityTest/ContractInheritanceFiller.json')
-rw-r--r-- | src/GeneralStateTestsFiller/stSolidityTest/ContractInheritanceFiller.json | 42 |
1 files changed, 39 insertions, 3 deletions
diff --git a/src/GeneralStateTestsFiller/stSolidityTest/ContractInheritanceFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/ContractInheritanceFiller.json index 029f18038..0013e1780 100644 --- a/src/GeneralStateTestsFiller/stSolidityTest/ContractInheritanceFiller.json +++ b/src/GeneralStateTestsFiller/stSolidityTest/ContractInheritanceFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : "Frontier", + "network" : ["ALL"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { @@ -27,8 +27,44 @@ ], "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "//" : "}\t\t\t\t\t\t\t", "balance" : "100000", + "//" : "contract base ", + "//" : "{ ", + "//" : " function methodA() returns (uint32) ", + "//" : " { ", + "//" : " return 1; ", + "//" : " } ", + "//" : "} ", + "//" : " ", + "//" : "contract frombase is base ", + "//" : "{ ", + "//" : " function methodA() returns (uint32) ", + "//" : " { ", + "//" : " return 2; ", + "//" : " } ", + "//" : "} ", + "//" : " ", + "//" : "contract main ", + "//" : "{ ", + "//" : " bool returnValue; ", + "//" : " function run() returns (bool) ", + "//" : " { ", + "//" : " returnValue = testInheretance(); ", + "//" : " return returnValue; ", + "//" : " } ", + "//" : " ", + "//" : " function testInheretance() returns (bool res) ", + "//" : " { ", + "//" : " res = true; ", + "//" : " base contract1 = new base(); ", + "//" : " if (contract1.methodA() != 1) ", + "//" : " return false; ", + "//" : " ", + "//" : " frombase contract2 = new frombase(); ", + "//" : " if (contract2.methodA() != 2) ", + "//" : " return false; ", + "//" : " } ", + "//" : "}", "code" : "0x7c010000000000000000000000000000000000000000000000000000000060003504633e0bca3b8114610039578063c0406226146100a857005b6100b55b600160008060456101ec8339604560006000f091508173ffffffffffffffffffffffffffffffffffffffff166381bda09b60206000827c010000000000000000000000000000000000000000000000000000000002600052600460006000866161da5a03f161011957005b6100bf60006100c961003d565b8060005260206000f35b8060005260206000f35b600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0016919091179081905560ff16919050565b505060005163ffffffff166002141561019d575b5b505090565b505060005163ffffffff1660011415610194575b60456101a7600039604560006000f090508073ffffffffffffffffffffffffffffffffffffffff166381bda09b60206000827c010000000000000000000000000000000000000000000000000000000002600052600460006000866161da5a03f16100ff57005b60009250610114565b600092506101145600603980600c6000396000f3007c0100000000000000000000000000000000000000000000000000000000600035046381bda09b8114602d57005b60026000818152602090f3603980600c6000396000f3007c0100000000000000000000000000000000000000000000000000000000600035046381bda09b8114602d57005b60016000818152602090f3", "nonce" : "0", "storage" : { @@ -58,4 +94,4 @@ ] } } -}
\ No newline at end of file +} |