roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

ethvm, tests/*: use log level constants

Browse Source
This commit is contained in:
Felix Lange 2014-10-16 10:47:12 +02:00
parent 0165c18330
commit cbd785cfe8
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ethvm/vm_test.go
View File

@ -39,14 +39,14 @@ for i := 0; i < 10; i++ {
return x` return x`
func setup(level int, typ Type) (*Closure, VirtualMachine) { func setup(level ethlog.LogLevel, typ Type) (*Closure, VirtualMachine) {
code, err := ethutil.Compile(mutcode, true) code, err := ethutil.Compile(mutcode, true)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
// Pipe output to /dev/null // Pipe output to /dev/null
ethlog.AddLogSystem(ethlog.NewStdLogSystem(ioutil.Discard, log.LstdFlags, ethlog.LogLevel(level))) ethlog.AddLogSystem(ethlog.NewStdLogSystem(ioutil.Discard, log.LstdFlags, level))
ethutil.ReadConfig(".ethtest", "/tmp/ethtest", "") ethutil.ReadConfig(".ethtest", "/tmp/ethtest", "")
@ -57,7 +57,7 @@ func setup(level int, typ Type) (*Closure, VirtualMachine) {
} }
func TestDebugVm(t *testing.T) { func TestDebugVm(t *testing.T) {
closure, vm := setup(4, DebugVmTy) closure, vm := setup(ethlog.DebugLevel, DebugVmTy)
ret, _, e := closure.Call(vm, nil) ret, _, e := closure.Call(vm, nil)
if e != nil { if e != nil {
fmt.Println("error", e) fmt.Println("error", e)
@ -69,7 +69,7 @@ func TestDebugVm(t *testing.T) {
} }
func TestVm(t *testing.T) { func TestVm(t *testing.T) {
closure, vm := setup(4, StandardVmTy) closure, vm := setup(ethlog.DebugLevel, StandardVmTy)
ret, _, e := closure.Call(vm, nil) ret, _, e := closure.Call(vm, nil)
if e != nil { if e != nil {
fmt.Println("error", e) fmt.Println("error", e)
@ -81,7 +81,7 @@ func TestVm(t *testing.T) {
} }
func BenchmarkDebugVm(b *testing.B) { func BenchmarkDebugVm(b *testing.B) {
closure, vm := setup(3, DebugVmTy) closure, vm := setup(ethlog.InfoLevel, DebugVmTy)
b.ResetTimer() b.ResetTimer()
@ -91,7 +91,7 @@ func BenchmarkDebugVm(b *testing.B) {
} }
func BenchmarkVm(b *testing.B) { func BenchmarkVm(b *testing.B) {
closure, vm := setup(3, StandardVmTy) closure, vm := setup(ethlog.InfoLevel, StandardVmTy)
b.ResetTimer() b.ResetTimer()
@ -106,7 +106,7 @@ func RunCode(mutCode string, typ Type) []byte {
log.Fatal(err) log.Fatal(err)
} }
ethlog.AddLogSystem(ethlog.NewStdLogSystem(os.Stdout, log.LstdFlags, ethlog.LogLevel(3))) ethlog.AddLogSystem(ethlog.NewStdLogSystem(os.Stdout, log.LstdFlags, ethlog.InfoLevel))
ethutil.ReadConfig(".ethtest", "/tmp/ethtest", "") ethutil.ReadConfig(".ethtest", "/tmp/ethtest", "")

2
tests/helper/init.go
View File

@ -12,7 +12,7 @@ var Logger ethlog.LogSystem
var Log = ethlog.NewLogger("TEST") var Log = ethlog.NewLogger("TEST")
func init() { func init() {
Logger = ethlog.NewStdLogSystem(os.Stdout, log.LstdFlags, ethlog.LogLevel(3)) Logger = ethlog.NewStdLogSystem(os.Stdout, log.LstdFlags, ethlog.InfoLevel)
ethlog.AddLogSystem(Logger) ethlog.AddLogSystem(Logger)
ethutil.ReadConfig(".ethtest", "/tmp/ethtest", "") ethutil.ReadConfig(".ethtest", "/tmp/ethtest", "")

4
tests/vm/gh_test.go
View File

@ -4,6 +4,7 @@ import (
"bytes" "bytes"
"testing" "testing"
"github.com/ethereum/eth-go/ethlog"
"github.com/ethereum/eth-go/ethstate" "github.com/ethereum/eth-go/ethstate"
"github.com/ethereum/eth-go/ethutil" "github.com/ethereum/eth-go/ethutil"
"github.com/ethereum/eth-go/tests/helper" "github.com/ethereum/eth-go/tests/helper"
@ -87,6 +88,9 @@ func RunVmTest(url string, t *testing.T) {
} }
// I've created a new function for each tests so it's easier to identify where the problem lies if any of them fail. // I've created a new function for each tests so it's easier to identify where the problem lies if any of them fail.
func TestVMSha3(t *testing.T) {
helper.Logger.SetLogLevel(ethlog.Silence)
defer helper.Logger.SetLogLevel(ethlog.DebugLevel)
func TestVMArithmetic(t *testing.T) { func TestVMArithmetic(t *testing.T) {
const url = "https://raw.githubusercontent.com/ethereum/tests/develop/vmtests/vmArithmeticTest.json" const url = "https://raw.githubusercontent.com/ethereum/tests/develop/vmtests/vmArithmeticTest.json"