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/stMemoryTest/mem32kb-32.json | 154 ++++++++++++++----------- 1 file changed, 87 insertions(+), 67 deletions(-) (limited to 'GeneralStateTests/stMemoryTest/mem32kb-32.json') diff --git a/GeneralStateTests/stMemoryTest/mem32kb-32.json b/GeneralStateTests/stMemoryTest/mem32kb-32.json index 8ce6a4af5..1ac9d36c8 100644 --- a/GeneralStateTests/stMemoryTest/mem32kb-32.json +++ b/GeneralStateTests/stMemoryTest/mem32kb-32.json @@ -2,81 +2,101 @@ "mem32kb-32" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-32Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x0a00000000", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "42949672960", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xf2ccd3bdd3afd712768712179ccd506a4711ceee3a6903be053399a74077ac61", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : "Frontier", + "result" : { + "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { + "balance" : "0x0de0b6b3a764000a", + "code" : "0x602a617cc052617cc05160015559600055", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x7ce0", + "0x01" : "0x2a" + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0x0101b1", + "code" : "0x", + "nonce" : "0x00", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x63fffefe45", + "code" : "0x", + "nonce" : "0x01", + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0xf2ccd3bdd3afd712768712179ccd506a4711ceee3a6903be053399a74077ac61", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xf2ccd3bdd3afd712768712179ccd506a4711ceee3a6903be053399a74077ac61", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xf2ccd3bdd3afd712768712179ccd506a4711ceee3a6903be053399a74077ac61", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xf2ccd3bdd3afd712768712179ccd506a4711ceee3a6903be053399a74077ac61", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Homestead", + "EIP150", + "EIP158" + ], + "result" : { + "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { + "balance" : "0x0de0b6b3a764000a", + "code" : "0x602a617cc052617cc05160015559600055", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x7ce0", + "0x01" : "0x2a" + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0x0101b1", + "code" : "0x", + "nonce" : "0x00", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x63fffefe45", + "code" : "0x", + "nonce" : "0x01", + "storage" : { + } } } - ] - }, + } + ], "pre" : { - "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x602a617cc052617cc05160015559600055", - "nonce" : "0x00", + "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { + "balance" : "1000000000000000000", + "code" : "{ (MSTORE 31936 42) [[ 1 ]] (MLOAD 31936) [[ 0 ]] (MSIZE) } ", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x6400000000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "429496729600", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +106,14 @@ "" ], "gasLimit" : [ - "0x50001798" + "1342183320" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", "value" : [ - "0x0a" + "10" ] } } -- 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/stMemoryTest/mem32kb-32.json | 158 ++++++++++++------------- 1 file changed, 74 insertions(+), 84 deletions(-) (limited to 'GeneralStateTests/stMemoryTest/mem32kb-32.json') diff --git a/GeneralStateTests/stMemoryTest/mem32kb-32.json b/GeneralStateTests/stMemoryTest/mem32kb-32.json index 1ac9d36c8..c52a29b0f 100644 --- a/GeneralStateTests/stMemoryTest/mem32kb-32.json +++ b/GeneralStateTests/stMemoryTest/mem32kb-32.json @@ -6,97 +6,87 @@ "source" : "/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-32Filler.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "42949672960", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x0a00000000", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : "Frontier", - "result" : { - "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "balance" : "0x0de0b6b3a764000a", - "code" : "0x602a617cc052617cc05160015559600055", - "nonce" : "0x00", - "storage" : { - "0x00" : "0x7ce0", - "0x01" : "0x2a" - } + "post" : { + "EIP150" : [ + { + "hash" : "0xf2ccd3bdd3afd712768712179ccd506a4711ceee3a6903be053399a74077ac61", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x0101b1", - "code" : "0x", - "nonce" : "0x00", - "storage" : { - } + "logs" : [ + ] + } + ], + "EIP158" : [ + { + "hash" : "0xf2ccd3bdd3afd712768712179ccd506a4711ceee3a6903be053399a74077ac61", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x63fffefe45", - "code" : "0x", - "nonce" : "0x01", - "storage" : { - } - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Homestead", - "EIP150", - "EIP158" - ], - "result" : { - "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "balance" : "0x0de0b6b3a764000a", - "code" : "0x602a617cc052617cc05160015559600055", - "nonce" : "0x00", - "storage" : { - "0x00" : "0x7ce0", - "0x01" : "0x2a" - } + ], + "Frontier" : [ + { + "hash" : "0xf2ccd3bdd3afd712768712179ccd506a4711ceee3a6903be053399a74077ac61", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0xf2ccd3bdd3afd712768712179ccd506a4711ceee3a6903be053399a74077ac61", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x0101b1", - "code" : "0x", - "nonce" : "0x00", - "storage" : { - } + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xf2ccd3bdd3afd712768712179ccd506a4711ceee3a6903be053399a74077ac61", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x63fffefe45", - "code" : "0x", - "nonce" : "0x01", - "storage" : { - } - } + "logs" : [ + ] } - } - ], + ] + }, "pre" : { - "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "balance" : "1000000000000000000", - "code" : "{ (MSTORE 31936 42) [[ 1 ]] (MLOAD 31936) [[ 0 ]] (MSIZE) } ", - "nonce" : "0", + "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x602a617cc052617cc05160015559600055", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "429496729600", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x6400000000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -106,14 +96,14 @@ "" ], "gasLimit" : [ - "1342183320" + "0x50001798" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", "value" : [ - "10" + "0x0a" ] } } -- cgit v1.2.3