From 2c8cbfc26ad5790e03acb62770fd386e63a457c9 Mon Sep 17 00:00:00 2001
From: Sean Braithwaite <brapse@gmail.com>
Date: Thu, 8 Aug 2019 17:42:46 +0200
Subject: [PATCH] linter fixes

---
 blockchain/v2/demuxer.go      |  2 ++
 blockchain/v2/reactor.go      | 15 ++++-----------
 blockchain/v2/routine.go      |  1 +
 blockchain/v2/routine_test.go |  4 +++-
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/blockchain/v2/demuxer.go b/blockchain/v2/demuxer.go
index 70b670b2f..7996ecfa0 100644
--- a/blockchain/v2/demuxer.go
+++ b/blockchain/v2/demuxer.go
@@ -1,3 +1,4 @@
+// nolint:unused
 package v2
 
 import (
@@ -46,6 +47,7 @@ func (dm *demuxer) start() {
 		panic("Routine has already started")
 	}
 	dm.logger.Info("demuxer: run")
+	dm.rdy <- struct{}{}
 	for {
 		if !dm.isRunning() {
 			break
diff --git a/blockchain/v2/reactor.go b/blockchain/v2/reactor.go
index e76cb4e7e..97226a5d9 100644
--- a/blockchain/v2/reactor.go
+++ b/blockchain/v2/reactor.go
@@ -8,7 +8,6 @@ import (
 )
 
 type timeCheck struct {
-	time time.Time
 }
 
 func schedulerHandle(event Event) (Events, error) {
@@ -31,15 +30,14 @@ func processorHandle(event Event) (Events, error) {
 	return Events{}, nil
 }
 
-// reactor
 type Reactor struct {
 	demuxer       *demuxer
 	scheduler     *Routine
 	processor     *Routine
-	ticker        *time.Ticker
 	tickerStopped chan struct{}
 }
 
+// nolint:unused
 func (r *Reactor) setLogger(logger log.Logger) {
 	r.scheduler.setLogger(logger)
 	r.processor.setLogger(logger)
@@ -56,14 +54,9 @@ func (r *Reactor) Start() {
 	go r.processor.start()
 	go r.demuxer.start()
 
-	for {
-		if r.scheduler.isRunning() && r.processor.isRunning() && r.demuxer.isRunning() {
-			fmt.Println("routines running")
-			break
-		}
-		fmt.Println("waiting")
-		time.Sleep(10 * time.Millisecond)
-	}
+	<-r.scheduler.ready()
+	<-r.processor.ready()
+	<-r.demuxer.ready()
 
 	go func() {
 		ticker := time.NewTicker(1 * time.Second)
diff --git a/blockchain/v2/routine.go b/blockchain/v2/routine.go
index 715be6b4a..977d2cd16 100644
--- a/blockchain/v2/routine.go
+++ b/blockchain/v2/routine.go
@@ -50,6 +50,7 @@ func (rt *Routine) setLogger(logger log.Logger) {
 	rt.logger = logger
 }
 
+// nolint:unused
 func (rt *Routine) setMetrics(metrics *Metrics) {
 	rt.metrics = metrics
 }
diff --git a/blockchain/v2/routine_test.go b/blockchain/v2/routine_test.go
index cb7944ba3..8de36e275 100644
--- a/blockchain/v2/routine_test.go
+++ b/blockchain/v2/routine_test.go
@@ -41,7 +41,7 @@ func TestRoutine(t *testing.T) {
 		"expected the final event to be done")
 }
 
-func TesRoutineSend(t *testing.T) {
+func TestRoutineSend(t *testing.T) {
 	routine := newRoutine("simpleRoutine", simpleHandler)
 
 	assert.False(t, routine.trySend(eventA{}),
@@ -81,6 +81,8 @@ func genStatefulHandler(maxCount int) handleFunc {
 			}
 
 			return Events{eventA{}}, nil
+		case eventB:
+			return Events{}, nil
 		}
 		return Events{}, nil
 	}