From 4df06e7d5c2874fc2c8486739ac07c2d437ff197 Mon Sep 17 00:00:00 2001 From: Jeffrey Wilcke Date: Mon, 6 Jul 2015 11:54:11 +0200 Subject: [PATCH] core, miner: removed vm errors from consensus err checking Removed VM errors from the consensus errors. They now used for output only. --- core/block_processor.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/core/block_processor.go b/core/block_processor.go index 41ae7f5d57..362036445a 100644 --- a/core/block_processor.go +++ b/core/block_processor.go @@ -9,7 +9,6 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/logger" @@ -73,7 +72,7 @@ func (self *BlockProcessor) ApplyTransaction(coinbase *state.StateObject, stated cb := statedb.GetStateObject(coinbase.Address()) _, gas, err := ApplyMessage(NewEnv(statedb, self.bc, tx, header), tx, cb) - if err != nil && err != vm.OutOfGasError { + if err != nil { return nil, nil, err } @@ -120,7 +119,7 @@ func (self *BlockProcessor) ApplyTransactions(coinbase *state.StateObject, state statedb.StartRecord(tx.Hash(), block.Hash(), i) receipt, txGas, err := self.ApplyTransaction(coinbase, statedb, header, tx, totalUsedGas, transientProcess) - if err != nil && err != vm.OutOfGasError { + if err != nil { return nil, err }