From f71c2688e1a839f8429f7e94ec5e56bb182d82cf Mon Sep 17 00:00:00 2001 From: Dimitry Date: Tue, 1 Aug 2017 09:11:00 +0300 Subject: regenerate hive tests --- .../stRevertTest/RevertPrecompiledTouchCC.json | 172 ++++++++++----------- 1 file changed, 79 insertions(+), 93 deletions(-) (limited to 'GeneralStateTests/stRevertTest/RevertPrecompiledTouchCC.json') diff --git a/GeneralStateTests/stRevertTest/RevertPrecompiledTouchCC.json b/GeneralStateTests/stRevertTest/RevertPrecompiledTouchCC.json index 237ae82c9..b801cecca 100644 --- a/GeneralStateTests/stRevertTest/RevertPrecompiledTouchCC.json +++ b/GeneralStateTests/stRevertTest/RevertPrecompiledTouchCC.json @@ -2,137 +2,123 @@ "RevertPrecompiledTouchCC" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stRevertTest/RevertPrecompiledTouchCCFiller.json" }, "env" : { - "currentCoinbase" : "0x68795C4AA09D6f4Ed3E5DeDDf8c2AD3049A601da", + "currentCoinbase" : "68795C4AA09D6f4Ed3E5DeDDf8c2AD3049A601da", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x3d37ef", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "4012015", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xde48a41a0688b373a48fd2e17d4c4221a8c3c8fd0b7d15318bb40c4320418dee", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "0" + }, + "0000000000000000000000000000000000000002" : { + "balance" : "0" + }, + "0000000000000000000000000000000000000003" : { + "balance" : "0" + }, + "0000000000000000000000000000000000000004" : { + "balance" : "0" + }, + "0000000000000000000000000000000000000005" : { + "balance" : "0" + }, + "0000000000000000000000000000000000000006" : { + "balance" : "0" + }, + "0000000000000000000000000000000000000007" : { + "balance" : "0" + }, + "0000000000000000000000000000000000000008" : { + "balance" : "0" } } - ], - "EIP158" : [ - { - "hash" : "0xde48a41a0688b373a48fd2e17d4c4221a8c3c8fd0b7d15318bb40c4320418dee", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xde48a41a0688b373a48fd2e17d4c4221a8c3c8fd0b7d15318bb40c4320418dee", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xde48a41a0688b373a48fd2e17d4c4221a8c3c8fd0b7d15318bb40c4320418dee", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xde48a41a0688b373a48fd2e17d4c4221a8c3c8fd0b7d15318bb40c4320418dee", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "0", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "0", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "0", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "0", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "0", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "0", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "0", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "0", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x60006000600060006000600161c350f25060006000600060006000600261c350f25060006000600060006000600361c350f25060006000600060006000600461c350f25060006000600060006000600561c350f25060006000600060006000600661c350f25060006000600060006000600761c350f25060006000600060006000600861c350f2505a6001555a6002555a600355", - "nonce" : "0x00", + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "code" : "{ (CALLCODE 50000 1 0 0 0 0 0) (CALLCODE 50000 2 0 0 0 0 0) (CALLCODE 50000 3 0 0 0 0 0) (CALLCODE 50000 4 0 0 0 0 0) (CALLCODE 50000 5 0 0 0 0 0) (CALLCODE 50000 6 0 0 0 0 0) (CALLCODE 50000 7 0 0 0 0 0) (CALLCODE 50000 8 0 0 0 0 0) [[1]] (GAS) [[2]] (GAS) [[3]] (GAS) }", + "nonce" : "0", "storage" : { } } @@ -142,14 +128,14 @@ "" ], "gasLimit" : [ - "0xea60" + "60000" ], - "gasPrice" : "0x01", - "nonce" : "0x01", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "1", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "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 --- .../stRevertTest/RevertPrecompiledTouchCC.json | 172 ++++++++++++--------- 1 file changed, 98 insertions(+), 74 deletions(-) (limited to 'GeneralStateTests/stRevertTest/RevertPrecompiledTouchCC.json') diff --git a/GeneralStateTests/stRevertTest/RevertPrecompiledTouchCC.json b/GeneralStateTests/stRevertTest/RevertPrecompiledTouchCC.json index b801cecca..76c72710d 100644 --- a/GeneralStateTests/stRevertTest/RevertPrecompiledTouchCC.json +++ b/GeneralStateTests/stRevertTest/RevertPrecompiledTouchCC.json @@ -6,119 +6,143 @@ "source" : "/src/GeneralStateTestsFiller/stRevertTest/RevertPrecompiledTouchCCFiller.json" }, "env" : { - "currentCoinbase" : "68795C4AA09D6f4Ed3E5DeDDf8c2AD3049A601da", + "currentCoinbase" : "0x68795C4AA09D6f4Ed3E5DeDDf8c2AD3049A601da", "currentDifficulty" : "0x020000", - "currentGasLimit" : "4012015", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x3d37ef", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP158" - ], - "result" : { - "0000000000000000000000000000000000000001" : { - "balance" : "0" + "post" : { + "EIP150" : [ + { + "hash" : "0xde48a41a0688b373a48fd2e17d4c4221a8c3c8fd0b7d15318bb40c4320418dee", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "0000000000000000000000000000000000000002" : { - "balance" : "0" - }, - "0000000000000000000000000000000000000003" : { - "balance" : "0" - }, - "0000000000000000000000000000000000000004" : { - "balance" : "0" + "logs" : [ + ] + } + ], + "EIP158" : [ + { + "hash" : "0xde48a41a0688b373a48fd2e17d4c4221a8c3c8fd0b7d15318bb40c4320418dee", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "0000000000000000000000000000000000000005" : { - "balance" : "0" + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0xde48a41a0688b373a48fd2e17d4c4221a8c3c8fd0b7d15318bb40c4320418dee", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "0000000000000000000000000000000000000006" : { - "balance" : "0" + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0xde48a41a0688b373a48fd2e17d4c4221a8c3c8fd0b7d15318bb40c4320418dee", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "0000000000000000000000000000000000000007" : { - "balance" : "0" + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xde48a41a0688b373a48fd2e17d4c4221a8c3c8fd0b7d15318bb40c4320418dee", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "0000000000000000000000000000000000000008" : { - "balance" : "0" - } + "logs" : [ + ] } - } - ], + ] + }, "pre" : { - "0000000000000000000000000000000000000001" : { - "balance" : "0", + "0x0000000000000000000000000000000000000001" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "0000000000000000000000000000000000000002" : { - "balance" : "0", + "0x0000000000000000000000000000000000000002" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "0000000000000000000000000000000000000003" : { - "balance" : "0", + "0x0000000000000000000000000000000000000003" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "0000000000000000000000000000000000000004" : { - "balance" : "0", + "0x0000000000000000000000000000000000000004" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "0000000000000000000000000000000000000005" : { - "balance" : "0", + "0x0000000000000000000000000000000000000005" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "0000000000000000000000000000000000000006" : { - "balance" : "0", + "0x0000000000000000000000000000000000000006" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "0000000000000000000000000000000000000007" : { - "balance" : "0", + "0x0000000000000000000000000000000000000007" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "0000000000000000000000000000000000000008" : { - "balance" : "0", + "0x0000000000000000000000000000000000000008" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0de0b6b3a7640000", "code" : "", - "nonce" : "1", + "nonce" : "0x01", "storage" : { } }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", - "code" : "{ (CALLCODE 50000 1 0 0 0 0 0) (CALLCODE 50000 2 0 0 0 0 0) (CALLCODE 50000 3 0 0 0 0 0) (CALLCODE 50000 4 0 0 0 0 0) (CALLCODE 50000 5 0 0 0 0 0) (CALLCODE 50000 6 0 0 0 0 0) (CALLCODE 50000 7 0 0 0 0 0) (CALLCODE 50000 8 0 0 0 0 0) [[1]] (GAS) [[2]] (GAS) [[3]] (GAS) }", - "nonce" : "0", + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", + "code" : "0x60006000600060006000600161c350f25060006000600060006000600261c350f25060006000600060006000600361c350f25060006000600060006000600461c350f25060006000600060006000600561c350f25060006000600060006000600661c350f25060006000600060006000600761c350f25060006000600060006000600861c350f2505a6001555a6002555a600355", + "nonce" : "0x00", "storage" : { } } @@ -128,14 +152,14 @@ "" ], "gasLimit" : [ - "60000" + "0xea60" ], - "gasPrice" : "1", - "nonce" : "1", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x01", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0" + "0x00" ] } } -- cgit v1.2.3