aboutsummaryrefslogtreecommitdiffstats
path: root/miner/miner.go
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-01-05 07:18:44 +0800
committerobscuren <geffobscura@gmail.com>2015-01-05 07:18:44 +0800
commitc1dee151445d1d9700e0c623916299370868490c (patch)
tree411a1738f8284a49fc51c7315a5b211b73412907 /miner/miner.go
parent987119cd4adcdbc7ebfd0bbb027a0c9e2a7487e9 (diff)
downloaddexon-c1dee151445d1d9700e0c623916299370868490c.tar
dexon-c1dee151445d1d9700e0c623916299370868490c.tar.gz
dexon-c1dee151445d1d9700e0c623916299370868490c.tar.bz2
dexon-c1dee151445d1d9700e0c623916299370868490c.tar.lz
dexon-c1dee151445d1d9700e0c623916299370868490c.tar.xz
dexon-c1dee151445d1d9700e0c623916299370868490c.tar.zst
dexon-c1dee151445d1d9700e0c623916299370868490c.zip
BlockManager => BlockProcessor
Diffstat (limited to 'miner/miner.go')
-rw-r--r--miner/miner.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/miner/miner.go b/miner/miner.go
index aefcadab8..949227d98 100644
--- a/miner/miner.go
+++ b/miner/miner.go
@@ -174,9 +174,9 @@ func (self *Miner) reset() {
func (self *Miner) mine() {
var (
- blockManager = self.eth.BlockManager()
- chainMan = self.eth.ChainManager()
- block = chainMan.NewBlock(self.Coinbase)
+ blockProcessor = self.eth.BlockProcessor()
+ chainMan = self.eth.ChainManager()
+ block = chainMan.NewBlock(self.Coinbase)
)
// Apply uncles
@@ -194,7 +194,7 @@ func (self *Miner) mine() {
// Accumulate all valid transactions and apply them to the new state
// Error may be ignored. It's not important during mining
- receipts, txs, _, erroneous, err := blockManager.ApplyTransactions(coinbase, state, block, transactions, true)
+ receipts, txs, _, erroneous, err := blockProcessor.ApplyTransactions(coinbase, state, block, transactions, true)
if err != nil {
minerlogger.Debugln(err)
}
@@ -204,7 +204,7 @@ func (self *Miner) mine() {
block.SetReceipts(receipts)
// Accumulate the rewards included for this block
- blockManager.AccumelateRewards(state, block, parent)
+ blockProcessor.AccumelateRewards(state, block, parent)
state.Update(ethutil.Big0)
block.SetRoot(state.Root())