From f71c2688e1a839f8429f7e94ec5e56bb182d82cf Mon Sep 17 00:00:00 2001 From: Dimitry Date: Tue, 1 Aug 2017 09:11:00 +0300 Subject: regenerate hive tests --- .../callWithHighValueAndGasOOG.json | 126 +++++++++------------ 1 file changed, 56 insertions(+), 70 deletions(-) (limited to 'GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG.json') diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG.json b/GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG.json index 0b8dd8cf0..58c85b086 100644 --- a/GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG.json +++ b/GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG.json @@ -2,88 +2,74 @@ "callWithHighValueAndGasOOG" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callWithHighValueAndGasOOGFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x01c9c380", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "30000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x54daa803bda94d91431e59da207338a9e4414900841128a7b465bc40a4b66407", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0x54daa803bda94d91431e59da207338a9e4414900841128a7b465bc40a4b66407", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x3627d19480c5de4564b2a814de4cda322e03d8481116406811ccb90b4b8f9040", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x3627d19480c5de4564b2a814de4cda322e03d8481116406811ccb90b4b8f9040", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x54daa803bda94d91431e59da207338a9e4414900841128a7b465bc40a4b66407", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158", + "EIP150" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01" + } } } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1000000000000000000", + "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (DELEGATECALL 0xffffffffffffffffffffffff 0x945304eb96065b2a98b57a48a06ae28d285a71b5 0 64 0 2 ) }", + "nonce" : "0", "storage" : { } }, - "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : { - "balance" : "0x17", + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "23", "code" : "0x6001600155603760005360026000f3", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -93,14 +79,14 @@ "" ], "gasLimit" : [ - "0x2dc6c0" + "3000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } -- cgit v1.2.3 From 78c52764c6c26f0a3c2dca25fcd2e1b932ee2c43 Mon Sep 17 00:00:00 2001 From: Dimitry Date: Tue, 1 Aug 2017 11:04:30 +0300 Subject: update general tests --- .../callWithHighValueAndGasOOG.json | 138 ++++++++++++--------- 1 file changed, 81 insertions(+), 57 deletions(-) (limited to 'GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG.json') diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG.json b/GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG.json index 58c85b086..ac170385b 100644 --- a/GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG.json +++ b/GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG.json @@ -6,70 +6,94 @@ "source" : "/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callWithHighValueAndGasOOGFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "30000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x01c9c380", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "storage" : { - } - } + "post" : { + "EIP150" : [ + { + "hash" : "0x54daa803bda94d91431e59da207338a9e4414900841128a7b465bc40a4b66407", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP158", - "EIP150" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "storage" : { - "0x00" : "0x01", - "0x01" : "0x01" - } - } + ], + "EIP158" : [ + { + "hash" : "0x54daa803bda94d91431e59da207338a9e4414900841128a7b465bc40a4b66407", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ], + "Frontier" : [ + { + "hash" : "0x3627d19480c5de4564b2a814de4cda322e03d8481116406811ccb90b4b8f9040", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x3627d19480c5de4564b2a814de4cda322e03d8481116406811ccb90b4b8f9040", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x54daa803bda94d91431e59da207338a9e4414900841128a7b465bc40a4b66407", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "1000000000000000000", - "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (DELEGATECALL 0xffffffffffffffffffffffff 0x945304eb96065b2a98b57a48a06ae28d285a71b5 0 64 0 2 ) }", - "nonce" : "0", + "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055", + "nonce" : "0x00", "storage" : { } }, - "945304eb96065b2a98b57a48a06ae28d285a71b5" : { - "balance" : "23", + "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "0x17", "code" : "0x6001600155603760005360026000f3", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0de0b6b3a7640000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -79,14 +103,14 @@ "" ], "gasLimit" : [ - "3000000" + "0x2dc6c0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "100000" + "0x0186a0" ] } } -- cgit v1.2.3