浏览代码

removed legacy code

obscuren 10 年之前
父节点
当前提交
7b8a47f484
共有 3 个文件被更改,包括 2 次插入5 次删除
  1. 0 1
      core/block_processor.go
  2. 1 2
      core/types/block.go
  3. 1 2
      tests/blocktest.go

+ 0 - 1
core/block_processor.go

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

+ 1 - 2
core/types/block.go

@@ -99,7 +99,6 @@ type Block struct {
 	Td           *big.Int
 
 	receipts Receipts
-	Reward   *big.Int
 }
 
 // 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),
 	}
 	header.SetNonce(nonce)
-	block := &Block{header: header, Reward: new(big.Int)}
+	block := &Block{header: header}
 	return block
 }
 

+ 1 - 2
tests/blocktest.go

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