Remove VM tests using the mock BLOCKHASH instruction just for VM tests

See the discussion https://github.com/ethereum/tests/issues/415#issuecomment-378593659

14 files changed, 0 insertions, 588 deletions

diff --git a/VMTests/vmBlockInfoTest/blockhash257Block.json b/VMTests/vmBlockInfoTest/blockhash257Block.json
deleted file mode 100644
index 712adc51e..000000000
--- a/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/VMTests/vmBlockInfoTest/blockhash258Block.json b/VMTests/vmBlockInfoTest/blockhash258Block.json
deleted file mode 100644
index 03578578a..000000000
--- a/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/VMTests/vmBlockInfoTest/blockhashInRange.json b/VMTests/vmBlockInfoTest/blockhashInRange.json
deleted file mode 100644
index 680e4e79c..000000000
--- a/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/VMTests/vmBlockInfoTest/blockhashMyBlock.json b/VMTests/vmBlockInfoTest/blockhashMyBlock.json
deleted file mode 100644
index 2d82f508e..000000000
--- a/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/VMTests/vmBlockInfoTest/blockhashNotExistingBlock.json b/VMTests/vmBlockInfoTest/blockhashNotExistingBlock.json
deleted file mode 100644
index 4222b2519..000000000
--- a/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/VMTests/vmBlockInfoTest/blockhashOutOfRange.json b/VMTests/vmBlockInfoTest/blockhashOutOfRange.json
deleted file mode 100644
index 7774c9e79..000000000
--- a/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/VMTests/vmBlockInfoTest/blockhashUnderFlow.json b/VMTests/vmBlockInfoTest/blockhashUnderFlow.json
deleted file mode 100644
index e2e59a534..000000000
--- a/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
diff --git a/src/VMTestsFiller/vmBlockInfoTest/blockhash257BlockFiller.json b/src/VMTestsFiller/vmBlockInfoTest/blockhash257BlockFiller.json
deleted file mode 100644
index d66e5bdc5..000000000
--- a/src/VMTestsFiller/vmBlockInfoTest/blockhash257BlockFiller.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "blockhash257Block": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "257",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-        },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (BLOCKHASH 0) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
-        }
-    }
-}
diff --git a/src/VMTestsFiller/vmBlockInfoTest/blockhash258BlockFiller.json b/src/VMTestsFiller/vmBlockInfoTest/blockhash258BlockFiller.json
deleted file mode 100644
index 00054bb4c..000000000
--- a/src/VMTestsFiller/vmBlockInfoTest/blockhash258BlockFiller.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "blockhash258Block": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "258",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-        },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (BLOCKHASH 1) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
-        }
-    }
-}
diff --git a/src/VMTestsFiller/vmBlockInfoTest/blockhashInRangeFiller.json b/src/VMTestsFiller/vmBlockInfoTest/blockhashInRangeFiller.json
deleted file mode 100644
index 861fbcb83..000000000
--- a/src/VMTestsFiller/vmBlockInfoTest/blockhashInRangeFiller.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "blockhashInRange": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "257",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-        },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x" : "0xc89efdaa54c0f20c7adf612882df0950f5a951637e0307cdcb4c672f298b8bc6",
-                    "0x01" : "0xad7c5bef027816a800da1736444fb58a807ef4c9603b7848673f7e3a68eb14a5",
-                    "0x02" : "0x6ca54da2c4784ea43fd88b3402de07ae4bced597cbb19f323b7595857a6720ae"
-                }
-            }
-        },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (BLOCKHASH 1) [[ 1 ]] (BLOCKHASH 2) [[ 2 ]] (BLOCKHASH 256) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
-        }
-    }
-}
diff --git a/src/VMTestsFiller/vmBlockInfoTest/blockhashMyBlockFiller.json b/src/VMTestsFiller/vmBlockInfoTest/blockhashMyBlockFiller.json
deleted file mode 100644
index 769600168..000000000
--- a/src/VMTestsFiller/vmBlockInfoTest/blockhashMyBlockFiller.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "blockhashMyBlock": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "1",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-        },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (BLOCKHASH 1) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
-        }
-    }
-}
diff --git a/src/VMTestsFiller/vmBlockInfoTest/blockhashNotExistingBlockFiller.json b/src/VMTestsFiller/vmBlockInfoTest/blockhashNotExistingBlockFiller.json
deleted file mode 100644
index 8ce97bac9..000000000
--- a/src/VMTestsFiller/vmBlockInfoTest/blockhashNotExistingBlockFiller.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "blockhashNotExistingBlock": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "1",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-        },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                   "storage" : {
-                }
-            }
-        },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (BLOCKHASH 2) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
-        }
-    }
-}
diff --git a/src/VMTestsFiller/vmBlockInfoTest/blockhashOutOfRangeFiller.json b/src/VMTestsFiller/vmBlockInfoTest/blockhashOutOfRangeFiller.json
deleted file mode 100644
index f6c7c8d2b..000000000
--- a/src/VMTestsFiller/vmBlockInfoTest/blockhashOutOfRangeFiller.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "blockhashOutOfRange": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "257",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-        },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (BLOCKHASH 0) [[ 1 ]] (BLOCKHASH 257) [[ 2 ]] (BLOCKHASH 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
-        }
-    }
-}
diff --git a/src/VMTestsFiller/vmBlockInfoTest/blockhashUnderFlowFiller.json b/src/VMTestsFiller/vmBlockInfoTest/blockhashUnderFlowFiller.json
deleted file mode 100644
index 744dc065f..000000000
--- a/src/VMTestsFiller/vmBlockInfoTest/blockhashUnderFlowFiller.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "blockhashUnderFlow": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "1",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-        },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "(asm BLOCKHASH)",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
-        }
-    }
-}