interesting
/
go-ethereum
mirror of https://github.com/ethereum/go-ethereum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

removed legacy code

This commit is contained in:
obscuren 2015-03-23 22:05:12 +01:00
parent 0eaa023ffa
commit 7b8a47f484
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/block_processor.go
View File

@ -126,7 +126,6 @@ func (self *BlockProcessor) ApplyTransactions(coinbase *state.StateObject, state
cumulativeSum.Add(cumulativeSum, new(big.Int).Mul(txGas, tx.GasPrice())) cumulativeSum.Add(cumulativeSum, new(big.Int).Mul(txGas, tx.GasPrice()))
} }
block.Reward = cumulativeSum
if block.GasUsed().Cmp(totalUsedGas) != 0 { if block.GasUsed().Cmp(totalUsedGas) != 0 {
return nil, ValidationError(fmt.Sprintf("gas used error (%v / %v)", block.GasUsed(), totalUsedGas)) return nil, ValidationError(fmt.Sprintf("gas used error (%v / %v)", block.GasUsed(), totalUsedGas))
} }

3
core/types/block.go
View File

@ -99,7 +99,6 @@ type Block struct {
Td *big.Int Td *big.Int
receipts Receipts receipts Receipts
Reward *big.Int
} }
// StorageBlock defines the RLP encoding of a Block stored in the // StorageBlock defines the RLP encoding of a Block stored in the
@ -134,7 +133,7 @@ func NewBlock(parentHash common.Hash, coinbase common.Address, root common.Hash,
GasLimit: new(big.Int), GasLimit: new(big.Int),
} }
header.SetNonce(nonce) header.SetNonce(nonce)
block := &Block{header: header, Reward: new(big.Int)} block := &Block{header: header}
return block return block
} }

3
tests/blocktest.go
View File

@ -13,9 +13,9 @@ import (
"strings" "strings"
"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/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rlp"
"github.com/ethereum/go-ethereum/core/state"
) )
// Block Test JSON Format // Block Test JSON Format
@ -172,7 +172,6 @@ func mustConvertGenesis(testGenesis btHeader) *types.Block {
hdr.Number = big.NewInt(0) hdr.Number = big.NewInt(0)
b := types.NewBlockWithHeader(hdr) b := types.NewBlockWithHeader(hdr)
b.Td = new(big.Int) b.Td = new(big.Int)
b.Reward = new(big.Int)
return b return b
} }