From f71c2688e1a839f8429f7e94ec5e56bb182d82cf Mon Sep 17 00:00:00 2001 From: Dimitry Date: Tue, 1 Aug 2017 09:11:00 +0300 Subject: regenerate hive tests --- .../stSolidityTest/TestStoreGasPrices.json | 107 ++++++++------------- 1 file changed, 40 insertions(+), 67 deletions(-) (limited to 'GeneralStateTests/stSolidityTest/TestStoreGasPrices.json') diff --git a/GeneralStateTests/stSolidityTest/TestStoreGasPrices.json b/GeneralStateTests/stSolidityTest/TestStoreGasPrices.json index 48942d4f0..adff69881 100644 --- a/GeneralStateTests/stSolidityTest/TestStoreGasPrices.json +++ b/GeneralStateTests/stSolidityTest/TestStoreGasPrices.json @@ -2,81 +2,54 @@ "TestStoreGasPrices" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stSolidityTest/TestStoreGasPricesFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", "currentGasLimit" : "0x7fffffffffffffff", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xe7b615fa0b33e1df7d7d59712c767013787a9f549cd65a4d22c8f143283ec4bb", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0x4e2d", + "0x01" : "0x1395", + "0x02" : "0x1395", + "0x03" : "0x1395", + "0x04" : "0x1395", + "0x05" : "0x1395" + } } } - ], - "EIP158" : [ - { - "hash" : "0xe7b615fa0b33e1df7d7d59712c767013787a9f549cd65a4d22c8f143283ec4bb", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xe7b615fa0b33e1df7d7d59712c767013787a9f549cd65a4d22c8f143283ec4bb", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xe7b615fa0b33e1df7d7d59712c767013787a9f549cd65a4d22c8f143283ec4bb", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xe7b615fa0b33e1df7d7d59712c767013787a9f549cd65a4d22c8f143283ec4bb", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0186a0", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "//" : "}\t\t\t\t\t\t\t\t", + "balance" : "100000", "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463c04062268114602d57005b6033603d565b8060005260206000f35b600060005a600160205590505a81036000555a600260205590505a81036001555a600260205590505a81036002555a65168aa8d53fe660205590505a81036003555a600260205590505a81036004555a600060205590505a81036005555a5060019291505056", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x02faf080", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "50000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +59,14 @@ "0xc0406226" ], "gasLimit" : [ - "0x02160ec0" + "35000000" ], - "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 --- .../stSolidityTest/TestStoreGasPrices.json | 117 ++++++++++++++------- 1 file changed, 77 insertions(+), 40 deletions(-) (limited to 'GeneralStateTests/stSolidityTest/TestStoreGasPrices.json') diff --git a/GeneralStateTests/stSolidityTest/TestStoreGasPrices.json b/GeneralStateTests/stSolidityTest/TestStoreGasPrices.json index adff69881..aff397cd3 100644 --- a/GeneralStateTests/stSolidityTest/TestStoreGasPrices.json +++ b/GeneralStateTests/stSolidityTest/TestStoreGasPrices.json @@ -6,50 +6,87 @@ "source" : "/src/GeneralStateTestsFiller/stSolidityTest/TestStoreGasPricesFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", "currentGasLimit" : "0x7fffffffffffffff", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "ALL" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "storage" : { - "0x" : "0x4e2d", - "0x01" : "0x1395", - "0x02" : "0x1395", - "0x03" : "0x1395", - "0x04" : "0x1395", - "0x05" : "0x1395" - } - } + "post" : { + "EIP150" : [ + { + "hash" : "0xe7b615fa0b33e1df7d7d59712c767013787a9f549cd65a4d22c8f143283ec4bb", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ], + "EIP158" : [ + { + "hash" : "0xe7b615fa0b33e1df7d7d59712c767013787a9f549cd65a4d22c8f143283ec4bb", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0xe7b615fa0b33e1df7d7d59712c767013787a9f549cd65a4d22c8f143283ec4bb", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0xe7b615fa0b33e1df7d7d59712c767013787a9f549cd65a4d22c8f143283ec4bb", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xe7b615fa0b33e1df7d7d59712c767013787a9f549cd65a4d22c8f143283ec4bb", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "//" : "}\t\t\t\t\t\t\t\t", - "balance" : "100000", + "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0x0186a0", "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463c04062268114602d57005b6033603d565b8060005260206000f35b600060005a600160205590505a81036000555a600260205590505a81036001555a600260205590505a81036002555a65168aa8d53fe660205590505a81036003555a600260205590505a81036004555a600060205590505a81036005555a5060019291505056", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "50000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x02faf080", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -59,14 +96,14 @@ "0xc0406226" ], "gasLimit" : [ - "35000000" + "0x02160ec0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0" + "0x00" ] } } -- cgit v1.2.3