Merge remote-tracking branch 'origin/develop' into develop

ethereum · Dec 20, 2014 · 8a285d2 · 8a285d2
2 parents a4ccc6e + 6567f9d
commit 8a285d2
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/index.js b/index.js
@@ -4,15 +4,19 @@ module.exports = {
   hexencode: require('./BasicTests/hexencodetest'),
   keyaddrtests: require('./BasicTests/keyaddrtest'),
   rlptest: require('./BasicTests/rlptest'),
-  trietest: require('./TrieTests/trietest'),
-  trietestnextprev: require('./TrieTests/trietestnextprev'),
+  trieTests: {
+    trietest: require('./TrieTests/trietest'),
+    trietestnextprev: require('./TrieTests/trietestnextprev'),
+    trieanyorder: require('./TrieTests/trieanyorder')
+  },
   txtest: require('./BasicTests/txtest'),
   StateTests: {
     stExample: require('./StateTests/stExample.json'),
     stInitCodeTest: require('./StateTests/stInitCodeTest.json'),
     stLogTests: require('./StateTests/stLogTests.json'),
     stPreCompiledContracts: require('./StateTests/stPreCompiledContracts'),
     stRecursiveCreate: require('./StateTests/stRecursiveCreate'),
+    stRefundTest: require('./StateTests/stRefundTest'),
     stSpecial: require('./StateTests/stSpecialTest'),
     stSystemOperationsTest: require('./StateTests/stSystemOperationsTest'),
     stTransactionTest: require('./StateTests/stTransactionTest')