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

8a285d25 · CJentzsch · a4ccc6e7 · 6567f9d0 · 8a285d25
Commit 8a285d25 authored Dec 20, 2014 by CJentzsch
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

index.js index.js +6 -2

No files found.
--- a/index.js
+++ b/index.js
@@ -4,8 +4,11 @@ module.exports = {
  hexencode: require('./BasicTests/hexencodetest'),
  keyaddrtests: require('./BasicTests/keyaddrtest'),
  rlptest: require('./BasicTests/rlptest'),
-  trietest: require('./TrieTests/trietest'),
+  trieTests: {
-  trietestnextprev: require('./TrieTests/trietestnextprev'),
+    trietest: require('./TrieTests/trietest'),
+    trietestnextprev: require('./TrieTests/trietestnextprev'),
+    trieanyorder: require('./TrieTests/trieanyorder')
+  },
  txtest: require('./BasicTests/txtest'),
  StateTests: {
    stExample: require('./StateTests/stExample.json'),
@@ -13,6 +16,7 @@ module.exports = {
    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')