From 1b781aefe9ca2a3a4347aa70f75c13dc82ada1b1 Mon Sep 17 00:00:00 2001 From: Dustin Brody Date: Tue, 31 Jul 2018 17:09:37 -0700 Subject: [PATCH] pursuant to discussion in https://github.com/ethereum/tests/pull/444 refactor tests to not require special-cased codepaths for a VMTest mode by allowing BLOCKHASH-dependent tests to live where actual blockchain state is provided by fixture --- VMTests.md | 9 +--- .../vmBlockInfoTest/blockhash257Block.json | 51 ------------------ .../vmBlockInfoTest/blockhash258Block.json | 51 ------------------ .../vmBlockInfoTest/blockhashInRange.json | 54 ------------------- .../vmBlockInfoTest/blockhashMyBlock.json | 51 ------------------ .../blockhashNotExistingBlock.json | 51 ------------------ .../vmBlockInfoTest/blockhashOutOfRange.json | 51 ------------------ .../vmBlockInfoTest/blockhashUnderFlow.json | 37 ------------- 8 files changed, 1 insertion(+), 354 deletions(-) delete mode 100644 tests/fixtures/VMTests/vmBlockInfoTest/blockhash257Block.json delete mode 100644 tests/fixtures/VMTests/vmBlockInfoTest/blockhash258Block.json delete mode 100644 tests/fixtures/VMTests/vmBlockInfoTest/blockhashInRange.json delete mode 100644 tests/fixtures/VMTests/vmBlockInfoTest/blockhashMyBlock.json delete mode 100644 tests/fixtures/VMTests/vmBlockInfoTest/blockhashNotExistingBlock.json delete mode 100644 tests/fixtures/VMTests/vmBlockInfoTest/blockhashOutOfRange.json delete mode 100644 tests/fixtures/VMTests/vmBlockInfoTest/blockhashUnderFlow.json diff --git a/VMTests.md b/VMTests.md index 6e0495c9b..2bb848ea3 100644 --- a/VMTests.md +++ b/VMTests.md @@ -265,20 +265,13 @@ OK: 195/195 Fail: 0/195 Skip: 0/195 OK: 60/60 Fail: 0/60 Skip: 0/60 ## vmBlockInfoTest ```diff -+ blockhash257Block.json OK -+ blockhash258Block.json OK -- blockhashInRange.json Fail -+ blockhashMyBlock.json OK -+ blockhashNotExistingBlock.json OK -+ blockhashOutOfRange.json OK -+ blockhashUnderFlow.json OK + coinbase.json OK + difficulty.json OK + gaslimit.json OK + number.json OK + timestamp.json OK ``` -OK: 11/12 Fail: 1/12 Skip: 0/12 +OK: 5/5 Fail: 0/5 Skip: 0/5 ## vmEnvironmentalInfo ```diff + ExtCodeSizeAddressInputTooBigLeftMyAddress.json OK diff --git a/tests/fixtures/VMTests/vmBlockInfoTest/blockhash257Block.json b/tests/fixtures/VMTests/vmBlockInfoTest/blockhash257Block.json deleted file mode 100644 index 712adc51e..000000000 --- a/tests/fixtures/VMTests/vmBlockInfoTest/blockhash257Block.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "blockhash257Block" : { - "_info" : { - "comment" : "", - "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++", - "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++", - "source" : "src/VMTestsFiller/vmBlockInfoTest/blockhash257BlockFiller.json", - "sourceHash" : "902c36b18cf6d8824f870ac4f954d101b70c10d42cf25c036e1f40db5fb871f3" - }, - "callcreates" : [ - ], - "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", - "currentDifficulty" : "0x0100", - "currentGasLimit" : "0x0f4240", - "currentNumber" : "0x0101", - "currentTimestamp" : "0x01" - }, - "exec" : { - "address" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", - "caller" : "0xcd1722f3947def4cf144679da39c4c32bdc35681", - "code" : "0x600040600055", - "data" : "0x", - "gas" : "0x0186a0", - "gasPrice" : "0x5af3107a4000", - "origin" : "0xcd1722f3947def4cf144679da39c4c32bdc35681", - "value" : "0x0de0b6b3a7640000" - }, - "gas" : "0x0172fe", - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", - "out" : "0x", - "post" : { - "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "balance" : "0x152d02c7e14af6800000", - "code" : "0x600040600055", - "nonce" : "0x00", - "storage" : { - } - } - }, - "pre" : { - "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "balance" : "0x152d02c7e14af6800000", - "code" : "0x600040600055", - "nonce" : "0x00", - "storage" : { - } - } - } - } -} \ No newline at end of file diff --git a/tests/fixtures/VMTests/vmBlockInfoTest/blockhash258Block.json b/tests/fixtures/VMTests/vmBlockInfoTest/blockhash258Block.json deleted file mode 100644 index 03578578a..000000000 --- a/tests/fixtures/VMTests/vmBlockInfoTest/blockhash258Block.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "blockhash258Block" : { - "_info" : { - "comment" : "", - "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++", - "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++", - "source" : "src/VMTestsFiller/vmBlockInfoTest/blockhash258BlockFiller.json", - "sourceHash" : "5793008a2fa566316ff3369573ab0100c3750cf1b10e053a9e419dc5c208995b" - }, - "callcreates" : [ - ], - "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", - "currentDifficulty" : "0x0100", - "currentGasLimit" : "0x0f4240", - "currentNumber" : "0x0102", - "currentTimestamp" : "0x01" - }, - "exec" : { - "address" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", - "caller" : "0xcd1722f3947def4cf144679da39c4c32bdc35681", - "code" : "0x600140600055", - "data" : "0x", - "gas" : "0x0186a0", - "gasPrice" : "0x5af3107a4000", - "origin" : "0xcd1722f3947def4cf144679da39c4c32bdc35681", - "value" : "0x0de0b6b3a7640000" - }, - "gas" : "0x0172fe", - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", - "out" : "0x", - "post" : { - "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "balance" : "0x152d02c7e14af6800000", - "code" : "0x600140600055", - "nonce" : "0x00", - "storage" : { - } - } - }, - "pre" : { - "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "balance" : "0x152d02c7e14af6800000", - "code" : "0x600140600055", - "nonce" : "0x00", - "storage" : { - } - } - } - } -} \ No newline at end of file diff --git a/tests/fixtures/VMTests/vmBlockInfoTest/blockhashInRange.json b/tests/fixtures/VMTests/vmBlockInfoTest/blockhashInRange.json deleted file mode 100644 index 680e4e79c..000000000 --- a/tests/fixtures/VMTests/vmBlockInfoTest/blockhashInRange.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "blockhashInRange" : { - "_info" : { - "comment" : "", - "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++", - "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++", - "source" : "src/VMTestsFiller/vmBlockInfoTest/blockhashInRangeFiller.json", - "sourceHash" : "b96e90e7810595461f8ab20bde3452ab7aad8d982649eb0a926331b503661da7" - }, - "callcreates" : [ - ], - "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", - "currentDifficulty" : "0x0100", - "currentGasLimit" : "0x0f4240", - "currentNumber" : "0x0101", - "currentTimestamp" : "0x01" - }, - "exec" : { - "address" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", - "caller" : "0xcd1722f3947def4cf144679da39c4c32bdc35681", - "code" : "0x60014060005560024060015561010040600255", - "data" : "0x", - "gas" : "0x0186a0", - "gasPrice" : "0x5af3107a4000", - "origin" : "0xcd1722f3947def4cf144679da39c4c32bdc35681", - "value" : "0x0de0b6b3a7640000" - }, - "gas" : "0x9bf2", - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", - "out" : "0x", - "post" : { - "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "balance" : "0x152d02c7e14af6800000", - "code" : "0x60014060005560024060015561010040600255", - "nonce" : "0x00", - "storage" : { - "0x00" : "0xc89efdaa54c0f20c7adf612882df0950f5a951637e0307cdcb4c672f298b8bc6", - "0x01" : "0xad7c5bef027816a800da1736444fb58a807ef4c9603b7848673f7e3a68eb14a5", - "0x02" : "0x6ca54da2c4784ea43fd88b3402de07ae4bced597cbb19f323b7595857a6720ae" - } - } - }, - "pre" : { - "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "balance" : "0x152d02c7e14af6800000", - "code" : "0x60014060005560024060015561010040600255", - "nonce" : "0x00", - "storage" : { - } - } - } - } -} \ No newline at end of file diff --git a/tests/fixtures/VMTests/vmBlockInfoTest/blockhashMyBlock.json b/tests/fixtures/VMTests/vmBlockInfoTest/blockhashMyBlock.json deleted file mode 100644 index 2d82f508e..000000000 --- a/tests/fixtures/VMTests/vmBlockInfoTest/blockhashMyBlock.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "blockhashMyBlock" : { - "_info" : { - "comment" : "", - "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++", - "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++", - "source" : "src/VMTestsFiller/vmBlockInfoTest/blockhashMyBlockFiller.json", - "sourceHash" : "1b1d7531b88d196f4402b74de942ec0e32fe7dc4e893945c56dff52acc8baf76" - }, - "callcreates" : [ - ], - "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", - "currentDifficulty" : "0x0100", - "currentGasLimit" : "0x0f4240", - "currentNumber" : "0x01", - "currentTimestamp" : "0x01" - }, - "exec" : { - "address" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", - "caller" : "0xcd1722f3947def4cf144679da39c4c32bdc35681", - "code" : "0x600140600055", - "data" : "0x", - "gas" : "0x0186a0", - "gasPrice" : "0x5af3107a4000", - "origin" : "0xcd1722f3947def4cf144679da39c4c32bdc35681", - "value" : "0x0de0b6b3a7640000" - }, - "gas" : "0x0172fe", - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", - "out" : "0x", - "post" : { - "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "balance" : "0x152d02c7e14af6800000", - "code" : "0x600140600055", - "nonce" : "0x00", - "storage" : { - } - } - }, - "pre" : { - "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "balance" : "0x152d02c7e14af6800000", - "code" : "0x600140600055", - "nonce" : "0x00", - "storage" : { - } - } - } - } -} \ No newline at end of file diff --git a/tests/fixtures/VMTests/vmBlockInfoTest/blockhashNotExistingBlock.json b/tests/fixtures/VMTests/vmBlockInfoTest/blockhashNotExistingBlock.json deleted file mode 100644 index 4222b2519..000000000 --- a/tests/fixtures/VMTests/vmBlockInfoTest/blockhashNotExistingBlock.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "blockhashNotExistingBlock" : { - "_info" : { - "comment" : "", - "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++", - "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++", - "source" : "src/VMTestsFiller/vmBlockInfoTest/blockhashNotExistingBlockFiller.json", - "sourceHash" : "dc44164798b65c60f74bbad93a07fa6eb8aeda8a2c3ca5b8224186383bc207eb" - }, - "callcreates" : [ - ], - "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", - "currentDifficulty" : "0x0100", - "currentGasLimit" : "0x0f4240", - "currentNumber" : "0x01", - "currentTimestamp" : "0x01" - }, - "exec" : { - "address" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", - "caller" : "0xcd1722f3947def4cf144679da39c4c32bdc35681", - "code" : "0x600240600055", - "data" : "0x", - "gas" : "0x0186a0", - "gasPrice" : "0x5af3107a4000", - "origin" : "0xcd1722f3947def4cf144679da39c4c32bdc35681", - "value" : "0x0de0b6b3a7640000" - }, - "gas" : "0x0172fe", - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", - "out" : "0x", - "post" : { - "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "balance" : "0x152d02c7e14af6800000", - "code" : "0x600240600055", - "nonce" : "0x00", - "storage" : { - } - } - }, - "pre" : { - "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "balance" : "0x152d02c7e14af6800000", - "code" : "0x600240600055", - "nonce" : "0x00", - "storage" : { - } - } - } - } -} \ No newline at end of file diff --git a/tests/fixtures/VMTests/vmBlockInfoTest/blockhashOutOfRange.json b/tests/fixtures/VMTests/vmBlockInfoTest/blockhashOutOfRange.json deleted file mode 100644 index 7774c9e79..000000000 --- a/tests/fixtures/VMTests/vmBlockInfoTest/blockhashOutOfRange.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "blockhashOutOfRange" : { - "_info" : { - "comment" : "", - "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++", - "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++", - "source" : "src/VMTestsFiller/vmBlockInfoTest/blockhashOutOfRangeFiller.json", - "sourceHash" : "7a97a9d30c10e23783c12e25dbd5d4930e7b8cc6522217dfcbf7d3e422c54e96" - }, - "callcreates" : [ - ], - "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", - "currentDifficulty" : "0x0100", - "currentGasLimit" : "0x0f4240", - "currentNumber" : "0x0101", - "currentTimestamp" : "0x01" - }, - "exec" : { - "address" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", - "caller" : "0xcd1722f3947def4cf144679da39c4c32bdc35681", - "code" : "0x600040600055610101406001557fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40600255", - "data" : "0x", - "gas" : "0x0186a0", - "gasPrice" : "0x5af3107a4000", - "origin" : "0xcd1722f3947def4cf144679da39c4c32bdc35681", - "value" : "0x0de0b6b3a7640000" - }, - "gas" : "0x014bba", - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", - "out" : "0x", - "post" : { - "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "balance" : "0x152d02c7e14af6800000", - "code" : "0x600040600055610101406001557fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40600255", - "nonce" : "0x00", - "storage" : { - } - } - }, - "pre" : { - "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "balance" : "0x152d02c7e14af6800000", - "code" : "0x600040600055610101406001557fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40600255", - "nonce" : "0x00", - "storage" : { - } - } - } - } -} \ No newline at end of file diff --git a/tests/fixtures/VMTests/vmBlockInfoTest/blockhashUnderFlow.json b/tests/fixtures/VMTests/vmBlockInfoTest/blockhashUnderFlow.json deleted file mode 100644 index e2e59a534..000000000 --- a/tests/fixtures/VMTests/vmBlockInfoTest/blockhashUnderFlow.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "blockhashUnderFlow" : { - "_info" : { - "comment" : "", - "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++", - "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++", - "source" : "src/VMTestsFiller/vmBlockInfoTest/blockhashUnderFlowFiller.json", - "sourceHash" : "25a01993d3f342fe181532207fcec292677aa988b05553d328b5aa9b13db08f8" - }, - "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", - "currentDifficulty" : "0x0100", - "currentGasLimit" : "0x0f4240", - "currentNumber" : "0x01", - "currentTimestamp" : "0x01" - }, - "exec" : { - "address" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", - "caller" : "0xcd1722f3947def4cf144679da39c4c32bdc35681", - "code" : "0x40", - "data" : "0x", - "gas" : "0x0186a0", - "gasPrice" : "0x5af3107a4000", - "origin" : "0xcd1722f3947def4cf144679da39c4c32bdc35681", - "value" : "0x0de0b6b3a7640000" - }, - "pre" : { - "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "balance" : "0x152d02c7e14af6800000", - "code" : "0x40", - "nonce" : "0x00", - "storage" : { - } - } - } - } -} \ No newline at end of file