forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-25 06:06:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix core error forwarding, unify OOG VM err

Browse source
This commit is contained in:
Gustav Simonsson 2015-07-03 19:54:14 +02:00 committed by zelig
parent 89bf9c71bd
commit 08ec9739cc
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/block_processor.go
View file

@ -9,6 +9,7 @@ import (
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/core/types" "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/crypto"
"github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/event"
"github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/logger"
@ -72,7 +73,7 @@ func (self *BlockProcessor) ApplyTransaction(coinbase *state.StateObject, stated
cb := statedb.GetStateObject(coinbase.Address()) cb := statedb.GetStateObject(coinbase.Address())
_, gas, err := ApplyMessage(NewEnv(statedb, self.bc, tx, header), tx, cb) _, gas, err := ApplyMessage(NewEnv(statedb, self.bc, tx, header), tx, cb)
if err != nil { if err != nil && err != vm.OutOfGasError {
return nil, nil, err return nil, nil, err
} }
@ -119,7 +120,7 @@ func (self *BlockProcessor) ApplyTransactions(coinbase *state.StateObject, state
statedb.StartRecord(tx.Hash(), block.Hash(), i) statedb.StartRecord(tx.Hash(), block.Hash(), i)
receipt, txGas, err := self.ApplyTransaction(coinbase, statedb, header, tx, totalUsedGas, transientProcess) receipt, txGas, err := self.ApplyTransaction(coinbase, statedb, header, tx, totalUsedGas, transientProcess)
if err != nil { if err != nil && err != vm.OutOfGasError {
return nil, err return nil, err
} }

3
tests/init.go
View file

@ -25,8 +25,7 @@ var (
// fixed eventually // fixed eventually
"SimpleTx3", "SimpleTx3",
// These tests are not valid, as they are out of scope for RLP and // TODO: check why these fail
// the consensus protocol.
"BLOCK__RandomByteAtTheEnd", "BLOCK__RandomByteAtTheEnd",
"TRANSCT__RandomByteAtTheEnd", "TRANSCT__RandomByteAtTheEnd",
"BLOCK__ZeroByteAtTheEnd", "BLOCK__ZeroByteAtTheEnd",