Commit ec8404c3 authored by CJentzsch's avatar CJentzsch

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

parents 766ee653 bf2abc3b
{ {
"EmptyTransaction" : { "EmptyTransaction" : {
"rlp" : "0xf8498080808080801ba048b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353a0efffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804", "rlp" : "0xf84b80808201f48080801ca03f0332f12ac0e47801af82ac677a3a081153624ea5f0d4985251433ee1d69cd4a025fdd406326f226375ba7cf660a75f1888f9420510615590ff142510f89a1a50",
"sender" : "66c7b5c28121e4b66583d15481c92f5ad848fe1f", "sender" : "be862ad9abfe6f22bcb087716c7d89a26051f74c",
"transaction" : { "transaction" : {
"data" : "", "data" : "",
"gasLimit" : "", "gasLimit" : "500",
"gasPrice" : "", "gasPrice" : "",
"nonce" : "", "nonce" : "",
"r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353", "r" : "0x3f0332f12ac0e47801af82ac677a3a081153624ea5f0d4985251433ee1d69cd4",
"s" : "0xefffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804", "s" : "0x25fdd406326f226375ba7cf660a75f1888f9420510615590ff142510f89a1a50",
"to" : "", "to" : "",
"v" : "27", "v" : "28",
"value" : "" "value" : ""
} }
}, },
......
...@@ -13,6 +13,9 @@ Object.defineProperties(tests, { ...@@ -13,6 +13,9 @@ Object.defineProperties(tests, {
stateTests: { stateTests: {
get: require('require-all').bind(this, __dirname + '/StateTests/') get: require('require-all').bind(this, __dirname + '/StateTests/')
}, },
transactionTests:{
get: require('require-all').bind(this, __dirname + '/TransactionTests/')
},
vmTests: { vmTests: {
get: require('require-all').bind(this, __dirname + '/VMTests') get: require('require-all').bind(this, __dirname + '/VMTests')
} }
......
{ {
"name": "ethereum-tests", "name": "ethereum-tests",
"version": "0.0.3", "version": "0.0.4",
"description": "tests for ethereum", "description": "tests for ethereum",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment