Merge pull request #445 from pirapira/remove-random-balance

Remove VM random tests that contain `BALANCE`

4 files changed, 194 insertions, 80 deletions

diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/201503110226PYTHON_DUP6_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/201503110226PYTHON_DUP6_d0g0v0Filler.json
new file mode 100644
index 000000000..9546e6968
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/201503110226PYTHON_DUP6_d0g0v0Filler.json
@@ -0,0 +1,136 @@
+{
+    "201503110226PYTHON_DUP6_d0g0v0" : {
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x0f4240",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0x2710",
+                        "gasPrice" : "0x5af3107a4000",
+                        "nonce" : "0x00",
+                        "r" : "0xbd9931f1a419c5bd113c3b26f1a8d32665e5c3f5f70a9f820a49e9dece32a167",
+                        "s" : "0x478e1d7798f920d53dceab9abd785c277b11f4f49d0651bfd5fb5314f22aed42",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0de0b6b3a7640000"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                        "balance" : "0x0de0b6b3a7640000",
+                        "code" : "0x45414443434042405b85",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                        "balance" : "0x0de0b6b3a7640000",
+                        "code" : "0x45414443434042405b85",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                        "balance" : "0x0de0b6b3a7640000",
+                        "code" : "0x45414443434042405b85",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                        "balance" : "0x0de0b6b3a7640000",
+                        "code" : "0x45414443434042405b85",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                        "balance" : "0x0de0b6b3a7640000",
+                        "code" : "0x45414443434042405b85",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                        "balance" : "0x0de0b6b3a7640000",
+                        "code" : "0x45414443434042405b85",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x45414443434042405b85",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x38beec8feeca2598",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/GeneralStateTestsFiller/stRandom2/201503110226PYTHON_DUP6Filler.json b/src/GeneralStateTestsFiller/stRandom2/201503110226PYTHON_DUP6Filler.json
new file mode 100644
index 000000000..25a1512b3
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stRandom2/201503110226PYTHON_DUP6Filler.json
@@ -0,0 +1,58 @@
+{
+    "201503110226PYTHON_DUP6" : {
+        "_info" : {
+            "comment" : "This test used to be a VM test and it once failed in python client some day.  Since the test contains a BALANCE instruction (which must be mocked), it's moved to GeneralSateTest https://github.com/ethereum/tests/pull/445/files#r179426325"
+        },
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x20000",
+            "currentGasLimit" : "1000000",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "pre": {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+                "balance": "0x38beec8feeca2598",
+                "code": "",
+                "nonce": "0x00",
+                "storage": {}
+            },
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x45414443434042405b85",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "secretKey": "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "data" : ["0x"],
+            "gasLimit" : ["10000"],
+            "gasPrice" : "100000000000000",
+            "value" : ["1000000000000000000"],
+            "nonce" : "0x00"
+        },
+        "expect" : [
+            {
+	            "indexes" : {
+	                "data" : -1,
+	                "gas" : -1,
+	                "value" : -1
+	            },
+	            "network" : [">=Frontier"],
+                "result" : {
+                    "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                        "balance" : "1000000000000000000",
+                        "code" : "0x45414443434042405b85",
+                        "nonce" : "0",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ]
+    }
+}
diff --git a/src/VMTestsFiller/vmRandomTest/201503110226PYTHON_DUP6Filler.json b/src/VMTestsFiller/vmRandomTest/201503110226PYTHON_DUP6Filler.json
deleted file mode 100644
index 787fd12eb..000000000
--- a/src/VMTestsFiller/vmRandomTest/201503110226PYTHON_DUP6Filler.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "201503110226PYTHON_DUP6" : {
-        "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
-            "currentGasLimit" : "1000000",
-            "currentNumber" : "300",
-            "currentTimestamp" : "2",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "code" : "0x45414443434042405b85",
-            "data" : "0x",
-            "gas" : "10000",
-            "gasPrice" : "100000000000000",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000"
-        },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "code" : "0x45414443434042405b85",
-                "nonce" : "0",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "code" : "0x45414443434042405b85",
-                "nonce" : "0",
-                "storage" : {
-                }
-            }
-        }
-    }
-}
diff --git a/src/VMTestsFiller/vmRandomTest/randomTestFiller.json b/src/VMTestsFiller/vmRandomTest/randomTestFiller.json
deleted file mode 100644
index baf3736aa..000000000
--- a/src/VMTestsFiller/vmRandomTest/randomTestFiller.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "randomVMtest" : {
-        "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
-            "currentGasLimit" : "1000000",
-            "currentNumber" : "300",
-            "currentTimestamp" : "2",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "code" : "0x41404043404340427b40620b775255",
-            "data" : "0x",
-            "gas" : "10000",
-            "gasPrice" : "100000000000000",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000"
-        },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "code" : "0x41404043404340427b40620b775255",
-                "nonce" : "0",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "code" : "0x41404043404340427b40620b775255",
-                "nonce" : "0",
-                "storage" : {
-                }
-            }
-        }
-    }
-}