From 282b55494b5891023919711919e2bd02b883254d Mon Sep 17 00:00:00 2001
From: Evgenii Stratonikov <evgeniy@nspcc.ru>
Date: Tue, 1 Sep 2020 19:58:51 +0300
Subject: [PATCH] consensus: allow to shutdown service

---
 pkg/consensus/consensus.go | 12 ++++++++++++
 pkg/network/server.go      |  3 +++
 2 files changed, 15 insertions(+)

diff --git a/pkg/consensus/consensus.go b/pkg/consensus/consensus.go
index 9b29cbde7..e0b871aa7 100644
--- a/pkg/consensus/consensus.go
+++ b/pkg/consensus/consensus.go
@@ -42,6 +42,8 @@ type Service interface {
 	// Start initializes dBFT and starts event loop for consensus service.
 	// It must be called only when sufficient amount of peers are connected.
 	Start()
+	// Shutdown stops dBFT event loop.
+	Shutdown()
 
 	// OnPayload is a callback to notify Service about new received payload.
 	OnPayload(p *Payload)
@@ -73,6 +75,7 @@ type service struct {
 	// started is a flag set with Start method that runs an event handling
 	// goroutine.
 	started *atomic.Bool
+	quit    chan struct{}
 }
 
 // Config is a configuration for consensus services.
@@ -115,6 +118,7 @@ func NewService(cfg Config) (Service, error) {
 		blockEvents:  make(chan *coreb.Block, 1),
 		network:      cfg.Chain.GetConfig().Magic,
 		started:      atomic.NewBool(false),
+		quit:         make(chan struct{}),
 	}
 
 	if cfg.Wallet == nil {
@@ -190,9 +194,17 @@ func (s *service) Start() {
 	}
 }
 
+// Shutdown implements Service interface.
+func (s *service) Shutdown() {
+	close(s.quit)
+}
+
 func (s *service) eventLoop() {
 	for {
 		select {
+		case <-s.quit:
+			s.dbft.Timer.Stop()
+			return
 		case <-s.dbft.Timer.C():
 			hv := s.dbft.Timer.HV()
 			s.log.Debug("timer fired",
diff --git a/pkg/network/server.go b/pkg/network/server.go
index 661764329..467c128f3 100644
--- a/pkg/network/server.go
+++ b/pkg/network/server.go
@@ -187,6 +187,9 @@ func (s *Server) Shutdown() {
 	s.log.Info("shutting down server", zap.Int("peers", s.PeerCount()))
 	s.transport.Close()
 	s.discovery.Close()
+	if s.consensusStarted.Load() {
+		s.consensus.Shutdown()
+	}
 	for p := range s.Peers() {
 		p.Disconnect(errServerShutdown)
 	}