From f71c2688e1a839f8429f7e94ec5e56bb182d82cf Mon Sep 17 00:00:00 2001 From: Dimitry Date: Tue, 1 Aug 2017 09:11:00 +0300 Subject: regenerate hive tests --- GeneralStateTests/stRefundTest/refund50_1.json | 111 ++++++++++--------------- 1 file changed, 42 insertions(+), 69 deletions(-) (limited to 'GeneralStateTests/stRefundTest/refund50_1.json') diff --git a/GeneralStateTests/stRefundTest/refund50_1.json b/GeneralStateTests/stRefundTest/refund50_1.json index 664fa0507..ef880b24a 100644 --- a/GeneralStateTests/stRefundTest/refund50_1.json +++ b/GeneralStateTests/stRefundTest/refund50_1.json @@ -2,74 +2,47 @@ "refund50_1" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stRefundTest/refund50_1Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x0f4240", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "1000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xb0c57a1107e5d2f752d931cb42167d1893902c6cf4b563edf64efee021e2fe35", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "23015" + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "76985", + "nonce" : "1" } } - ], - "EIP158" : [ - { - "hash" : "0xb0c57a1107e5d2f752d931cb42167d1893902c6cf4b563edf64efee021e2fe35", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xb0c57a1107e5d2f752d931cb42167d1893902c6cf4b563edf64efee021e2fe35", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xb0c57a1107e5d2f752d931cb42167d1893902c6cf4b563edf64efee021e2fe35", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xb0c57a1107e5d2f752d931cb42167d1893902c6cf4b563edf64efee021e2fe35", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60006001556000600255600060035560006004556000600555", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 1 ]] 0 [[ 2 ]] 0 [[ 3 ]] 0 [[ 4 ]] 0 [[ 5 ]] 0 }", + "nonce" : "0", "storage" : { "0x01" : "0x01", "0x02" : "0x01", @@ -78,10 +51,10 @@ "0x05" : "0x01" } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0186a0", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "100000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -91,14 +64,14 @@ "" ], "gasLimit" : [ - "0x0186a0" + "100000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x00" + "0" ] } } -- 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 --- GeneralStateTests/stRefundTest/refund50_1.json | 117 ++++++++++++++++--------- 1 file changed, 77 insertions(+), 40 deletions(-) (limited to 'GeneralStateTests/stRefundTest/refund50_1.json') diff --git a/GeneralStateTests/stRefundTest/refund50_1.json b/GeneralStateTests/stRefundTest/refund50_1.json index ef880b24a..9d57a59d8 100644 --- a/GeneralStateTests/stRefundTest/refund50_1.json +++ b/GeneralStateTests/stRefundTest/refund50_1.json @@ -6,43 +6,80 @@ "source" : "/src/GeneralStateTestsFiller/stRefundTest/refund50_1Filler.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "1000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x0f4240", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "ALL" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "storage" : { - } + "post" : { + "EIP150" : [ + { + "hash" : "0xb0c57a1107e5d2f752d931cb42167d1893902c6cf4b563edf64efee021e2fe35", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "23015" + "logs" : [ + ] + } + ], + "EIP158" : [ + { + "hash" : "0xb0c57a1107e5d2f752d931cb42167d1893902c6cf4b563edf64efee021e2fe35", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "76985", - "nonce" : "1" - } + "logs" : [ + ] } - } - ], + ], + "Frontier" : [ + { + "hash" : "0xb0c57a1107e5d2f752d931cb42167d1893902c6cf4b563edf64efee021e2fe35", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0xb0c57a1107e5d2f752d931cb42167d1893902c6cf4b563edf64efee021e2fe35", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xb0c57a1107e5d2f752d931cb42167d1893902c6cf4b563edf64efee021e2fe35", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "1000000000000000000", - "code" : "{ [[ 1 ]] 0 [[ 2 ]] 0 [[ 3 ]] 0 [[ 4 ]] 0 [[ 5 ]] 0 }", - "nonce" : "0", + "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x60006001556000600255600060035560006004556000600555", + "nonce" : "0x00", "storage" : { "0x01" : "0x01", "0x02" : "0x01", @@ -51,10 +88,10 @@ "0x05" : "0x01" } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "100000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0186a0", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -64,14 +101,14 @@ "" ], "gasLimit" : [ - "100000" + "0x0186a0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0" + "0x00" ] } } -- cgit v1.2.3