From 6ad14c1a157e707fd15c87816e8ad872f69790db Mon Sep 17 00:00:00 2001
From: Gav Wood <i@gavwood.com>
Date: Fri, 21 Feb 2014 18:33:39 +0000
Subject: Added VM test suite. Added TODO. Renamed old files.

---
 TODO               | 21 ++++++++++++++++++++
 hexencodetest.json | 34 +++++++++++++++++++++++++++++++++
 hexencodetest.txt  | 34 ---------------------------------
 rlptest.json       | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 rlptest.txt        | 54 ----------------------------------------------------
 trietest.json      | 19 ++++++++++++++++++
 trietest.txt       | 19 ------------------
 vmtests.json       | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 8 files changed, 184 insertions(+), 107 deletions(-)
 create mode 100644 TODO
 create mode 100644 hexencodetest.json
 delete mode 100644 hexencodetest.txt
 create mode 100644 rlptest.json
 delete mode 100644 rlptest.txt
 create mode 100644 trietest.json
 delete mode 100644 trietest.txt
 create mode 100644 vmtests.json

diff --git a/TODO b/TODO
new file mode 100644
index 000000000..08b816b2c
--- /dev/null
+++ b/TODO
@@ -0,0 +1,21 @@
+- Move over to standard & clear JSON format:
+
+All files should be of the form:
+
+{
+	"test1name":
+	{
+		"test1property1": ...,
+		"test1property2": ...,
+		...
+	},
+	"test2name":
+	{
+		"test2property1": ...,
+		"test2property2": ...,
+		...
+	}
+}
+
+Arrays are allowed, but don't use them for sets of properties - only use them for data that is clearly a continuous contiguous sequence of values.
+
diff --git a/hexencodetest.json b/hexencodetest.json
new file mode 100644
index 000000000..a6d18834c
--- /dev/null
+++ b/hexencodetest.json
@@ -0,0 +1,34 @@
+[
+  [
+    [ 1, 2, 3, 4, 5 ], 
+    "112345"
+  ], 
+  [
+    [ 0, 1, 2, 3, 4, 5 ], 
+    "00012345"
+  ], 
+  [
+    [ 6, 4, 6, 15, 6, 7, 6, 5, 16 ], 
+    "20646f6765"
+  ], 
+  [
+    [ 7, 6, 5, 16 ], 
+    "3765"
+  ], 
+  [
+    [ 16 ], 
+    "20"
+  ], 
+  [
+    [ 0, 16 ], 
+    "30"
+  ],
+  [
+    [ 15, 1, 12, 11, 8, 16 ],
+    "3f1cb8"
+  ],
+  [
+    [ 0, 15, 1, 12, 11, 8, 16 ],
+    "200f1cb8"
+  ]
+]
diff --git a/hexencodetest.txt b/hexencodetest.txt
deleted file mode 100644
index a6d18834c..000000000
--- a/hexencodetest.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-[
-  [
-    [ 1, 2, 3, 4, 5 ], 
-    "112345"
-  ], 
-  [
-    [ 0, 1, 2, 3, 4, 5 ], 
-    "00012345"
-  ], 
-  [
-    [ 6, 4, 6, 15, 6, 7, 6, 5, 16 ], 
-    "20646f6765"
-  ], 
-  [
-    [ 7, 6, 5, 16 ], 
-    "3765"
-  ], 
-  [
-    [ 16 ], 
-    "20"
-  ], 
-  [
-    [ 0, 16 ], 
-    "30"
-  ],
-  [
-    [ 15, 1, 12, 11, 8, 16 ],
-    "3f1cb8"
-  ],
-  [
-    [ 0, 15, 1, 12, 11, 8, 16 ],
-    "200f1cb8"
-  ]
-]
diff --git a/rlptest.json b/rlptest.json
new file mode 100644
index 000000000..b443d65a4
--- /dev/null
+++ b/rlptest.json
@@ -0,0 +1,54 @@
+[
+    [
+        "cat", 
+        "43636174"
+    ], 
+    [
+        "dog", 
+        "43646f67"
+    ], 
+    [
+        [ "cat", "dog" ], 
+        "824363617443646f67"
+    ], 
+    [
+        [ "dog", "god", "cat" ],
+        "8343646f6743676f6443636174"
+    ],
+    [
+        1, 
+        "01"
+    ], 
+    [
+        10, 
+        "0a"
+    ], 
+    [
+        100, 
+        "1864"
+    ], 
+    [
+        1000, 
+        "1903e8"
+    ], 
+    [
+        115792089237316195423570985008687907853269984665640564039457584007913129639935, 
+        "37ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+    ], 
+    [
+        115792089237316195423570985008687907853269984665640564039457584007913129639936, 
+        "3821010000000000000000000000000000000000000000000000000000000000000000"
+    ], 
+    [
+        [ 1, 2, [] ], 
+        "83010280"
+    ], 
+    [
+        [ [ [], [] ], [] ], 
+        "8282808080"
+    ], 
+    [
+        [ "zw", [ 4 ], "wz" ], 
+        "83427a77810442777a"
+    ]
+]
diff --git a/rlptest.txt b/rlptest.txt
deleted file mode 100644
index b443d65a4..000000000
--- a/rlptest.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    [
-        "cat", 
-        "43636174"
-    ], 
-    [
-        "dog", 
-        "43646f67"
-    ], 
-    [
-        [ "cat", "dog" ], 
-        "824363617443646f67"
-    ], 
-    [
-        [ "dog", "god", "cat" ],
-        "8343646f6743676f6443636174"
-    ],
-    [
-        1, 
-        "01"
-    ], 
-    [
-        10, 
-        "0a"
-    ], 
-    [
-        100, 
-        "1864"
-    ], 
-    [
-        1000, 
-        "1903e8"
-    ], 
-    [
-        115792089237316195423570985008687907853269984665640564039457584007913129639935, 
-        "37ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
-    ], 
-    [
-        115792089237316195423570985008687907853269984665640564039457584007913129639936, 
-        "3821010000000000000000000000000000000000000000000000000000000000000000"
-    ], 
-    [
-        [ 1, 2, [] ], 
-        "83010280"
-    ], 
-    [
-        [ [ [], [] ], [] ], 
-        "8282808080"
-    ], 
-    [
-        [ "zw", [ 4 ], "wz" ], 
-        "83427a77810442777a"
-    ]
-]
diff --git a/trietest.json b/trietest.json
new file mode 100644
index 000000000..4a5c5ded5
--- /dev/null
+++ b/trietest.json
@@ -0,0 +1,19 @@
+[
+  {
+    "inputs": {
+      "doe": "reindeer",
+      "dog": "puppy",
+      "dogglesworth": "cat"
+    },
+    "expectation": "d85f9267d7ed5767fb1b48defa8eb20a1c007a87a07588135a74b40b55de2e67"
+  },
+  {
+    "inputs":{
+      "do": "verb", 
+      "horse": "stallion", 
+      "doge": "coin", 
+      "dog": "puppy"
+    }, 
+    "expectation": "cf7d318935b52db6e23d8c1f5e6b7e62f3606d4ed13783f4fdbd6e67a2085d04"
+  }
+]
diff --git a/trietest.txt b/trietest.txt
deleted file mode 100644
index 4a5c5ded5..000000000
--- a/trietest.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-[
-  {
-    "inputs": {
-      "doe": "reindeer",
-      "dog": "puppy",
-      "dogglesworth": "cat"
-    },
-    "expectation": "d85f9267d7ed5767fb1b48defa8eb20a1c007a87a07588135a74b40b55de2e67"
-  },
-  {
-    "inputs":{
-      "do": "verb", 
-      "horse": "stallion", 
-      "doge": "coin", 
-      "dog": "puppy"
-    }, 
-    "expectation": "cf7d318935b52db6e23d8c1f5e6b7e62f3606d4ed13783f4fdbd6e67a2085d04"
-  }
-]
diff --git a/vmtests.json b/vmtests.json
new file mode 100644
index 000000000..07f69a671
--- /dev/null
+++ b/vmtests.json
@@ -0,0 +1,56 @@
+{
+	"suicide": {
+	    "env" : {
+		"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+		"previousNonce" : "9c9c6567b5ec0c5f3f25df79be42707090f1e62e9db84cbb556ae2a2f6ccccae",
+		"currentDifficulty" : "256",
+		"currentTimestamp" : 1,
+		"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+		"feeMultiplier" : 1
+	    },
+	    "pre" : {
+		"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+		    "balance" : 1000000000000000000,
+		    "nonce" : 0,
+		    "code" : "(suicide (txsender))"
+		}
+	    },
+	    "exec" : [
+		{
+		    "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+		    "sender" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+		    "value" : 1000000000000000000,
+		    "data" : [
+		    ]
+		}
+	    ]
+	},
+
+	"mktx": {
+	    "env" : {
+		"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+		"previousNonce" : "9c9c6567b5ec0c5f3f25df79be42707090f1e62e9db84cbb556ae2a2f6ccccae",
+		"currentDifficulty" : "256",
+		"currentTimestamp" : 1,
+		"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+		"feeMultiplier" : 1
+	    },
+	    "pre" : {
+		"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+		    "balance" : 1000000000000000000,
+		    "nonce" : 0,
+		    "code" : "(mktx (txsender) (txvalue) 0)"
+		}
+	    },
+	    "exec" : [
+		{
+		    "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+		    "sender" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+		    "value" : 1000000000000000000,
+		    "data" : [
+		    ]
+		}
+	    ]
+	}
+
+}
-- 
cgit v1.2.3