From 7b8a47f4846cd821ecc1f96e381980f7bca1922b Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Mon, 23 Mar 2015 22:05:12 +0100
Subject: [PATCH] removed legacy code
---
core/block_processor.go | 1 -
core/types/block.go | 3 +--
tests/blocktest.go | 3 +--
3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/core/block_processor.go b/core/block_processor.go
index 0fb698614..dfac6e0cc 100644
--- a/core/block_processor.go
+++ b/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))
}
diff --git a/core/types/block.go b/core/types/block.go
index 6f26358fb..a4fb44040 100644
--- a/core/types/block.go
+++ b/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
}
diff --git a/tests/blocktest.go b/tests/blocktest.go
index 34bd69ac8..d813ebeec 100644
--- a/tests/blocktest.go
+++ b/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
}
--
GitLab