gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed mkdnode & added some tests

Browse Source
This commit is contained in:
obscuren
2015-03-19 10:57:02 +01:00
parent e67d32b467
commit d7ab716eea
8 changed files with 55 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cmd/ethtest/main.go
View File

@@ -24,7 +24,6 @@ package main
import (
"bytes"
"encoding/json"
"fmt"
"io"
"io/ioutil"
"log"
@@ -33,8 +32,8 @@ import (
"strconv"
"strings"
"github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/state"
"github.com/ethereum/go-ethereum/tests/helper"
@@ -136,7 +135,7 @@ func RunVmTest(r io.Reader) (failed int) {
rexp := helper.FromHex(test.Out)
if bytes.Compare(rexp, ret) != 0 {
fmt.Printf("FAIL: %s's return failed. Expected %x, got %x\n", name, rexp, ret)
helper.Log.Infof("FAIL: %s's return failed. Expected %x, got %x\n", name, rexp, ret)
failed = 1
}
@@ -148,7 +147,13 @@ func RunVmTest(r io.Reader) (failed int) {
if len(test.Exec) == 0 {
if obj.Balance().Cmp(common.Big(account.Balance)) != 0 {
fmt.Printf("FAIL: %s's : (%x) balance failed. Expected %v, got %v => %v\n", name, obj.Address()[:4], account.Balance, obj.Balance(), new(big.Int).Sub(common.Big(account.Balance), obj.Balance()))
helper.Log.Infof("FAIL: %s's : (%x) balance failed. Expected %v, got %v => %v\n",
name,
obj.Address()[:4],
account.Balance,
obj.Balance(),
new(big.Int).Sub(common.Big(account.Balance), obj.Balance()),
)
failed = 1
}
}
@@ -158,20 +163,20 @@ func RunVmTest(r io.Reader) (failed int) {
vexp := helper.FromHex(value)
if bytes.Compare(v, vexp) != 0 {
fmt.Printf("FAIL: %s's : (%x: %s) storage failed. Expected %x, got %x (%v %v)\n", name, obj.Address()[0:4], addr, vexp, v, common.BigD(vexp), common.BigD(v))
helper.Log.Infof("FAIL: %s's : (%x: %s) storage failed. Expected %x, got %x (%v %v)\n", name, obj.Address()[0:4], addr, vexp, v, common.BigD(vexp), common.BigD(v))
failed = 1
}
}
}
if !bytes.Equal(common.Hex2Bytes(test.PostStateRoot), statedb.Root()) {
fmt.Printf("FAIL: %s's : Post state root error. Expected %s, got %x\n", name, test.PostStateRoot, statedb.Root())
helper.Log.Infof("FAIL: %s's : Post state root error. Expected %s, got %x\n", name, test.PostStateRoot, statedb.Root())
failed = 1
}
if len(test.Logs) > 0 {
if len(test.Logs) != len(logs) {
fmt.Printf("FAIL: log length mismatch. Expected %d, got %d", len(test.Logs), len(logs))
helper.Log.Infof("FAIL: log length mismatch. Expected %d, got %d", len(test.Logs), len(logs))
failed = 1
} else {
/*