From 188e4592731878c893d0a11fc4723747a232ca35 Mon Sep 17 00:00:00 2001
From: VenkatDatta <nhvenkatdatta@gmail.com>
Date: Sun, 29 Jul 2018 11:16:53 +0530
Subject: [PATCH] Removed unnecessary onStart call (#2098)

* Removed unnecessary onStart & onStop calls in reactor

* Refactor OnStart & OnStop in reactor

* Removed redundant OnStart func in reactor
---
 blockchain/reactor.go  | 4 ----
 consensus/reactor.go   | 4 ----
 evidence/reactor.go    | 5 -----
 p2p/pex/pex_reactor.go | 4 ----
 4 files changed, 17 deletions(-)

diff --git a/blockchain/reactor.go b/blockchain/reactor.go
index eadeedc9..f00df50c 100644
--- a/blockchain/reactor.go
+++ b/blockchain/reactor.go
@@ -109,9 +109,6 @@ func (bcR *BlockchainReactor) SetLogger(l log.Logger) {
 
 // OnStart implements cmn.Service.
 func (bcR *BlockchainReactor) OnStart() error {
-	if err := bcR.BaseReactor.OnStart(); err != nil {
-		return err
-	}
 	if bcR.fastSync {
 		err := bcR.pool.Start()
 		if err != nil {
@@ -124,7 +121,6 @@ func (bcR *BlockchainReactor) OnStart() error {
 
 // OnStop implements cmn.Service.
 func (bcR *BlockchainReactor) OnStop() {
-	bcR.BaseReactor.OnStop()
 	bcR.pool.Stop()
 }
 
diff --git a/consensus/reactor.go b/consensus/reactor.go
index 3eb1d73a..58ff42ae 100644
--- a/consensus/reactor.go
+++ b/consensus/reactor.go
@@ -58,9 +58,6 @@ func NewConsensusReactor(consensusState *ConsensusState, fastSync bool) *Consens
 // broadcasted to other peers and starting state if we're not in fast sync.
 func (conR *ConsensusReactor) OnStart() error {
 	conR.Logger.Info("ConsensusReactor ", "fastSync", conR.FastSync())
-	if err := conR.BaseReactor.OnStart(); err != nil {
-		return err
-	}
 
 	conR.subscribeToBroadcastEvents()
 
@@ -77,7 +74,6 @@ func (conR *ConsensusReactor) OnStart() error {
 // OnStop implements BaseService by unsubscribing from events and stopping
 // state.
 func (conR *ConsensusReactor) OnStop() {
-	conR.BaseReactor.OnStop()
 	conR.unsubscribeFromBroadcastEvents()
 	conR.conS.Stop()
 	if !conR.FastSync() {
diff --git a/evidence/reactor.go b/evidence/reactor.go
index bf11ac10..cfe47364 100644
--- a/evidence/reactor.go
+++ b/evidence/reactor.go
@@ -44,11 +44,6 @@ func (evR *EvidenceReactor) SetLogger(l log.Logger) {
 	evR.evpool.SetLogger(l)
 }
 
-// OnStart implements cmn.Service
-func (evR *EvidenceReactor) OnStart() error {
-	return evR.BaseReactor.OnStart()
-}
-
 // GetChannels implements Reactor.
 // It returns the list of channels for this reactor.
 func (evR *EvidenceReactor) GetChannels() []*p2p.ChannelDescriptor {
diff --git a/p2p/pex/pex_reactor.go b/p2p/pex/pex_reactor.go
index 5c4894ce..2929d933 100644
--- a/p2p/pex/pex_reactor.go
+++ b/p2p/pex/pex_reactor.go
@@ -113,9 +113,6 @@ func NewPEXReactor(b AddrBook, config *PEXReactorConfig) *PEXReactor {
 
 // OnStart implements BaseService
 func (r *PEXReactor) OnStart() error {
-	if err := r.BaseReactor.OnStart(); err != nil {
-		return err
-	}
 	err := r.book.Start()
 	if err != nil && err != cmn.ErrAlreadyStarted {
 		return err
@@ -139,7 +136,6 @@ func (r *PEXReactor) OnStart() error {
 
 // OnStop implements BaseService
 func (r *PEXReactor) OnStop() {
-	r.BaseReactor.OnStop()
 	r.book.Stop()
 }