From 78c52764c6c26f0a3c2dca25fcd2e1b932ee2c43 Mon Sep 17 00:00:00 2001 From: Dimitry Date: Tue, 1 Aug 2017 11:04:30 +0300 Subject: update general tests --- .../stRevertTest/RevertOpcodeDirectCall.json | 214 +++++++++++++-------- 1 file changed, 130 insertions(+), 84 deletions(-) (limited to 'GeneralStateTests/stRevertTest/RevertOpcodeDirectCall.json') diff --git a/GeneralStateTests/stRevertTest/RevertOpcodeDirectCall.json b/GeneralStateTests/stRevertTest/RevertOpcodeDirectCall.json index 435b42ad7..23ffedca1 100644 --- a/GeneralStateTests/stRevertTest/RevertOpcodeDirectCall.json +++ b/GeneralStateTests/stRevertTest/RevertOpcodeDirectCall.json @@ -6,105 +6,151 @@ "source" : "/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeDirectCallFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "10000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x989680", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 + "post" : { + "EIP150" : [ + { + "hash" : "0x4b5855c46e03a2b0f21f4e6e80b6a24551be97416f9eb725e191edb78fecc8b8", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "Frontier", - "Homestead", - "EIP150", - "EIP158" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "0" + { + "hash" : "0xa57311b15ec973189e296050f35d5bd8f244246ff3c69a88ec8f9358cb0d15d4", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 }, - "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : { - "shouldnotexist" : "1" - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : 0, - "value" : -1 + ], + "EIP158" : [ + { + "hash" : "0x4b5855c46e03a2b0f21f4e6e80b6a24551be97416f9eb725e191edb78fecc8b8", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "Metropolis" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "0", - "storage" : { - "0x00" : "0x00", - "0x02" : "0x0e" - } + { + "hash" : "0xa57311b15ec973189e296050f35d5bd8f244246ff3c69a88ec8f9358cb0d15d4", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - } - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : 1, - "value" : -1 + ], + "Frontier" : [ + { + "hash" : "0x0c45c39cc33809ab7c3f91ebbe39b933e3968b9dbb885b3e60c6b743e536061b", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "Metropolis" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - } + { + "hash" : "0xa57311b15ec973189e296050f35d5bd8f244246ff3c69a88ec8f9358cb0d15d4", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - } - } + "logs" : [ + ] } - } - ], + ], + "Homestead" : [ + { + "hash" : "0x0c45c39cc33809ab7c3f91ebbe39b933e3968b9dbb885b3e60c6b743e536061b", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xa57311b15ec973189e296050f35d5bd8f244246ff3c69a88ec8f9358cb0d15d4", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xb1da2f7f7736fefd7d61d0938e43457d2f48fd610a26a35bf94f5247aa672887", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xa57311b15ec973189e296050f35d5bd8f244246ff3c69a88ec8f9358cb0d15d4", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1", - "code" : "{ [[10]] (CALL 60000 (CALLDATALOAD 0) 0 0 0 0 0)}", - "nonce" : "0", + "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x01", + "code" : "0x6000600060006000600060003561ea60f1600a55", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1", - "code" : "{ [[0]] (CALL 50000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[2]] 14 }", - "nonce" : "0", + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x01", + "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600055600e600255", + "nonce" : "0x00", "storage" : { } }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1", - "code" : "{ [[1]] 12 (REVERT 0 1) [[3]] 13 }", - "nonce" : "0", + "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x01", + "code" : "0x600c60015560016000fd", + "nonce" : "0x00", "storage" : { } } @@ -114,15 +160,15 @@ "0x000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b" ], "gasLimit" : [ - "460000", - "68000" + "0x0704e0", + "0x0109a0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0" + "0x00" ] } } -- cgit v1.2.3