Merge pull request #3723 from karalabe/logger-updates-2

Logger updates

core/vm/contracts.go

@@ -18,7 +18,6 @@ package vm
 
 import (
 	"crypto/sha256"
-	"fmt"
 	"math/big"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -83,7 +82,7 @@ func (c *ecrecover) Run(in []byte) []byte {
 	pubKey, err := crypto.Ecrecover(in[:32], append(in[64:128], v))
 	// make sure the public key is a valid one
 	if err != nil {
-		log.Trace(fmt.Sprint("ECRECOVER error: ", err))
+		log.Trace("ECRECOVER failed", "err", err)
 		return nil
 	}
 

core/vm/interpreter.go

@@ -123,13 +123,9 @@ func (evm *Interpreter) Run(contract *Contract, input []byte) (ret []byte, err e
 		}
 	}()
 
-	log.Debug("", "msg", log.Lazy{Fn: func() string {
-		return fmt.Sprintf("evm running: %x\n", codehash[:4])
-	}})
+	log.Debug("EVM running contract", "hash", codehash[:])
 	tstart := time.Now()
-	defer log.Debug("", "msg", log.Lazy{Fn: func() string {
-		return fmt.Sprintf("evm done: %x. time: %v\n", codehash[:4], time.Since(tstart))
-	}})
+	defer log.Debug("EVM finished running contract", "hash", codehash[:], "elapsed", time.Since(tstart))
 
 	// The Interpreter main run loop (contextual). This loop runs until either an
 	// explicit STOP, RETURN or SELFDESTRUCT is executed, an error occurred during