diff options
author | Péter Szilágyi <peterke@gmail.com> | 2017-01-06 21:42:03 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-06 21:42:03 +0800 |
commit | 8f9daaa3ba71c3b6bdcc24adfdc987e6f3a2e184 (patch) | |
tree | 92a336065bddcd620798e8f552432e3ed62ee14a /core/state_processor.go | |
parent | e0ee0cc66a4416edd47232649f4d4bca4a5e3c07 (diff) | |
parent | d3b751e4d94f95f6cc89544852f2d5811e075665 (diff) | |
download | go-tangerine-8f9daaa3ba71c3b6bdcc24adfdc987e6f3a2e184.tar go-tangerine-8f9daaa3ba71c3b6bdcc24adfdc987e6f3a2e184.tar.gz go-tangerine-8f9daaa3ba71c3b6bdcc24adfdc987e6f3a2e184.tar.bz2 go-tangerine-8f9daaa3ba71c3b6bdcc24adfdc987e6f3a2e184.tar.lz go-tangerine-8f9daaa3ba71c3b6bdcc24adfdc987e6f3a2e184.tar.xz go-tangerine-8f9daaa3ba71c3b6bdcc24adfdc987e6f3a2e184.tar.zst go-tangerine-8f9daaa3ba71c3b6bdcc24adfdc987e6f3a2e184.zip |
Merge pull request #3518 from fjl/ethclient-dependency-cleanup
core/types: dependency cleanup
Diffstat (limited to 'core/state_processor.go')
-rw-r--r-- | core/state_processor.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/state_processor.go b/core/state_processor.go index 82a371a9e..4f6ca651e 100644 --- a/core/state_processor.go +++ b/core/state_processor.go @@ -57,13 +57,13 @@ func NewStateProcessor(config *params.ChainConfig, bc *BlockChain) *StateProcess // Process returns the receipts and logs accumulated during the process and // returns the amount of gas that was used in the process. If any of the // transactions failed to execute due to insufficient gas it will return an error. -func (p *StateProcessor) Process(block *types.Block, statedb *state.StateDB, cfg vm.Config) (types.Receipts, vm.Logs, *big.Int, error) { +func (p *StateProcessor) Process(block *types.Block, statedb *state.StateDB, cfg vm.Config) (types.Receipts, []*types.Log, *big.Int, error) { var ( receipts types.Receipts totalUsedGas = big.NewInt(0) err error header = block.Header() - allLogs vm.Logs + allLogs []*types.Log gp = new(GasPool).AddGas(block.GasLimit()) ) // Mutate the the block and state according to any hard-fork specs |