aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCJentzsch <jentzsch.software@gmail.com>2014-12-20 20:08:18 +0800
committerCJentzsch <jentzsch.software@gmail.com>2014-12-20 20:08:18 +0800
commit8a285d258ac4a939c43297ac58bebde7460da896 (patch)
tree530ad448fc88af7922c5af368897c705a985ead6
parenta4ccc6e72eb759a2d769107054af1646b79d3fc5 (diff)
parent6567f9d0b2a537b0012653350d83b75c435331f0 (diff)
downloadgo-tangerine-8a285d258ac4a939c43297ac58bebde7460da896.tar
go-tangerine-8a285d258ac4a939c43297ac58bebde7460da896.tar.gz
go-tangerine-8a285d258ac4a939c43297ac58bebde7460da896.tar.bz2
go-tangerine-8a285d258ac4a939c43297ac58bebde7460da896.tar.lz
go-tangerine-8a285d258ac4a939c43297ac58bebde7460da896.tar.xz
go-tangerine-8a285d258ac4a939c43297ac58bebde7460da896.tar.zst
go-tangerine-8a285d258ac4a939c43297ac58bebde7460da896.zip
Merge remote-tracking branch 'origin/develop' into develop
-rw-r--r--index.js8
1 files changed, 6 insertions, 2 deletions
diff --git a/index.js b/index.js
index 34a03d8b2..99c19aa13 100644
--- 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'),
- 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'),
@@ -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')