Updates to VM tests.

1 files changed, 48 insertions, 61 deletions

diff --git a/vmtests.json b/vmtests.json
index 3b1d2db1..a05975c9 100644
--- a/vmtests.json
+++ b/vmtests.json
@@ -2,26 +2,30 @@
 	"suicide": {
 		"env" : {
 		"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-		"previousNonce" : "9c9c6567b5ec0c5f3f25df79be42707090f1e62e9db84cbb556ae2a2f6ccccae",
+		"currentNumber" : "0",
+		"currentGasLimit" : "1000000",
 		"currentDifficulty" : "256",
 		"currentTimestamp" : 1,
 		"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-		"feeMultiplier" : 1
+		"code" : "(suicide (caller))"
 		},
 		"pre" : {
 		"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-			"balance" : 1000000000000000000,
+			"balance" : "1000000000000000000",
 			"nonce" : 0,
-			"code" : "(suicide (txsender))"
+			"code" : "(suicide (caller))",
+			"storage": {}
 		}
 		},
 		"exec" : [
 		{
 			"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-			"sender" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-			"value" : 1000000000000000000,
-			"data" : [
-			]
+			"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+			"caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+			"value" : "1000000000000000000",
+			"data" : "",
+			"gasPrice" : "100000000000000",
+		    "gas" : "10000"
 		}
 		]
 	},
@@ -29,26 +33,30 @@
 	"arith": {
 		"env" : {
 		"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-		"previousNonce" : "9c9c6567b5ec0c5f3f25df79be42707090f1e62e9db84cbb556ae2a2f6ccccae",
+		"currentNumber" : "0",
+		"currentGasLimit" : "1000000",
 		"currentDifficulty" : "256",
 		"currentTimestamp" : 1,
 		"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-		"feeMultiplier" : 1
+		"code" : "{ (call (- (gas) 200) (caller) (+ 2 2 (* 4 4 4) (/ 2 2) (% 3 2) (- 8 2 2)) 0 0 0 0) }"
 		},
 		"pre" : {
 		"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-			"balance" : 1000000000000000000,
+			"balance" : "1000000000000000000",
 			"nonce" : 0,
-			"code" : "(seq (mktx (txsender) (+ 2 2 (* 4 4 4) (/ 2 2) (% 3 2) (- 8 2 2)) 0) )"
+			"code" : "{ (call (- (gas) 200) (caller) (+ 2 2 (* 4 4 4) (/ 2 2) (% 3 2) (- 8 2 2)) 0 0 0 0) }",
+			"storage": {}
 		}
 		},
 		"exec" : [
 		{
 			"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-			"sender" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-			"value" : 1000000000000000000,
-			"data" : [
-			]
+			"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+			"caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+			"value" : "1000000000000000000",
+			"data" : "",
+			"gasPrice" : "100000000000000",
+		    "gas" : "10000"
 		}
 		]
 	},
@@ -56,26 +64,30 @@
 	"boolean": {
 		"env" : {
 		"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-		"previousNonce" : "9c9c6567b5ec0c5f3f25df79be42707090f1e62e9db84cbb556ae2a2f6ccccae",
+		"currentNumber" : "0",
+		"currentGasLimit" : "1000000",
 		"currentDifficulty" : "256",
 		"currentTimestamp" : 1,
 		"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-		"feeMultiplier" : 1
+		"code" : "(seq (when (and 1 1) (call (- (gas) 200) (caller) 2 0 0 0 0)) (when (and 1 0) (call (- (gas) 200) (caller) 3 0 0 0 0)) (when (and 0 1) (call (- (gas) 200) (caller) 4 0 0 0 0)) (when (and 0 0) (call (- (gas) 200) (caller) 5 0 0 0 0)) (when (or 1 1) (call (- (gas) 200) (caller) 12 0 0 0 0)) (when (or 1 0) (call (- (gas) 200) (caller) 13 0 0 0 0)) (when (or 0 1) (call (- (gas) 200) (caller) 14 0 0 0 0)) (when (or 0 0) (call (- (gas) 200) (caller) 15 0 0 0 0)) )"
 		},
 		"pre" : {
 		"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-			"balance" : 1000000000000000000,
+			"balance" : "1000000000000000000",
 			"nonce" : 0,
-			"code" : "(seq (when (and 1 1) (mktx (txsender) 2 0)) (when (and 1 0) (mktx (txsender) 3 0)) (when (and 0 1) (mktx (txsender) 4 0)) (when (and 0 0) (mktx (txsender) 5 0)) (when (or 1 1) (mktx (txsender) 12 0)) (when (or 1 0) (mktx (txsender) 13 0)) (when (or 0 1) (mktx (txsender) 14 0)) (when (or 0 0) (mktx (txsender) 15 0)) )"
+			"code" : "(seq (when (and 1 1) (call (- (gas) 200) (caller) 2 0 0 0 0)) (when (and 1 0) (call (- (gas) 200) (caller) 3 0 0 0 0)) (when (and 0 1) (call (- (gas) 200) (caller) 4 0 0 0 0)) (when (and 0 0) (call (- (gas) 200) (caller) 5 0 0 0 0)) (when (or 1 1) (call (- (gas) 200) (caller) 12 0 0 0 0)) (when (or 1 0) (call (- (gas) 200) (caller) 13 0 0 0 0)) (when (or 0 1) (call (- (gas) 200) (caller) 14 0 0 0 0)) (when (or 0 0) (call (- (gas) 200) (caller) 15 0 0 0 0)) )",
+			"storage": {}
 		}
 		},
 		"exec" : [
 		{
 			"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-			"sender" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-			"value" : 1000000000000000000,
-			"data" : [
-			]
+			"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+			"caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+			"value" : "1000000000000000000",
+			"data" : "",
+			"gasPrice" : "100000000000000",
+		    "gas" : "10000"
 		}
 		]
 	},
@@ -83,55 +95,30 @@
 	"mktx": {
 	    "env" : {
 		"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-		"previousNonce" : "9c9c6567b5ec0c5f3f25df79be42707090f1e62e9db84cbb556ae2a2f6ccccae",
+		"currentNumber" : "0",
+		"currentGasLimit" : "1000000",
 		"currentDifficulty" : "256",
 		"currentTimestamp" : 1,
 		"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-		"feeMultiplier" : 1
+		"code" : "(call (- (gas) 200) (caller) 500000000000000000 0 0 0 0)"
 	    },
 	    "pre" : {
 		"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-		    "balance" : 1000000000000000000,
+		    "balance" : "1000000000000000000",
 		    "nonce" : 0,
-		    "code" : "(mktx (txsender) 500000000000000000 0)"
+		    "code" : "(call (- (gas) 200) (caller) 500000000000000000 0 0 0 0)",
+		    "storage": {}
 		}
 	    },
 	    "exec" : [
 		{
 		    "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-		    "sender" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-		    "value" : 1000000000000000000,
-		    "data" : [
-		    ]
-		}
-	    ]
-	},
-
-	"fan": {
-	    "env" : {
-		"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-		"previousNonce" : "9c9c6567b5ec0c5f3f25df79be42707090f1e62e9db84cbb556ae2a2f6ccccae",
-		"currentDifficulty" : "256",
-		"currentTimestamp" : 1,
-		"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-		"feeMultiplier" : 1
-	    },
-	    "pre" : {
-		"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-		    "balance" : 0,
-		    "nonce" : 0,
-		    "code" : "(seq (unless (gt (txvalue) 100finney) (stop)) (\"value\" (div (sub (txvalue) 100finney) (txdatan))) (\"i\" 0) (for (lt (\"i\") (txdatan)) (seq (mktx (txdata (\"i\")) (\"value\") 0) (\"i\" (add (\"i\") 1)) ) ) )"
-		}
-	    },
-	    "exec" : [
-		{
-		    "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-		    "sender" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-		    "value" : 1000000000000000000,
-		    "data" : [
-			"0xcd1722f3947def4cf144679da39c4c32bdc35681",
-			"0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-		    ]
+		    "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+		    "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+		    "value" : "1000000000000000000",
+		    "gasPrice" : "100000000000000",
+		    "gas" : "10000",
+		    "data" : ""
 		}
 	    ]
 	}