updated tests

2 files changed, 58 insertions, 56 deletions

diff --git a/tests/files/TrieTests/trieanyorder.json b/tests/files/TrieTests/trieanyorder.json
new file mode 100644
index 000000000..ebf5fbff0
--- /dev/null
+++ b/tests/files/TrieTests/trieanyorder.json
@@ -0,0 +1,55 @@
+{
+  "singleItem": {
+    "in": {
+      "A": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+    },
+    "root": "0xd23786fb4a010da3ce639d66d5e904a11dbc02746d1ce25029e53290cabf28ab"
+  },
+  "dogs": {
+    "in": {
+      "doe": "reindeer",
+      "dog": "puppy",
+      "dogglesworth": "cat"
+    },
+    "root": "0x8aad789dff2f538bca5d8ea56e8abe10f4c7ba3a5dea95fea4cd6e7c3a1168d3"
+  },
+  "puppy": {
+    "in": {
+      "do": "verb",
+      "horse": "stallion",
+      "doge": "coin",
+      "dog": "puppy"
+    },
+    "root": "0x5991bb8c6514148a29db676a14ac506cd2cd5775ace63c30a4fe457715e9ac84"
+  },
+  "foo": {
+    "in": {
+      "foo": "bar",
+      "food": "bat",
+      "food": "bass"
+    },
+    "root": "0x17beaa1648bafa633cda809c90c04af50fc8aed3cb40d16efbddee6fdf63c4c3"
+  },
+  "smallValues": {
+    "in": {
+      "be": "e",
+      "dog": "puppy",
+      "bed": "d"
+    },
+    "root": "0x3f67c7a47520f79faa29255d2d3c084a7a6df0453116ed7232ff10277a8be68b"
+  },
+  "testy": {
+    "in": {
+      "test": "test",
+      "te": "testy"
+    },
+    "root": "0x8452568af70d8d140f58d941338542f645fcca50094b20f3c3d8c3df49337928"
+  },
+  "hex": {
+    "in": {
+      "0x0045": "0x0123456789",
+      "0x4500": "0x9876543210"
+    },
+    "root": "0x285505fcabe84badc8aa310e2aae17eddc7d120aabec8a476902c8184b3a3503"
+  }
+}
diff --git a/tests/files/TrieTests/trietest.json b/tests/files/TrieTests/trietest.json
index 8d8c35f3b..ce5c2d191 100644
--- a/tests/files/TrieTests/trietest.json
+++ b/tests/files/TrieTests/trietest.json
@@ -1,27 +1,4 @@
 {
-  "singleItem": {
-    "in": [
-      ["A", "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"]
-    ],
-    "root": "0xd23786fb4a010da3ce639d66d5e904a11dbc02746d1ce25029e53290cabf28ab"
-  },
-  "dogs": {
-    "in": [
-      ["doe", "reindeer"],
-      ["dog", "puppy"],
-      ["dogglesworth", "cat"]
-    ],
-    "root": "0x8aad789dff2f538bca5d8ea56e8abe10f4c7ba3a5dea95fea4cd6e7c3a1168d3"
-  },
-  "puppy": {
-    "in": [
-      ["do", "verb"],
-      ["horse", "stallion"],
-      ["doge", "coin"],
-      ["dog", "puppy"]
-    ],
-    "root": "0x5991bb8c6514148a29db676a14ac506cd2cd5775ace63c30a4fe457715e9ac84"
-  },
   "emptyValues": {
     "in": [
       ["do", "verb"],
@@ -29,42 +6,12 @@
       ["horse", "stallion"],
       ["shaman", "horse"],
       ["doge", "coin"],
-      ["ether", ""],
+      ["ether", null],
       ["dog", "puppy"],
-      ["shaman", ""]
+      ["shaman", null]
     ],
     "root": "0x5991bb8c6514148a29db676a14ac506cd2cd5775ace63c30a4fe457715e9ac84"
   },
-  "foo": {
-    "in": [
-      ["foo", "bar"],
-      ["food", "bat"],
-      ["food", "bass"]
-    ],
-    "root": "0x17beaa1648bafa633cda809c90c04af50fc8aed3cb40d16efbddee6fdf63c4c3"
-  },
-  "smallValues": {
-    "in": [
-      ["be", "e"],
-      ["dog", "puppy"],
-      ["bed", "d"]
-    ],
-    "root": "0x3f67c7a47520f79faa29255d2d3c084a7a6df0453116ed7232ff10277a8be68b"
-  },
-  "testy": {
-    "in": [
-      ["test", "test"],
-      ["te", "testy"]
-    ],
-    "root": "0x8452568af70d8d140f58d941338542f645fcca50094b20f3c3d8c3df49337928"
-  },
-  "hex": {
-    "in": [
-      ["0x0045", "0x0123456789"],
-      ["0x4500", "0x9876543210"]
-    ],
-    "root": "0x285505fcabe84badc8aa310e2aae17eddc7d120aabec8a476902c8184b3a3503"
-  },
   "jeff": {
     "in": [
       ["0x0000000000000000000000000000000000000000000000000000000000000045", "0x22b224a1420a802ab51d326e29fa98e34c4f24ea"],
@@ -75,7 +22,7 @@
       ["0x000000000000000000000000ec4f34c97e43fbb2816cfd95e388353c7181dab1", "0x4e616d6552656700000000000000000000000000000000000000000000000000"],
       ["0x4655474156000000000000000000000000000000000000000000000000000000", "0x7ef9e639e2733cb34e4dfc576d4b23f72db776b2"],
       ["0x4e616d6552656700000000000000000000000000000000000000000000000000", "0xec4f34c97e43fbb2816cfd95e388353c7181dab1"],
-      ["0x0000000000000000000000000000000000000000000000000000001234567890", ""],
+      ["0x0000000000000000000000000000000000000000000000000000001234567890", null],
       ["0x000000000000000000000000697c7b8c961b56f675d570498424ac8de1a918f6", "0x6f6f6f6820736f2067726561742c207265616c6c6c793f000000000000000000"],
       ["0x6f6f6f6820736f2067726561742c207265616c6c6c793f000000000000000000", "0x697c7b8c961b56f675d570498424ac8de1a918f6"]
     ],