Merge branch 'juga1980/appendBetter'

core/blockchain.go

@@ -2211,7 +2211,7 @@ func (bc *BlockChain) insertSideChain(block *types.Block, it *insertIterator, ma
 	}
 	// Import all the pruned blocks to make the state available
 	var (
-		blocks = make([]*types.Block, 0, len(hashes))
+		blocks []*types.Block
 		memory uint64
 	)
 	for i := len(hashes) - 1; i >= 0; i-- {

core/rawdb/ancient_utils.go

@@ -53,7 +53,6 @@ func (info *freezerInfo) size() common.StorageSize {
 
 func inspect(name string, order map[string]freezerTableConfig, reader ethdb.AncientReader) (freezerInfo, error) {
 	info := freezerInfo{name: name}
-	info.sizes = make([]tableSize, 0, len(order))
 	for t := range order {
 		size, err := reader.AncientSize(t)
 		if err != nil {
@@ -79,7 +78,7 @@ func inspect(name string, order map[string]freezerTableConfig, reader ethdb.Anci
 
 // inspectFreezers inspects all freezers registered in the system.
 func inspectFreezers(db ethdb.Database) ([]freezerInfo, error) {
-	var infos []freezerInfo = make([]freezerInfo, 0, len(freezers))
+	var infos []freezerInfo
 	for _, freezer := range freezers {
 		switch freezer {
 		case ChainFreezerName:

core/state_prefetcher.go

@@ -124,5 +124,4 @@ func (p *statePrefetcher) Prefetch(block *types.Block, statedb *state.StateDB, c
 
 	blockPrefetchTxsValidMeter.Mark(int64(len(block.Transactions())) - fails.Load())
 	blockPrefetchTxsInvalidMeter.Mark(fails.Load())
-	return
 }

core/vm/eips.go

@@ -60,7 +60,7 @@ func ValidEip(eipNum int) bool {
 	return ok
 }
 func ActivateableEips() []string {
-	nums := make([]string, 0, len(activators))
+	var nums []string
 	for k := range activators {
 		nums = append(nums, fmt.Sprintf("%d", k))
 	}

core/vm/interpreter.go

@@ -136,7 +136,7 @@ func NewEVMInterpreter(evm *EVM) *EVMInterpreter {
 	default:
 		table = &frontierInstructionSet
 	}
-	extraEips := make([]int, 0, len(evm.Config.ExtraEips))
+	var extraEips []int
 	if len(evm.Config.ExtraEips) > 0 {
 		// Deep-copy jumptable to prevent modification of opcodes in other tables
 		table = copyJumpTable(table)