gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

core, miner: removed vm errors from consensus err checking

Browse Source 
Removed VM errors from the consensus errors. They now used for output
only.
This commit is contained in:
Jeffrey Wilcke
2015-07-06 11:54:11 +02:00
parent aa4502060b
commit e6bb9c1cad
5 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/block_processor.go
View File

@ -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
}
@ -119,7 +118,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
}