From f71c2688e1a839f8429f7e94ec5e56bb182d82cf Mon Sep 17 00:00:00 2001 From: Dimitry Date: Tue, 1 Aug 2017 09:11:00 +0300 Subject: regenerate hive tests --- .../stQuadraticComplexityTest/Callcode50000.json | 172 ++++++++------------- 1 file changed, 62 insertions(+), 110 deletions(-) (limited to 'GeneralStateTests/stQuadraticComplexityTest/Callcode50000.json') diff --git a/GeneralStateTests/stQuadraticComplexityTest/Callcode50000.json b/GeneralStateTests/stQuadraticComplexityTest/Callcode50000.json index b527188db..2e4b19f40 100644 --- a/GeneralStateTests/stQuadraticComplexityTest/Callcode50000.json +++ b/GeneralStateTests/stQuadraticComplexityTest/Callcode50000.json @@ -1,124 +1,76 @@ { "Callcode50000" : { + "_info" : { + "comment" : "", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", + "source" : "/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Callcode50000Filler.json" + }, "env" : { - "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x0200999600", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "8600000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x5282cd6886b4b6eb8f27ebbb6dcf16f55f3506b011e2eda340300c7ddca7a99a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x85a4897fec73dcb66fd8d0c06a313480f7fb49e722554a7de90f8bc9688e6060", - "indexes" : { - "data" : 0, - "gas" : 1, - "value" : 0 - } - } - ], - "EIP158" : [ - { - "hash" : "0x5282cd6886b4b6eb8f27ebbb6dcf16f55f3506b011e2eda340300c7ddca7a99a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : 1, + "value" : -1 }, - { - "hash" : "0x85a4897fec73dcb66fd8d0c06a313480f7fb49e722554a7de90f8bc9688e6060", - "indexes" : { - "data" : 0, - "gas" : 1, - "value" : 0 + "network" : [ + "ALL" + ], + "result" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "code" : "0x", + "nonce" : "0x01", + "storage" : { + } + }, + "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "code" : "0x", + "nonce" : "0x00", + "storage" : { + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "250000000", + "code" : "0x", + "nonce" : "0x00", + "storage" : { + } + }, + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "code" : "0x5b61c3506080511015603f576000600061c3506000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b610640f26000556001608051016080526000565b608051600155", + "nonce" : "0x00", + "storage" : { + } } } - ], - "Frontier" : [ - { - "hash" : "0x5282cd6886b4b6eb8f27ebbb6dcf16f55f3506b011e2eda340300c7ddca7a99a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x85a4897fec73dcb66fd8d0c06a313480f7fb49e722554a7de90f8bc9688e6060", - "indexes" : { - "data" : 0, - "gas" : 1, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x5282cd6886b4b6eb8f27ebbb6dcf16f55f3506b011e2eda340300c7ddca7a99a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x85a4897fec73dcb66fd8d0c06a313480f7fb49e722554a7de90f8bc9688e6060", - "indexes" : { - "data" : 0, - "gas" : 1, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x5282cd6886b4b6eb8f27ebbb6dcf16f55f3506b011e2eda340300c7ddca7a99a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x85a4897fec73dcb66fd8d0c06a313480f7fb49e722554a7de90f8bc9688e6060", - "indexes" : { - "data" : 0, - "gas" : 1, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0xffffffffffffffffffffffffffffffff", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x1b58", + "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "7000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0fffffffffffff", - "code" : "0x5b61c3506080511015603f576000600061c3506000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b610640f26000556001608051016080526000565b608051600155", - "nonce" : "0x00", + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xfffffffffffff", + "code" : "{ (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALLCODE 1600 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 50000 0 0) ) [[ 1 ]] @i}", + "nonce" : "0", "storage" : { } } @@ -128,15 +80,15 @@ "" ], "gasLimit" : [ - "0x0249f0", - "0x0ee6b280" + "150000", + "250000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b", "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 --- .../stQuadraticComplexityTest/Callcode50000.json | 183 ++++++++++++++------- 1 file changed, 128 insertions(+), 55 deletions(-) (limited to 'GeneralStateTests/stQuadraticComplexityTest/Callcode50000.json') diff --git a/GeneralStateTests/stQuadraticComplexityTest/Callcode50000.json b/GeneralStateTests/stQuadraticComplexityTest/Callcode50000.json index 2e4b19f40..23879f221 100644 --- a/GeneralStateTests/stQuadraticComplexityTest/Callcode50000.json +++ b/GeneralStateTests/stQuadraticComplexityTest/Callcode50000.json @@ -6,71 +6,144 @@ "source" : "/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Callcode50000Filler.json" }, "env" : { - "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", "currentDifficulty" : "0x020000", - "currentGasLimit" : "8600000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x0200999600", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : 1, - "value" : -1 + "post" : { + "EIP150" : [ + { + "hash" : "0x5282cd6886b4b6eb8f27ebbb6dcf16f55f3506b011e2eda340300c7ddca7a99a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "ALL" - ], - "result" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "code" : "0x", - "nonce" : "0x01", - "storage" : { - } + { + "hash" : "0x85a4897fec73dcb66fd8d0c06a313480f7fb49e722554a7de90f8bc9688e6060", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 }, - "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "code" : "0x", - "nonce" : "0x00", - "storage" : { - } + "logs" : [ + ] + } + ], + "EIP158" : [ + { + "hash" : "0x5282cd6886b4b6eb8f27ebbb6dcf16f55f3506b011e2eda340300c7ddca7a99a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "250000000", - "code" : "0x", - "nonce" : "0x00", - "storage" : { - } + "logs" : [ + ] + }, + { + "hash" : "0x85a4897fec73dcb66fd8d0c06a313480f7fb49e722554a7de90f8bc9688e6060", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 }, - "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "code" : "0x5b61c3506080511015603f576000600061c3506000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b610640f26000556001608051016080526000565b608051600155", - "nonce" : "0x00", - "storage" : { - } - } + "logs" : [ + ] } - } - ], + ], + "Frontier" : [ + { + "hash" : "0x5282cd6886b4b6eb8f27ebbb6dcf16f55f3506b011e2eda340300c7ddca7a99a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x85a4897fec73dcb66fd8d0c06a313480f7fb49e722554a7de90f8bc9688e6060", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x5282cd6886b4b6eb8f27ebbb6dcf16f55f3506b011e2eda340300c7ddca7a99a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x85a4897fec73dcb66fd8d0c06a313480f7fb49e722554a7de90f8bc9688e6060", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x5282cd6886b4b6eb8f27ebbb6dcf16f55f3506b011e2eda340300c7ddca7a99a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x85a4897fec73dcb66fd8d0c06a313480f7fb49e722554a7de90f8bc9688e6060", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0xffffffffffffffffffffffffffffffff", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "7000", + "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x1b58", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xfffffffffffff", - "code" : "{ (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALLCODE 1600 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 50000 0 0) ) [[ 1 ]] @i}", - "nonce" : "0", + "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0fffffffffffff", + "code" : "0x5b61c3506080511015603f576000600061c3506000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b610640f26000556001608051016080526000565b608051600155", + "nonce" : "0x00", "storage" : { } } @@ -80,15 +153,15 @@ "" ], "gasLimit" : [ - "150000", - "250000000" + "0x0249f0", + "0x0ee6b280" ], - "gasPrice" : "1", - "nonce" : "", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "10" + "0x0a" ] } } -- cgit v1.2.3