Tidy up

Author: stwiname

core/blockchain.go

@@ -2589,9 +2589,6 @@ func (bc *BlockChain) SetTail(height uint64) error {
 		return err
 	}
 
-	// TODO delete relevant state
-	// bc.triedb.TruncateTail(num)
-
 	// Clear out any stale content from the caches
 	bc.bodyCache.Purge()
 	bc.bodyRLPCache.Purge()
@@ -2617,7 +2614,7 @@ func (bc *BlockChain) SetShardStartHeight(height uint64) error {
 		return err
 	}
 
-	// TODO perisisting this should happen with batch in SetTail
+	// TODO(stwiname) perisisting this should happen with batch in SetTail
 	config.DesiredChainDataStart = &height
 	rawdb.WriteChainDataConfig(bc.db, config)
 
@@ -2636,24 +2633,6 @@ func (bc *BlockChain) SetShardEndHeight(height *uint64) error {
 		if err := bc.SetHead(*height); err != nil {
 			return err
 		}
-
-		// TODO truncate state
-
-
-		// type freezer interface {
-		// 	Freeze(threshold uint64) error
-		// }
-		// err = api.eth.chainDb.(freezer).Freeze(0)
-		// if err != nil {
-		// 	return false, err
-		// }
-		// TODO truncate state head
-		// err = api.eth.blockchain.TrieDB().SetHead(*height)
-		// if err != nil {
-		// 	return false, err
-		// }
-
-		// TODO call blockchain.Stop()?
 	}
 	// else blockchain.go will limit this once the desired height is reached
 

core/blockchain_reader.go

@@ -442,7 +442,6 @@ func (bc *BlockChain) SubscribeBlockProcessingEvent(ch chan<- bool) event.Subscr
 	return bc.scope.Track(bc.blockProcFeed.Subscribe(ch))
 }
 
-
 // GetTxBloom retrieves the Transactions Bloom for the given block
 // TODO this is a temporary function for development so there is no caching
 func (bc *BlockChain) GetTxBloom(hash common.Hash) *[]byte {

core/headerchain.go

@@ -109,13 +109,9 @@ func NewHeaderChain(chainDb ethdb.Database, config *params.ChainConfig, engine c
 			hc.earliestHeaderHash = shead.Hash()
 		}
 		if dataConfig.DesiredChainDataEnd != nil {
-			// TODO this could be in the futrue and should throw
 			if chead := hc.GetHeaderByNumber(*dataConfig.DesiredChainDataEnd); chead != nil {
 				hc.currentHeader.Store(chead)
 				hc.currentHeaderHash = chead.Hash()
-			} else {
-				// TODO should this throw?
-				return nil, fmt.Errorf("Failed to get header for current height %d", *dataConfig.DesiredChainDataEnd)
 			}
 		}
 	}
@@ -683,7 +679,6 @@ func (hc *HeaderChain) SetTail(tail uint64, delFn DeleteBlockContentCallback) er
 
 	batch := hc.chainDb.NewBatch()
 
-	// TODO handle any pending ancients data
 	frozen, err := hc.chainDb.Ancients()
 	if err != nil {
 		return err

core/transaction_bloom_indexer.go

@@ -21,15 +21,15 @@ type TransactionBloomIndexer struct {
 	gen     *bloombits.Generator // generator to rotate the bloom bits crating the bloom index
 	section uint64               // Section is the section number being processed currently
 	head    common.Hash          // Head is the hash of the last header processed
-	config *params.ChainConfig
+	config  *params.ChainConfig
 }
 
 // NewTransactionBloomIndexer returns a chain indexer that generates bloom bits data for the
 // canonical chain for transactions filtering.
 func NewTransactionBloomIndexer(db ethdb.Database, chainConfig *params.ChainConfig, size, confirms uint64) *ChainIndexer {
 	backend := &TransactionBloomIndexer{
-		db:   db,
-		size: size,
+		db:     db,
+		size:   size,
 		config: chainConfig,
 	}
 	table := rawdb.NewTable(db, string(rawdb.BloomBitsTransactionIndexPrefix))
@@ -51,7 +51,7 @@ func (b *TransactionBloomIndexer) Process(ctx context.Context, header *types.Hea
 	// Get the bloom value from the db
 	bloom, err := b.getOrCreateTxBloom(header)
 	if err != nil {
-		return err;
+		return err
 	}
 	// Add the bloom value to the bloombits
 	b.gen.AddBloom(uint(header.Number.Uint64()-b.section*b.size), *bloom)
@@ -79,7 +79,7 @@ func (b *TransactionBloomIndexer) Prune(threshold uint64) error {
 }
 
 // getOrCreateTxBloom fetches the transactions bloom for the block, if it doesn't exist it will create the transaction bloom and save it
-func (b* TransactionBloomIndexer) getOrCreateTxBloom(header *types.Header) (*types.Bloom, error) {
+func (b *TransactionBloomIndexer) getOrCreateTxBloom(header *types.Header) (*types.Bloom, error) {
 	bloom := rawdb.ReadTxBloom(b.db, header.Hash(), header.Number.Uint64())
 
 	if bloom == nil {

eth/api_admin.go

@@ -158,7 +158,7 @@ func (api *AdminAPI) SetEndHeight(height *uint64) (bool, error) {
 	// TODO can this be moved?
 	api.eth.Downloader().SetEndHeight(height)
 
-	return true, nil;
+	return true, nil
 }
 
 func (api *AdminAPI) SetStartHeight(height *uint64) (bool, error) {
@@ -224,7 +224,7 @@ func (api *AdminAPI) StateStartHeight() (*uint64, error) {
 		_, err := api.eth.blockchain.StateAt(block.Root())
 		if err == nil {
 			startBlock = mid
-			if (mid == 0) {
+			if mid == 0 {
 				break
 			}
 			high = mid - 1 // Look for an earlier block

eth/api_backend.go

@@ -441,7 +441,6 @@ func (b *EthAPIBackend) StateAtTransaction(ctx context.Context, block *types.Blo
 	return b.eth.stateAtTransaction(ctx, block, txIndex, reexec)
 }
 
-
 func (b *EthAPIBackend) GetTxBloom(ctx context.Context, hash common.Hash) types.Bloom {
 	raw := b.eth.blockchain.GetTxBloom(hash)
 	return types.BytesToBloom(*raw)

params/data_params.go

@@ -1,9 +1,8 @@
 package params
 
 type ChainDataConfig struct {
-	DesiredChainDataStart  *uint64 `json:"desiredChainDataStart"`
-	DesiredChainDataEnd    *uint64 `json:"desiredChainDataEnd"`
-	DesiredChainStateStart *uint64 `json:"desiredChainStateStart"`
+	DesiredChainDataStart *uint64 `json:"desiredChainDataStart"`
+	DesiredChainDataEnd   *uint64 `json:"desiredChainDataEnd"`
 }
 
 type ChainDataStatus struct {