Merge branch 'develop' into jsonrpc

Conflicts:
	rpc/ws/server.go

1 files changed, 1 insertions, 1 deletions

diff --git a/tests/helper/vm.go b/tests/helper/vm.go
index 7c33839cf..f1c1ffdfc 100644
--- a/tests/helper/vm.go
+++ b/tests/helper/vm.go
@@ -59,6 +59,7 @@ func (self *Env) Time() int64           { return self.time }
 func (self *Env) Difficulty() *big.Int  { return self.difficulty }
 func (self *Env) State() *state.StateDB { return self.state }
 func (self *Env) GasLimit() *big.Int    { return self.gasLimit }
+func (self *Env) VmType() vm.Type       { return vm.StdVmTy }
 func (self *Env) GetHash(n uint64) []byte {
 	return crypto.Sha3([]byte(big.NewInt(int64(n)).String()))
 }
@@ -147,7 +148,6 @@ func RunState(statedb *state.StateDB, env, tx map[string]string) ([]byte, state.
 	coinbase.SetGasPool(ethutil.Big(env["currentGasLimit"]))
 
 	message := NewMessage(keyPair.Address(), to, data, value, gas, price)
-	Log.DebugDetailf("message{ to: %x, from %x, value: %v, gas: %v, price: %v }\n", message.to[:4], message.from[:4], message.value, message.gas, message.price)
 	vmenv := NewEnvFromMap(statedb, env, tx)
 	st := core.NewStateTransition(vmenv, message, coinbase)
 	vmenv.origin = keyPair.Address()