finish logic of new block service

api/service/newblock/service.go

@@ -8,11 +8,13 @@ import (
 type Service struct {
 	stopChan              chan struct{}
 	stoppedChan           chan struct{}
+	readySignal           chan struct{}
+	waitForConsensusReady func(readySignal chan struct{}, stopChan chan struct{}, stoppedChan chan struct{})
 }
 
 // NewService returns new block service.
-func NewService() *Service {
-	return &Service{}
+func NewService(readySignal chan struct{}, waitForConsensusReady func(readySignal chan struct{}, stopChan chan struct{}, stoppedChan chan struct{})) *Service {
+	return &Service{readySignal: readySignal, waitForConsensusReady: waitForConsensusReady}
 }
 
 // StartService starts new block service.
@@ -30,23 +32,7 @@ func (s *Service) Init() {
 
 // Run runs new block.
 func (s *Service) Run(stopChan chan struct{}, stoppedChan chan struct{}) {
-	go func() {
-		defer close(stoppedChan)
-		for {
-			select {
-			default:
-				utils.GetLogInstance().Info("Running new block")
-				// TODO: Write some logic here.
-				s.DoService()
-			case <-stopChan:
-				return
-			}
-		}
-	}()
-}
-
-// DoService does new block.
-func (s *Service) DoService() {
+	s.waitForConsensusReady(s.readySignal, s.stopChan, s.stoppedChan)
 }
 
 // StopService stops new block service.

node/node_newblock.go

@@ -8,7 +8,11 @@ import (
 )
 
 // WaitForConsensusReady listen for the readiness signal from consensus and generate new block for consensus.
-func (node *Node) WaitForConsensusReady(readySignal chan struct{}) {
+func (node *Node) WaitForConsensusReady(readySignal chan struct{}, stopChan chan struct{}, stoppedChan chan struct{}) {
+	go func() {
+		// Setup stoppedChan
+		defer close(stoppedChan)
+
 		utils.GetLogInstance().Debug("Waiting for Consensus ready", "node", node)
 		time.Sleep(15 * time.Second) // Wait for other nodes to be ready (test-only)
 
@@ -24,6 +28,8 @@ func (node *Node) WaitForConsensusReady(readySignal chan struct{}) {
 				node.Consensus.ResetState()
 				timeoutCount++
 				utils.GetLogInstance().Debug("Consensus timeout, retry!", "count", timeoutCount, "node", node)
+			case <-stopChan:
+				return
 			}
 
 			for {
@@ -57,4 +63,5 @@ func (node *Node) WaitForConsensusReady(readySignal chan struct{}) {
 				node.BlockChannel <- newBlock
 			}
 		}
+	}()
 }