core/vm: fixed printable characters using unicode instead

2 files changed, 2 insertions, 6 deletions

diff --git a/core/block_processor.go b/core/block_processor.go
index 3ec3c585f..54378b2b9 100644
--- a/core/block_processor.go
+++ b/core/block_processor.go
@@ -71,14 +71,10 @@ func (sm *BlockProcessor) TransitionState(statedb *state.StateDB, parent, block
 
 func (self *BlockProcessor) ApplyTransaction(coinbase *state.StateObject, statedb *state.StateDB, block *types.Block, tx *types.Transaction, usedGas *big.Int, transientProcess bool) (*types.Receipt, *big.Int, error) {
 	// If we are mining this block and validating we want to set the logs back to 0
-	//statedb.EmptyLogs()
 
 	cb := statedb.GetStateObject(coinbase.Address())
 	_, gas, err := ApplyMessage(NewEnv(statedb, self.bc, tx, block), tx, cb)
 	if err != nil && (IsNonceErr(err) || state.IsGasLimitErr(err) || IsInvalidTxErr(err)) {
-		// If the account is managed, remove the invalid nonce.
-		//from, _ := tx.From()
-		//self.bc.TxState().RemoveNonce(from, tx.Nonce())
 		return nil, nil, err
 	}
 
diff --git a/core/vm/logger.go b/core/vm/logger.go
index 96d07dab5..061e3745b 100644
--- a/core/vm/logger.go
+++ b/core/vm/logger.go
@@ -3,7 +3,7 @@ package vm
 import (
 	"fmt"
 	"os"
-	"unicode/utf8"
+	"unicode"
 
 	"github.com/ethereum/go-ethereum/common"
 )
@@ -27,7 +27,7 @@ func StdErrFormat(logs []StructLog) {
 			for _, r := range data {
 				if r == 0 {
 					str += "."
-				} else if utf8.ValidRune(rune(r)) {
+				} else if unicode.IsPrint(rune(r)) {
 					str += fmt.Sprintf("%s", string(r))
 				} else {
 					str += "?"