From 78c52764c6c26f0a3c2dca25fcd2e1b932ee2c43 Mon Sep 17 00:00:00 2001 From: Dimitry Date: Tue, 1 Aug 2017 11:04:30 +0300 Subject: update general tests --- .../stInitCodeTest/CallRecursiveContract.json | 166 +++++++++------------ 1 file changed, 72 insertions(+), 94 deletions(-) (limited to 'GeneralStateTests/stInitCodeTest/CallRecursiveContract.json') diff --git a/GeneralStateTests/stInitCodeTest/CallRecursiveContract.json b/GeneralStateTests/stInitCodeTest/CallRecursiveContract.json index 567bab0e2..28bfd213f 100644 --- a/GeneralStateTests/stInitCodeTest/CallRecursiveContract.json +++ b/GeneralStateTests/stInitCodeTest/CallRecursiveContract.json @@ -6,109 +6,87 @@ "source" : "/src/GeneralStateTestsFiller/stInitCodeTest/CallRecursiveContractFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "100000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x05f5e100", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "1", - "nonce" : "41", - "storage" : { - "0x02" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" - } + "post" : { + "EIP150" : [ + { + "hash" : "0xf2b33499b0bdf4a78f3f6d54c7f3ede696df72fceba07519f1327de7181184b5", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "1a4c83e1a9834cdc7e4a905ff7f0cf44aed73180" : { - "nonce" : "1", - "storage" : { - "0x02" : "0x1a4c83e1a9834cdc7e4a905ff7f0cf44aed73180" - } - }, - "8e3411c91d5dd4081b4846fa2f93808f5ad19686" : { - "nonce" : "1", - "storage" : { - "0x02" : "0x8e3411c91d5dd4081b4846fa2f93808f5ad19686" - } - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP158" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "1", - "nonce" : "41", - "storage" : { - "0x02" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" - } + ], + "EIP158" : [ + { + "hash" : "0x624e603c08a6f3ec965ecbadc51c73e26a6f8d77c65aca8fe08a21d9082b258f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "1a4c83e1a9834cdc7e4a905ff7f0cf44aed73180" : { - "shouldnotexist" : "1" + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0x4fee218443f0d352ef33dfe5dd9bdf120528b38ef3be46630b865bea6b1e6b28", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "8e3411c91d5dd4081b4846fa2f93808f5ad19686" : { - "shouldnotexist" : "1" - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "1", - "nonce" : "41", - "storage" : { - "0x02" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" - } + ], + "Homestead" : [ + { + "hash" : "0x4fee218443f0d352ef33dfe5dd9bdf120528b38ef3be46630b865bea6b1e6b28", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "1a4c83e1a9834cdc7e4a905ff7f0cf44aed73180" : { - "nonce" : "1" + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x624e603c08a6f3ec965ecbadc51c73e26a6f8d77c65aca8fe08a21d9082b258f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "8e3411c91d5dd4081b4846fa2f93808f5ad19686" : { - "shouldnotexist" : "1" - } + "logs" : [ + ] } - } - ], + ] + }, "pre" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0", - "code" : "{[[ 2 ]](ADDRESS)(CODECOPY 0 0 32)(CREATE 0 0 32)}", - "nonce" : "40", + "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0x00", + "code" : "0x3060025560206000600039602060006000f0", + "nonce" : "0x28", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0f4240", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -118,14 +96,14 @@ "0x00" ], "gasLimit" : [ - "400000" + "0x061a80" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "1" + "0x01" ] } } -- cgit v1.2.3