Fixed most of the tests

2 files changed, 14 insertions, 7 deletions

diff --git a/tests/helper/init.go b/tests/helper/init.go
index 5f95dfc2f..7c34913fc 100644
--- a/tests/helper/init.go
+++ b/tests/helper/init.go
@@ -9,9 +9,10 @@ import (
 )
 
 var Logger ethlog.LogSystem
+var Log = ethlog.NewLogger("TEST")
 
 func init() {
-	Logger = ethlog.NewStdLogSystem(os.Stdout, log.LstdFlags, ethlog.LogLevel(4))
+	Logger = ethlog.NewStdLogSystem(os.Stdout, log.LstdFlags, ethlog.LogLevel(0))
 	ethlog.AddLogSystem(Logger)
 
 	ethutil.ReadConfig(".ethtest", "/tmp/ethtest", "")
diff --git a/tests/helper/vm.go b/tests/helper/vm.go
index 4a0d2f8b1..da06b2cc2 100644
--- a/tests/helper/vm.go
+++ b/tests/helper/vm.go
@@ -18,6 +18,7 @@ type Env struct {
 	number     *big.Int
 	time       int64
 	difficulty *big.Int
+	gasLimit   *big.Int
 }
 
 func NewEnv(state *ethstate.State) *Env {
@@ -33,7 +34,9 @@ func NewEnvFromMap(state *ethstate.State, envValues map[string]string, exeValues
 	env.parent = ethutil.Hex2Bytes(envValues["previousHash"])
 	env.coinbase = ethutil.Hex2Bytes(envValues["currentCoinbase"])
 	env.number = ethutil.Big(envValues["currentNumber"])
-	env.time = ethutil.Big(envValues["currentTime"]).Int64()
+	env.time = ethutil.Big(envValues["currentTimestamp"]).Int64()
+	env.difficulty = ethutil.Big(envValues["currentDifficulty"])
+	env.gasLimit = ethutil.Big(envValues["currentGasLimit"])
 
 	return env
 }
@@ -46,14 +49,17 @@ func (self *Env) Time() int64            { return self.time }
 func (self *Env) Difficulty() *big.Int   { return self.difficulty }
 func (self *Env) BlockHash() []byte      { return nil }
 func (self *Env) State() *ethstate.State { return self.state }
+func (self *Env) GasLimit() *big.Int     { return self.gasLimit }
 
 func RunVm(state *ethstate.State, env, exec map[string]string) ([]byte, *big.Int, error) {
-	caller := state.GetOrNewStateObject(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"]))
+	address := FromHex(exec["address"])
+	caller := state.GetOrNewStateObject(FromHex(exec["caller"]))
+	caller.Balance = ethutil.Big(exec["value"])
 
 	vm := ethvm.New(NewEnvFromMap(state, env, exec), ethvm.DebugVmTy)
-	ret, _, e := closure.Call(vm, nil)
 
-	return ret, closure.Gas, e
+	execution := ethvm.NewExecution(vm, address, FromHex(exec["data"]), ethutil.Big(exec["gas"]), ethutil.Big(exec["gasPrice"]), ethutil.Big(exec["value"]))
+	ret, err := execution.Exec(address, caller)
+
+	return ret, execution.Gas, err
 }