LBRYCommunity/lbcd
1
0
Fork 0
Code Issues 17 Pull requests 4 Projects Releases 28 Packages Wiki Activity

blockchain: Remove unused root field. (#680)

Browse source 
This removes the root field and all references to it from the BlockChain
since it is no longer required.

It was previously required because the chain state was not initialized
when the instance was created.  However, that is no longer the case, so
there is no reason to keep it around any longer.
This commit is contained in:
Dave Collins 2016-04-25 16:17:29 -05:00
parent 644570487f
commit de4fb24389
2 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
blockchain/chain.go
View file

@ -179,7 +179,6 @@ type BlockChain struct {
// These fields are related to the memory block index. They are // These fields are related to the memory block index. They are
// protected by the chain lock. // protected by the chain lock.
root *blockNode
bestNode *blockNode bestNode *blockNode
index map[wire.ShaHash]*blockNode index map[wire.ShaHash]*blockNode
depNodes map[wire.ShaHash][]*blockNode depNodes map[wire.ShaHash][]*blockNode
@ -423,7 +422,6 @@ func (b *BlockChain) loadBlockNode(dbTx database.Tx, hash *wire.ShaHash) (*block
for _, childNode := range childNodes { for _, childNode := range childNodes {
childNode.parent = node childNode.parent = node
node.children = append(node.children, childNode) node.children = append(node.children, childNode)
b.root = node
} }
} else { } else {
@ -583,9 +581,6 @@ func (b *BlockChain) pruneBlockNodes() error {
} }
} }
// Set the new root node.
b.root = newRootNode
return nil return nil
} }
@ -1456,7 +1451,6 @@ func New(config *Config) (*BlockChain, error) {
notifications: config.Notifications, notifications: config.Notifications,
sigCache: config.SigCache, sigCache: config.SigCache,
indexManager: config.IndexManager, indexManager: config.IndexManager,
root: nil,
bestNode: nil, bestNode: nil,
index: make(map[wire.ShaHash]*blockNode), index: make(map[wire.ShaHash]*blockNode),
depNodes: make(map[wire.ShaHash][]*blockNode), depNodes: make(map[wire.ShaHash][]*blockNode),

10
blockchain/chainio.go
View file

@ -1047,14 +1047,12 @@ func dbPutBestState(dbTx database.Tx, snapshot *BestState, workSum *big.Int) err
// genesis block. This includes creating the necessary buckets and inserting // genesis block. This includes creating the necessary buckets and inserting
// the genesis block, so it must only be called on an uninitialized database. // the genesis block, so it must only be called on an uninitialized database.
func (b *BlockChain) createChainState() error { func (b *BlockChain) createChainState() error {
// Create a new node from the genesis block and set it as both the root // Create a new node from the genesis block and set it as the best node.
// node and the best node.
genesisBlock := btcutil.NewBlock(b.chainParams.GenesisBlock) genesisBlock := btcutil.NewBlock(b.chainParams.GenesisBlock)
header := &genesisBlock.MsgBlock().Header header := &genesisBlock.MsgBlock().Header
node := newBlockNode(header, genesisBlock.Sha(), 0) node := newBlockNode(header, genesisBlock.Sha(), 0)
node.inMainChain = true node.inMainChain = true
b.bestNode = node b.bestNode = node
b.root = node
// Add the new node to the index which is used for faster lookups. // Add the new node to the index which is used for faster lookups.
b.index[*node.hash] = node b.index[*node.hash] = node
@ -1147,15 +1145,13 @@ func (b *BlockChain) initChainState() error {
return err return err
} }
// Create a new node and set it as both the root node and the // Create a new node and set it as the best node. The preceding
// best node. The preceding nodes will be loaded on demand as // nodes will be loaded on demand as needed.
// needed.
header := &block.Header header := &block.Header
node := newBlockNode(header, &state.hash, int32(state.height)) node := newBlockNode(header, &state.hash, int32(state.height))
node.inMainChain = true node.inMainChain = true
node.workSum = state.workSum node.workSum = state.workSum
b.bestNode = node b.bestNode = node
b.root = node
// Add the new node to the indices for faster lookups. // Add the new node to the indices for faster lookups.
prevHash := node.parentHash prevHash := node.parentHash