Merge branch 'develop' of https://github.com/ethereum/tests into develop

This commit is contained in:
CJentzsch 2014-12-18 21:43:06 +01:00
commit 86c3b8cfad

View File

@ -8,12 +8,17 @@ module.exports = {
trietestnextprev: require('./TrieTests/trietestnextprev'), trietestnextprev: require('./TrieTests/trietestnextprev'),
txtest: require('./BasicTests/txtest'), txtest: require('./BasicTests/txtest'),
StateTests: { StateTests: {
stExample: require('./StateTests/stExample.json'),
stInitCodeTest: require('./StateTests/stInitCodeTest.json'),
stLogTests: require('./StateTests/stLogTests.json'),
stPreCompiledContracts: require('./StateTests/stPreCompiledContracts'), stPreCompiledContracts: require('./StateTests/stPreCompiledContracts'),
stRecursiveCreate: require('./StateTests/stRecursiveCreate'), stRecursiveCreate: require('./StateTests/stRecursiveCreate'),
stSpecial: require('./StateTests/stSpecialTest'), stSpecial: require('./StateTests/stSpecialTest'),
stSystemOperationsTest: require('./StateTests/stSystemOperationsTest'), stSystemOperationsTest: require('./StateTests/stSystemOperationsTest'),
stTransactionTest: require('./StateTests/stTransactionTest')
}, },
VMTests: { VMTests: {
vmRandom: require('./VMTests/RandomTests/randomTest'),
vmArithmeticTest: require('./VMTests/vmArithmeticTest'), vmArithmeticTest: require('./VMTests/vmArithmeticTest'),
vmBitwiseLogicOperationTest: require('./VMTests/vmBitwiseLogicOperationTest'), vmBitwiseLogicOperationTest: require('./VMTests/vmBitwiseLogicOperationTest'),
vmBlockInfoTest: require('./VMTests/vmBlockInfoTest'), vmBlockInfoTest: require('./VMTests/vmBlockInfoTest'),
@ -22,6 +27,6 @@ module.exports = {
vmLogTest: require('./VMTests/vmLogTest'), vmLogTest: require('./VMTests/vmLogTest'),
vmPushDupSwapTest: require('./VMTests/vmPushDupSwapTest'), vmPushDupSwapTest: require('./VMTests/vmPushDupSwapTest'),
vmSha3Test: require('./VMTests/vmSha3Test'), vmSha3Test: require('./VMTests/vmSha3Test'),
vmtests: require('./VMTests/vmtests'), vmtests: require('./VMTests/vmtests')
} }
}; };