diff options
author | obscuren <geffobscura@gmail.com> | 2015-02-16 19:03:27 +0800 |
---|---|---|
committer | obscuren <geffobscura@gmail.com> | 2015-02-16 19:03:27 +0800 |
commit | d2a4bc4d7389f4b442a19fc03d0d664c19f931e2 (patch) | |
tree | 009146f003b1782cc07764bd27556c30b0e099cd /core/chain_manager.go | |
parent | 2c3a014f03390628d329167109f90a30e3c4e4c3 (diff) | |
download | dexon-d2a4bc4d7389f4b442a19fc03d0d664c19f931e2.tar dexon-d2a4bc4d7389f4b442a19fc03d0d664c19f931e2.tar.gz dexon-d2a4bc4d7389f4b442a19fc03d0d664c19f931e2.tar.bz2 dexon-d2a4bc4d7389f4b442a19fc03d0d664c19f931e2.tar.lz dexon-d2a4bc4d7389f4b442a19fc03d0d664c19f931e2.tar.xz dexon-d2a4bc4d7389f4b442a19fc03d0d664c19f931e2.tar.zst dexon-d2a4bc4d7389f4b442a19fc03d0d664c19f931e2.zip |
Removed reference to lastBlockNumber & LastBlockNumber
Diffstat (limited to 'core/chain_manager.go')
-rw-r--r-- | core/chain_manager.go | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/core/chain_manager.go b/core/chain_manager.go index 922d2a8d8..c28e901c6 100644 --- a/core/chain_manager.go +++ b/core/chain_manager.go @@ -78,11 +78,10 @@ type ChainManager struct { eventMux *event.TypeMux genesisBlock *types.Block // Last known total difficulty - mu sync.RWMutex - td *big.Int - lastBlockNumber uint64 - currentBlock *types.Block - lastBlockHash []byte + mu sync.RWMutex + td *big.Int + currentBlock *types.Block + lastBlockHash []byte transState *state.StateDB } @@ -94,13 +93,6 @@ func (self *ChainManager) Td() *big.Int { return self.td } -func (self *ChainManager) LastBlockNumber() uint64 { - self.mu.RLock() - defer self.mu.RUnlock() - - return self.lastBlockNumber -} - func (self *ChainManager) LastBlockHash() []byte { self.mu.RLock() defer self.mu.RUnlock() @@ -149,7 +141,6 @@ func (bc *ChainManager) setLastBlock() { rlp.Decode(bytes.NewReader(data), &block) bc.currentBlock = &block bc.lastBlockHash = block.Hash() - bc.lastBlockNumber = block.Header().Number.Uint64() // Set the last know difficulty (might be 0x0 as initial value, Genesis) bc.td = ethutil.BigD(bc.db.LastKnownTD()) @@ -157,7 +148,7 @@ func (bc *ChainManager) setLastBlock() { bc.Reset() } - chainlogger.Infof("Last block (#%d) %x TD=%v\n", bc.lastBlockNumber, bc.currentBlock.Hash(), bc.td) + chainlogger.Infof("Last block (#%v) %x TD=%v\n", bc.currentBlock.Number(), bc.currentBlock.Hash(), bc.td) } // Block creation & chain handling @@ -234,8 +225,6 @@ func (bc *ChainManager) insert(block *types.Block) { } func (bc *ChainManager) write(block *types.Block) { - bc.writeBlockInfo(block) - encodedBlock := ethutil.Encode(block.RlpDataForStorage()) bc.db.Put(block.Hash(), encodedBlock) } @@ -354,11 +343,6 @@ func (self *ChainManager) CalcTotalDiff(block *types.Block) (*big.Int, error) { return td, nil } -// Unexported method for writing extra non-essential block info to the db -func (bc *ChainManager) writeBlockInfo(block *types.Block) { - bc.lastBlockNumber++ -} - func (bc *ChainManager) Stop() { if bc.CurrentBlock != nil { chainlogger.Infoln("Stopped") |