poanetwork
/
quorum
mirror of https://github.com/poanetwork/quorum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
CJentzsch 2014-12-20 13:08:18 +01:00
parent a4ccc6e72e 6567f9d0b2
commit 8a285d258a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
index.js
View File

@ -4,8 +4,11 @@ module.exports = {
hexencode: require('./BasicTests/hexencodetest'), hexencode: require('./BasicTests/hexencodetest'),
keyaddrtests: require('./BasicTests/keyaddrtest'), keyaddrtests: require('./BasicTests/keyaddrtest'),
rlptest: require('./BasicTests/rlptest'), 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'), txtest: require('./BasicTests/txtest'),
StateTests: { StateTests: {
stExample: require('./StateTests/stExample.json'), stExample: require('./StateTests/stExample.json'),
@ -13,6 +16,7 @@ module.exports = {
stLogTests: require('./StateTests/stLogTests.json'), stLogTests: require('./StateTests/stLogTests.json'),
stPreCompiledContracts: require('./StateTests/stPreCompiledContracts'), stPreCompiledContracts: require('./StateTests/stPreCompiledContracts'),
stRecursiveCreate: require('./StateTests/stRecursiveCreate'), stRecursiveCreate: require('./StateTests/stRecursiveCreate'),
stRefundTest: require('./StateTests/stRefundTest'),
stSpecial: require('./StateTests/stSpecialTest'), stSpecial: require('./StateTests/stSpecialTest'),
stSystemOperationsTest: require('./StateTests/stSystemOperationsTest'), stSystemOperationsTest: require('./StateTests/stSystemOperationsTest'),
stTransactionTest: require('./StateTests/stTransactionTest') stTransactionTest: require('./StateTests/stTransactionTest')