Remove more stopping machinery

consensus/istanbul/backend/backend.go

@@ -554,12 +554,6 @@ func (sb *Backend) Commit(proposal istanbul.Proposal, aggregatedSeal types.Istan
 		}
 	}
 	sb.onNewConsensusBlock(block, result.Receipts, result.Logs, result.State)
-
-	nextBlockNum := new(big.Int).Add(block.Number(), big.NewInt(1))
-	if sb.chain.Config().IsL2Migration(nextBlockNum) {
-		sb.logger.Info("The next block is the L2 migration block, stopping announce protocol and closing istanbul backend", "currentBlock", block.NumberU64(), "hash", block.Hash(), "nextBlock", nextBlockNum)
-		sb.StopAnnouncing()
-	}
 	return nil
 }
 

core/blockchain.go

@@ -1085,7 +1085,7 @@ func (bc *BlockChain) Stop() {
 		triedb := bc.stateCache.TrieDB()
 		triedb.SaveCache(bc.cacheConfig.TrieCleanJournal)
 	}
-	log.Info("Blockchain stopped", "number", bc.CurrentBlock().NumberU64(), "hash", bc.CurrentBlock().Hash())
+	log.Info("Blockchain stopped")
 }
 
 // StopInsert interrupts all insertion methods, causing them to return
@@ -1870,9 +1870,6 @@ func (bc *BlockChain) insertChain(chain types.Blocks, verifySeals bool) (int, er
 		// If the chain is terminating, stop processing blocks
 		if bc.insertStopped() {
 			log.Debug("Abort during block processing")
-			if bc.Config().IsL2Migration(block.Number()) {
-				err = errInsertionInterrupted
-			}
 			break
 		}
 		// If the header is a banned one, straight out abort

eth/fetcher/block_fetcher.go

@@ -64,8 +64,7 @@ var (
 	bodyFilterOutMeter   = metrics.NewRegisteredMeter("eth/fetcher/block/filter/bodies/out", nil)
 )
 
-// ErrTerminated indicates that the fetcher's peer connection has been terminated.
-var ErrTerminated = errors.New("terminated")
+var errTerminated = errors.New("terminated")
 
 // HeaderRetrievalFn is a callback type for retrieving a header from the local chain.
 type HeaderRetrievalFn func(common.Hash) *types.Header
@@ -255,7 +254,7 @@ func (f *BlockFetcher) Notify(peer string, hash common.Hash, number uint64, time
 	case f.notify <- block:
 		return nil
 	case <-f.quit:
-		return ErrTerminated
+		return errTerminated
 	}
 }
 
@@ -269,7 +268,7 @@ func (f *BlockFetcher) Enqueue(peer string, block *types.Block) error {
 	case f.inject <- op:
 		return nil
 	case <-f.quit:
-		return ErrTerminated
+		return errTerminated
 	}
 }
 

eth/fetcher/tx_fetcher.go

@@ -252,7 +252,7 @@ func (f *TxFetcher) Notify(peer string, hashes []common.Hash) error {
 	case f.notify <- announce:
 		return nil
 	case <-f.quit:
-		return ErrTerminated
+		return errTerminated
 	}
 }
 
@@ -316,7 +316,7 @@ func (f *TxFetcher) Enqueue(peer string, txs []*types.Transaction, direct bool)
 	case f.cleanup <- &txDelivery{origin: peer, hashes: added, direct: direct}:
 		return nil
 	case <-f.quit:
-		return ErrTerminated
+		return errTerminated
 	}
 }
 
@@ -327,7 +327,7 @@ func (f *TxFetcher) Drop(peer string) error {
 	case f.drop <- &txDrop{peer: peer}:
 		return nil
 	case <-f.quit:
-		return ErrTerminated
+		return errTerminated
 	}
 }
 

eth/handler.go

@@ -438,9 +438,7 @@ func (h *handler) unregisterPeer(id string) *ethPeer {
 		log.Error("Peer removal from downloader failed", "peer", id, "err", err)
 	}
 	if err := h.txFetcher.Drop(id); err != nil {
-		if !errors.Is(err, fetcher.ErrTerminated) {
-			log.Error("Peer removal from tx fetcher failed", "peer", id, "err", err)
-		}
+		log.Error("Peer removal from tx fetcher  failed", "peer", id, "err", err)
 	}
 	if handler, ok := h.chain.Engine().(consensus.Handler); ok {
 		handler.UnregisterPeer(peer, peer.Peer.Server == h.proxyServer)

miner/worker.go

@@ -18,14 +18,12 @@ package miner
 
 import (
 	"context"
-	"math/big"
 	"sync"
 	"sync/atomic"
 	"time"
 
 	"github.com/celo-org/celo-blockchain/common"
 	"github.com/celo-org/celo-blockchain/consensus"
-	istanbulBackend "github.com/celo-org/celo-blockchain/consensus/istanbul/backend"
 	"github.com/celo-org/celo-blockchain/core"
 	"github.com/celo-org/celo-blockchain/core/state"
 	"github.com/celo-org/celo-blockchain/core/types"
@@ -241,12 +239,10 @@ func (w *worker) start() {
 func (w *worker) stop() {
 	atomic.StoreInt32(&w.running, 0)
 
-	if istanbul, ok := w.engine.(*istanbulBackend.Backend); ok {
-		if istanbul.IsValidating() {
-			err := istanbul.StopValidating()
-			if err != nil {
-				log.Error("Error while calling engine.StopValidating", "err", err)
-			}
+	if istanbul, ok := w.engine.(consensus.Istanbul); ok {
+		err := istanbul.StopValidating()
+		if err != nil {
+			log.Error("Error while calling engine.StopValidating", "err", err)
 		}
 	}
 }
@@ -396,19 +392,10 @@ func (w *worker) mainLoop() {
 	defer wg.Wait()
 	txsCh := make(chan core.NewTxsEvent, txChanSize)
 
-	generateNewBlock := func(nextBlockNum *big.Int) {
+	generateNewBlock := func() {
 		if cancel != nil {
 			cancel()
 		}
-
-		if w.chainConfig.IsL2Migration(nextBlockNum) {
-			if w.isRunning() {
-				log.Info("The next block is the L2 migration block, stopping block construction", "currentBlock", w.chain.CurrentBlock().NumberU64(), "hash", w.chain.CurrentBlock().Hash(), "nextBlock", nextBlockNum.Uint64())
-				w.stop()
-			}
-			return
-		}
-
 		wg.Wait()
 		taskCtx, cancel = context.WithCancel(context.Background())
 		wg.Add(1)
@@ -434,12 +421,10 @@ func (w *worker) mainLoop() {
 	for {
 		select {
 		case <-w.startCh:
-			nextBlockNum := new(big.Int).Add(w.chain.CurrentBlock().Number(), big.NewInt(1))
-			generateNewBlock(nextBlockNum)
+			generateNewBlock()
 
-		case ev := <-w.chainHeadCh:
-			nextBlockNum := new(big.Int).Add(ev.Block.Number(), big.NewInt(1))
-			generateNewBlock(nextBlockNum)
+		case <-w.chainHeadCh:
+			generateNewBlock()
 
 		case ev := <-w.txsCh:
 			// Drain tx sub channel as a validator,