3 files changed, 12 insertions, 12 deletions
diff --git a/tests/helper/http.go b/tests/helper/http.go
index b379695d0..3c570d106 100644
--- a/tests/helper/http.go
+++ b/tests/helper/http.go
@@ -4,12 +4,15 @@ import (
 	"encoding/json"
 	"io/ioutil"
 	"net/http"
+	"testing"
 )
 
-func CreateTests(uri string, value interface{}) error {
+func CreateTests(t *testing.T, uri string, value interface{}) {
 	resp, err := http.Get(uri)
 	if err != nil {
-		panic(err)
+		t.Error(err)
+
+		return
 	}
 	defer resp.Body.Close()
 
@@ -17,8 +20,6 @@ func CreateTests(uri string, value interface{}) error {
 
 	err = json.Unmarshal(data, &value)
 	if err != nil {
-		return err
+		t.Error(err)
 	}
-
-	return nil
 }
diff --git a/tests/helper/init.go b/tests/helper/init.go
index 1f2ee208a..5f95dfc2f 100644
--- a/tests/helper/init.go
+++ b/tests/helper/init.go
@@ -8,8 +8,11 @@ import (
 	"github.com/ethereum/eth-go/ethutil"
 )
 
+var Logger ethlog.LogSystem
+
 func init() {
-	ethlog.AddLogSystem(ethlog.NewStdLogSystem(os.Stdout, log.LstdFlags, ethlog.LogLevel(4)))
+	Logger = ethlog.NewStdLogSystem(os.Stdout, log.LstdFlags, ethlog.LogLevel(4))
+	ethlog.AddLogSystem(Logger)
 
 	ethutil.ReadConfig(".ethtest", "/tmp/ethtest", "")
 }
diff --git a/tests/helper/vm.go b/tests/helper/vm.go
index 49a0bfeae..44eb8fda1 100644
--- a/tests/helper/vm.go
+++ b/tests/helper/vm.go
@@ -1,7 +1,6 @@
 package helper
 
 import (
-	"fmt"
 	"math/big"
 
 	"github.com/ethereum/eth-go/ethstate"
@@ -51,16 +50,13 @@ func (self *Env) BlockHash() []byte     { return nil }
 // This is likely to fail if anything ever gets looked up in the state trie :-)
 func (self *Env) State() *ethstate.State { return ethstate.New(ethtrie.New(nil, "")) }
 
-func RunVm(state *ethstate.State, env, exec map[string]string) ([]byte, *big.Int) {
+func RunVm(state *ethstate.State, env, exec map[string]string) ([]byte, *big.Int, error) {
 	caller := state.NewStateObject(ethutil.Hex2Bytes(exec["caller"]))
 	callee := state.GetStateObject(ethutil.Hex2Bytes(exec["address"]))
 	closure := ethvm.NewClosure(nil, caller, callee, callee.Code, ethutil.Big(exec["gas"]), ethutil.Big(exec["gasPrice"]))
 
 	vm := ethvm.New(NewEnvFromMap(state, env, exec), ethvm.DebugVmTy)
 	ret, _, e := closure.Call(vm, nil)
-	if e != nil {
-		fmt.Println(e)
-	}
 
-	return ret, closure.Gas
+	return ret, closure.Gas, e
 }