From 78c52764c6c26f0a3c2dca25fcd2e1b932ee2c43 Mon Sep 17 00:00:00 2001 From: Dimitry Date: Tue, 1 Aug 2017 11:04:30 +0300 Subject: update general tests --- .../stSystemOperationsTest/ABAcalls2.json | 146 +++++++++++---------- 1 file changed, 80 insertions(+), 66 deletions(-) (limited to 'GeneralStateTests/stSystemOperationsTest/ABAcalls2.json') diff --git a/GeneralStateTests/stSystemOperationsTest/ABAcalls2.json b/GeneralStateTests/stSystemOperationsTest/ABAcalls2.json index a3db1578f..0420d728b 100644 --- a/GeneralStateTests/stSystemOperationsTest/ABAcalls2.json +++ b/GeneralStateTests/stSystemOperationsTest/ABAcalls2.json @@ -6,80 +6,94 @@ "source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcalls2Filler.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "1000000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x3b9aca00", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "storage" : { - "0x" : "0x0201" - } + "post" : { + "EIP150" : [ + { + "hash" : "0xa963ff4f5827ec055e38eef98962c7bad2360f6ffa3b3946e55ce73933774509", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "945304eb96065b2a98b57a48a06ae28d285a71b5" : { - "storage" : { - "0x" : "0x0200" - } - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150", - "EIP158" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "storage" : { - "0x" : "0xbf" - } + ], + "EIP158" : [ + { + "hash" : "0xa963ff4f5827ec055e38eef98962c7bad2360f6ffa3b3946e55ce73933774509", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "945304eb96065b2a98b57a48a06ae28d285a71b5" : { - "storage" : { - "0x" : "0xbf" - } - } + "logs" : [ + ] } - } - ], + ], + "Frontier" : [ + { + "hash" : "0x753cb4109def037eecfcb5c1812a6c92888f604e00f5bb117baee07633b958d5", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x753cb4109def037eecfcb5c1812a6c92888f604e00f5bb117baee07633b958d5", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xa963ff4f5827ec055e38eef98962c7bad2360f6ffa3b3946e55ce73933774509", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "1000000000000000000", - "code" : "{ [[ 0 ]] (ADD (SLOAD 0) 1) (CALL (- (GAS) 100000) 0x945304eb96065b2a98b57a48a06ae28d285a71b5 1 0 0 0 0) }", - "nonce" : "0", + "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x6001600054016000556000600060006000600173945304eb96065b2a98b57a48a06ae28d285a71b5620186a05a03f1", + "nonce" : "0x00", "storage" : { } }, - "945304eb96065b2a98b57a48a06ae28d285a71b5" : { - "balance" : "0", - "code" : " { [[ 0 ]] (ADD (SLOAD 0) 1) (CALL (- (GAS) 100000) 0x095e7baea6a6c7c4c2dfeb977efac326af552d87 0 0 0 0 0) } ", - "nonce" : "0", + "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "0x00", + "code" : "0x6001600054016000556000600060006000600073095e7baea6a6c7c4c2dfeb977efac326af552d87620186a05a03f1", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0de0b6b3a7640000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -89,14 +103,14 @@ "" ], "gasLimit" : [ - "1000000000" + "0x3b9aca00" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "100000" + "0x0186a0" ] } } -- cgit